archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-15 08:34:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8044638: Tidy up Nashorn codebase for code standards

Browse source 
Reviewed-by: lagergren, sundar
This commit is contained in:
Attila Szegedi 2014-06-04 13:08:57 +02:00
parent 7898fee89e
commit 5ec014a881
1177 changed files with 6791 additions and 6826 deletions
Download patch file Download diff file Expand all files Collapse all files

50
nashorn/test/script/currently-failing/logcoverage.js
View file

@ -1,21 +1,21 @@
/*
* 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.
*
*
* 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.
@ -23,7 +23,7 @@
/**
* mh_coverage.js
* Screen scrape various logs to ensure that we cover enough functionality,
* Screen scrape various logs to ensure that we cover enough functionality,
* e.g. method handle instrumentation
*
* @test
@ -44,25 +44,25 @@ function runScriptEngine(opts, name) {
var fac = new NashornScriptEngineFactory();
// get current System.err
var oldErr = System.err;
var oldOut = System.out;
var oldOut = System.out;
var baosErr = new ByteArrayOutputStream();
var newErr = new PrintStream(baosErr);
var baosOut = new ByteArrayOutputStream();
var newOut = new PrintStream(baosOut);
var newOut = new PrintStream(baosOut);
try {
// set new standard err
System.setErr(newErr);
System.setOut(newOut);
var engine = fac.getScriptEngine(Java.to(opts, "java.lang.String[]"));
var reader = new java.io.FileReader(name);
var reader = new java.io.FileReader(name);
engine.eval(reader);
newErr.flush();
newOut.flush();
newOut.flush();
return new java.lang.String(baosErr.toByteArray());
} finally {
// restore System.err to old value
System.setErr(oldErr);
System.setOut(oldOut);
System.setOut(oldOut);
}
}
}
@ -70,27 +70,27 @@ function runScriptEngine(opts, name) {
var str;
var methodsCalled = [
'asCollector',
'asType',
'bindTo',
'dropArguments',
'explicitCastArguments',
'filterArguments',
'filterReturnValue',
'findStatic',
'findVirtual',
'foldArguments',
'getter',
'guardWithTest',
'insertArguments',
'methodType',
'asCollector',
'asType',
'bindTo',
'dropArguments',
'explicitCastArguments',
'filterArguments',
'filterReturnValue',
'findStatic',
'findVirtual',
'foldArguments',
'getter',
'guardWithTest',
'insertArguments',
'methodType',
'setter'
];
function check(str, strs) {
for each (s in strs) {
if (str.indexOf(s) !== -1) {
continue;
continue;
}
print(s + " not found");
return;