stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8014648: Exclude testing and infrastructure packages from code coverage, round two

Browse Source 
Reviewed-by: sundar
This commit is contained in:
James Laskey 2013-05-15 12:09:38 -03:00 committed by Jim Laskey
parent 8bbf3e9b52
commit e5be7a02ea
5 changed files with 15 additions and 65 deletions
nashorn
make
code_coverage.xml
src/jdk/nashorn/internal/runtime/options
Option.javaOptions.javaValueOption.java
test/script/basic
allgettersetters.js

12
nashorn/make/code_coverage.xml

@ -153,6 +153,18 @@
<arg value="jdk\.nashorn\.test\.models*"/>
<arg value="-exclude"/>
<arg value="jdk\.nashorn\.internal\.ir\.debug*"/>
<arg value="-exclude"/>
<arg value="jdk\.nashorn\.internal\.runtime\.regexp\.joni\.bench*"/>
<arg value="-exclude"/>
<arg value="jdk\.nashorn\.internal\.runtime\.DebugLogger*"/>
<arg value="-exclude"/>
<arg value="jdk\.nashorn\.internal\.runtime\.Timing*"/>
<arg value="-exclude"/>
<arg value="jdk\.nashorn\.internal\.runtime\.Logging*"/>
<arg value="-exclude"/>
<arg value="jdk\.nashorn\.internal\.runtime\.Debug*"/>
<arg value="-exclude"/>
<arg value="jdk\.nashorn\.internal\.objects\.NativeDebug*"/>
<arg line="${cc.all.xmls}"/>
<classpath>
<pathelement location="${jcov.jar}"/>

4
nashorn/src/jdk/nashorn/internal/runtime/options/Option.java

@ -42,10 +42,6 @@ public class Option<T> {
this.value = value;
}
void setValue(final T value) {
this.value = value;
}
/**
* Return the value of an option
* @return the option value

2
nashorn/src/jdk/nashorn/internal/runtime/options/Options.java

@ -501,8 +501,6 @@ public final class Options {
return new Option<>(TimeZone.getTimeZone(value));
case "keyvalues":
return new KeyValueOption(value);
case "values":
return new ValueOption(value);
case "log":
final KeyValueOption kv = new KeyValueOption(value);
Logging.initialize(kv.getValues());

59
nashorn/src/jdk/nashorn/internal/runtime/options/ValueOption.java

@ -1,59 +0,0 @@
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package jdk.nashorn.internal.runtime.options;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.StringTokenizer;
/**
* This option represents a collection of comma separated values
*/
public class ValueOption extends Option<String> {
private Collection<String> values;
ValueOption(final String value) {
super(value);
if (value != null) {
values = new LinkedHashSet<>();
final StringTokenizer st = new StringTokenizer(getValue(), ",");
while (st.hasMoreElements()) {
values.add(st.nextToken());
}
}
}
/**
* Get the values in the option
* @return collection of strings
*/
public Collection<String> getValues() {
return Collections.unmodifiableCollection(values);
}
}

3
nashorn/test/script/basic/allgettersetters.js

@ -34,6 +34,9 @@ function checkGetterSetter(obj, expectError) {
for (var i in properties) {
var prop = properties[i];
try {
if (!/\d.*/.test(prop)) {
eval("obj." + prop + " = " + "obj." + prop + ";");
}
obj[prop] = obj[prop];
} catch (e) {
if (!expectError || !(e instanceof TypeError)) {