/hg/rhino-tests: Fixed names of two tests in Makefile. Fixed com...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Wed Dec 5 01:46:54 PST 2012
changeset dea9193daa78 in /hg/rhino-tests
details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=dea9193daa78
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Wed Dec 05 10:49:56 2012 +0100
Fixed names of two tests in Makefile. Fixed compiler warnings.
diffstat:
ChangeLog | 14 ++++++++++++++
Makefile | 4 ++--
src/org/RhinoTests/BindingsClassTest.java | 2 ++
src/org/RhinoTests/CompilableClassTest.java | 2 ++
src/org/RhinoTests/InvocableClassTest.java | 4 +++-
src/org/RhinoTests/ScriptContextClassTest.java | 2 ++
src/org/RhinoTests/ScriptEngineClassTest.java | 2 ++
src/org/RhinoTests/ScriptEngineFactoryClassTest.java | 2 ++
src/org/RhinoTests/ScriptEngineTest.java | 2 +-
src/org/RhinoTests/SimpleBindingsTest.java | 4 ++--
10 files changed, 32 insertions(+), 6 deletions(-)
diffs (190 lines):
diff -r d2384fcf357a -r dea9193daa78 ChangeLog
--- a/ChangeLog Tue Dec 04 10:07:05 2012 +0100
+++ b/ChangeLog Wed Dec 05 10:49:56 2012 +0100
@@ -1,3 +1,17 @@
+2012-12-05 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile:
+ Fixed names of two tests.
+ * src/org/RhinoTests/BindingsClassTest.java:
+ * src/org/RhinoTests/CompilableClassTest.java:
+ * src/org/RhinoTests/InvocableClassTest.java:
+ * src/org/RhinoTests/ScriptContextClassTest.java:
+ * src/org/RhinoTests/ScriptEngineClassTest.java:
+ * src/org/RhinoTests/ScriptEngineFactoryClassTest.java:
+ * src/org/RhinoTests/ScriptEngineTest.java:
+ * src/org/RhinoTests/SimpleBindingsTest.java:
+ Fixed compiler warnings.
+
2012-12-04 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/org/RhinoTests/CompiledScriptTest.java:
diff -r d2384fcf357a -r dea9193daa78 Makefile
--- a/Makefile Tue Dec 04 10:07:05 2012 +0100
+++ b/Makefile Wed Dec 05 10:49:56 2012 +0100
@@ -70,8 +70,8 @@
ScriptContextClassTest \
ScriptExceptionTest \
ScriptExceptionClassTest \
- SimpleBindingsTests \
- SimpleBindingsClassTests \
+ SimpleBindingsTest \
+ SimpleBindingsClassTest \
SimpleScriptContextTest \
SimpleScriptContextClassTest \
AbstractScriptEngineClassTest
diff -r d2384fcf357a -r dea9193daa78 src/org/RhinoTests/BindingsClassTest.java
--- a/src/org/RhinoTests/BindingsClassTest.java Tue Dec 04 10:07:05 2012 +0100
+++ b/src/org/RhinoTests/BindingsClassTest.java Wed Dec 05 10:49:56 2012 +0100
@@ -273,6 +273,7 @@
*/
protected void testGetConstructors() {
// map of constructors which should exists
+ @SuppressWarnings("unused")
Map<String, String> testedConstructors = null;
Map<String, String> testedConstructors_jdk6 = new HashMap<String, String>();
Map<String, String> testedConstructors_jdk7 = new HashMap<String, String>();
@@ -294,6 +295,7 @@
*/
protected void testGetDeclaredConstructors() {
// map of constructors which should exists
+ @SuppressWarnings("unused")
Map<String, String> testedConstructors = null;
Map<String, String> testedConstructors_jdk6 = new HashMap<String, String>();
Map<String, String> testedConstructors_jdk7 = new HashMap<String, String>();
diff -r d2384fcf357a -r dea9193daa78 src/org/RhinoTests/CompilableClassTest.java
--- a/src/org/RhinoTests/CompilableClassTest.java Tue Dec 04 10:07:05 2012 +0100
+++ b/src/org/RhinoTests/CompilableClassTest.java Wed Dec 05 10:49:56 2012 +0100
@@ -274,6 +274,7 @@
*/
protected void testGetConstructors() {
// map of constructors which should exists
+ @SuppressWarnings("unused")
Map<String, String> testedConstructors = null;
Map<String, String> testedConstructors_jdk6 = new HashMap<String, String>();
Map<String, String> testedConstructors_jdk7 = new HashMap<String, String>();
@@ -295,6 +296,7 @@
*/
protected void testGetDeclaredConstructors() {
// map of constructors which should exists
+ @SuppressWarnings("unused")
Map<String, String> testedConstructors = null;
Map<String, String> testedConstructors_jdk6 = new HashMap<String, String>();
Map<String, String> testedConstructors_jdk7 = new HashMap<String, String>();
diff -r d2384fcf357a -r dea9193daa78 src/org/RhinoTests/InvocableClassTest.java
--- a/src/org/RhinoTests/InvocableClassTest.java Tue Dec 04 10:07:05 2012 +0100
+++ b/src/org/RhinoTests/InvocableClassTest.java Wed Dec 05 10:49:56 2012 +0100
@@ -93,7 +93,7 @@
* Test for method javax.script.Invocable.getClass().isInstance()
*/
protected void testIsInstance() {
- assertTrue(this.invocableClass.isInstance((Invocable)(new ScriptEngineManager().getEngineByName(Constants.EngineNames.ENGINE_NAME_JavaScript))),
+ assertTrue(this.invocableClass.isInstance((new ScriptEngineManager().getEngineByName(Constants.EngineNames.ENGINE_NAME_JavaScript))),
"Method Invocable.getClass().isInstance() returns wrong value");
}
@@ -273,6 +273,7 @@
*/
protected void testGetConstructors() {
// map of constructors which should exists
+ @SuppressWarnings("unused")
Map<String, String> testedConstructors = null;
Map<String, String> testedConstructors_jdk6 = new HashMap<String, String>();
Map<String, String> testedConstructors_jdk7 = new HashMap<String, String>();
@@ -294,6 +295,7 @@
*/
protected void testGetDeclaredConstructors() {
// map of constructors which should exists
+ @SuppressWarnings("unused")
Map<String, String> testedConstructors = null;
Map<String, String> testedConstructors_jdk6 = new HashMap<String, String>();
Map<String, String> testedConstructors_jdk7 = new HashMap<String, String>();
diff -r d2384fcf357a -r dea9193daa78 src/org/RhinoTests/ScriptContextClassTest.java
--- a/src/org/RhinoTests/ScriptContextClassTest.java Tue Dec 04 10:07:05 2012 +0100
+++ b/src/org/RhinoTests/ScriptContextClassTest.java Wed Dec 05 10:49:56 2012 +0100
@@ -273,6 +273,7 @@
*/
protected void testGetConstructors() {
// map of constructors which should exists
+ @SuppressWarnings("unused")
Map<String, String> testedConstructors = null;
Map<String, String> testedConstructors_jdk6 = new HashMap<String, String>();
Map<String, String> testedConstructors_jdk7 = new HashMap<String, String>();
@@ -294,6 +295,7 @@
*/
protected void testGetDeclaredConstructors() {
// map of constructors which should exists
+ @SuppressWarnings("unused")
Map<String, String> testedConstructors = null;
Map<String, String> testedConstructors_jdk6 = new HashMap<String, String>();
Map<String, String> testedConstructors_jdk7 = new HashMap<String, String>();
diff -r d2384fcf357a -r dea9193daa78 src/org/RhinoTests/ScriptEngineClassTest.java
--- a/src/org/RhinoTests/ScriptEngineClassTest.java Tue Dec 04 10:07:05 2012 +0100
+++ b/src/org/RhinoTests/ScriptEngineClassTest.java Wed Dec 05 10:49:56 2012 +0100
@@ -273,6 +273,7 @@
*/
protected void testGetConstructors() {
// map of constructors which should exists
+ @SuppressWarnings("unused")
Map<String, String> testedConstructors = null;
Map<String, String> testedConstructors_jdk6 = new HashMap<String, String>();
Map<String, String> testedConstructors_jdk7 = new HashMap<String, String>();
@@ -294,6 +295,7 @@
*/
protected void testGetDeclaredConstructors() {
// map of constructors which should exists
+ @SuppressWarnings("unused")
Map<String, String> testedConstructors = null;
Map<String, String> testedConstructors_jdk6 = new HashMap<String, String>();
Map<String, String> testedConstructors_jdk7 = new HashMap<String, String>();
diff -r d2384fcf357a -r dea9193daa78 src/org/RhinoTests/ScriptEngineFactoryClassTest.java
--- a/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Tue Dec 04 10:07:05 2012 +0100
+++ b/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Wed Dec 05 10:49:56 2012 +0100
@@ -273,6 +273,7 @@
*/
protected void testGetConstructors() {
// map of constructors which should exists
+ @SuppressWarnings("unused")
Map<String, String> testedConstructors = null;
Map<String, String> testedConstructors_jdk6 = new HashMap<String, String>();
Map<String, String> testedConstructors_jdk7 = new HashMap<String, String>();
@@ -294,6 +295,7 @@
*/
protected void testGetDeclaredConstructors() {
// map of constructors which should exists
+ @SuppressWarnings("unused")
Map<String, String> testedConstructors = null;
Map<String, String> testedConstructors_jdk6 = new HashMap<String, String>();
Map<String, String> testedConstructors_jdk7 = new HashMap<String, String>();
diff -r d2384fcf357a -r dea9193daa78 src/org/RhinoTests/ScriptEngineTest.java
--- a/src/org/RhinoTests/ScriptEngineTest.java Tue Dec 04 10:07:05 2012 +0100
+++ b/src/org/RhinoTests/ScriptEngineTest.java Wed Dec 05 10:49:56 2012 +0100
@@ -511,7 +511,7 @@
* @throws Exception if this test case fails.
*/
protected void testGetEngineByMimeTypeNegative1() throws Exception {
- assertNotNull(engineManager, "Script engine manager was not created");
+ assertNotNull(this.engineManager, "Script engine manager was not created");
try {
@SuppressWarnings("unused")
ScriptEngine scriptEngine = this.engineManager.getEngineByMimeType(null);
diff -r d2384fcf357a -r dea9193daa78 src/org/RhinoTests/SimpleBindingsTest.java
--- a/src/org/RhinoTests/SimpleBindingsTest.java Tue Dec 04 10:07:05 2012 +0100
+++ b/src/org/RhinoTests/SimpleBindingsTest.java Wed Dec 05 10:49:56 2012 +0100
@@ -71,14 +71,14 @@
}
protected void testConstructor2() {
- SimpleBindings simpleBindings = new SimpleBindings(new HashMap());
+ SimpleBindings simpleBindings = new SimpleBindings(new HashMap<String, Object>());
assertNotNull(simpleBindings, "new SimpleBindings() failed");
assertTrue(simpleBindings.isEmpty(), "simpleBindings should be empty");
assertTrue(simpleBindings.size() == 0, "simpleBindings should be empty");
}
protected void testConstructor3() {
- SimpleBindings simpleBindings = new SimpleBindings(new TreeMap());
+ SimpleBindings simpleBindings = new SimpleBindings(new TreeMap<String, Object>());
assertNotNull(simpleBindings, "new SimpleBindings() failed");
assertTrue(simpleBindings.isEmpty(), "simpleBindings should be empty");
assertTrue(simpleBindings.size() == 0, "simpleBindings should be empty");
More information about the distro-pkg-dev
mailing list