Mercurial > people > rkennke > jdk9-shenandoah-final > nashorn
changeset 268:6344644b81ec
8014648: Exclude testing and infrastructure packages from code coverage, round two
Reviewed-by: sundar
Contributed-by: james.laskey@oracle.com
author | jlaskey |
---|---|
date | Wed, 15 May 2013 12:09:38 -0300 |
parents | 1eaa542cc8e2 |
children | 19e9cd9c7010 aa1b6e8c51a0 |
files | make/code_coverage.xml src/jdk/nashorn/internal/runtime/options/Option.java src/jdk/nashorn/internal/runtime/options/Options.java src/jdk/nashorn/internal/runtime/options/ValueOption.java test/script/basic/allgettersetters.js |
diffstat | 5 files changed, 15 insertions(+), 65 deletions(-) [+] |
line wrap: on
line diff
--- a/make/code_coverage.xml Wed May 15 19:45:16 2013 +0530 +++ b/make/code_coverage.xml Wed May 15 12:09:38 2013 -0300 @@ -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}"/>
--- a/src/jdk/nashorn/internal/runtime/options/Option.java Wed May 15 19:45:16 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/options/Option.java Wed May 15 12:09:38 2013 -0300 @@ -42,10 +42,6 @@ this.value = value; } - void setValue(final T value) { - this.value = value; - } - /** * Return the value of an option * @return the option value
--- a/src/jdk/nashorn/internal/runtime/options/Options.java Wed May 15 19:45:16 2013 +0530 +++ b/src/jdk/nashorn/internal/runtime/options/Options.java Wed May 15 12:09:38 2013 -0300 @@ -501,8 +501,6 @@ 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());
--- a/src/jdk/nashorn/internal/runtime/options/ValueOption.java Wed May 15 19:45:16 2013 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -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); - } - -}
--- a/test/script/basic/allgettersetters.js Wed May 15 19:45:16 2013 +0530 +++ b/test/script/basic/allgettersetters.js Wed May 15 12:09:38 2013 -0300 @@ -34,6 +34,9 @@ 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)) {