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

8142969: Nashorn logging API requires testing

Browse Source 
Reviewed-by: sundar, mhaupt
This commit is contained in:
Michael Haupt 2016-07-21 10:40:05 +02:00
parent 49f0e7fc38
commit ec5ad88851
2 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
nashorn/test/script/currently-failing/logcoverage.js → nashorn/test/script/nosecurity/logcoverage.js
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 2016, 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
@ -22,12 +22,12 @@
*/
/**
* mh_coverage.js
* Screen scrape various logs to ensure that we cover enough functionality,
* e.g. method handle instrumentation
*
* @test
* @run
* @fork
* @option -Dnashorn.debug=true
*/
/*
@ -37,32 +37,32 @@
function runScriptEngine(opts, name) {
var imports = new JavaImporter(
Packages.jdk.nashorn.api.scripting,
java.io, java.lang, java.util);
Packages.jdk.nashorn.api.scripting,
java.io, java.lang, java.util);
with(imports) {
with (imports) {
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,36 +70,36 @@ function runScriptEngine(opts, name) {
var str;
var methodsCalled = [
'asCollector',
'asType',
'bindTo',
'dropArguments',
'explicitCastArguments',
'filterArguments',
'filterReturnValue',
'findStatic',
'findVirtual',
'foldArguments',
'getter',
'guardWithTest',
'insertArguments',
'methodType',
'setter'
'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;
}
print(s + " not found");
return;
if (str.indexOf(s) !== -1) {
continue;
}
print(s + " not found");
return;
}
print("check ok!");
}
str = runScriptEngine([ "--log=codegen,compiler=finest,methodhandles=finest,fields=finest" ], __DIR__ + "../basic/NASHORN-19.js");
str += runScriptEngine([ "--log=codegen,compiler=finest,methodhandles=finest,fields=finest" ], __DIR__ + "../basic/varargs.js");
str = runScriptEngine(["--log=codegen,compiler=finest,methodhandles=finest,fields=finest"], __DIR__ + "../basic/NASHORN-19.js");
str += runScriptEngine(["--log=codegen,compiler=finest,methodhandles=finest,fields=finest"], __DIR__ + "../basic/varargs.js");
check(str, methodsCalled);
check(str, ['return', 'get', 'set', '[fields]']);

4
nashorn/test/script/nosecurity/logcoverage.js.EXPECTED Normal file
View File

@ -0,0 +1,4 @@
check ok!
check ok!
check ok!
hello, world!