fix warnings

rbri · rbri · commit 60a6526241ca · 2021-10-28T13:32:09.000+02:00
diff --git a/src/test/java/net/sourceforge/htmlunit/ArgumentsTest.java b/src/test/java/net/sourceforge/htmlunit/ArgumentsTest.java
@@ -133,7 +133,7 @@ protected boolean hasFeature(final Context cx, final int featureIndex) {
                 return super.hasFeature(cx, featureIndex);
             }
         };
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 final Scriptable scope = cx.initSafeStandardObjects();
@@ -173,7 +173,7 @@ public void normal() throws Exception {
     }
 
     private static void test(final String script, final Object expected) {
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 try {
diff --git a/src/test/java/net/sourceforge/htmlunit/ContextMethodsTest.java b/src/test/java/net/sourceforge/htmlunit/ContextMethodsTest.java
@@ -50,7 +50,7 @@ protected Script compileString(String source, Evaluator compiler,
 
         final String source = "eval('1 + 2')";
 
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(Context cx) {
                 final Scriptable scope = cx.initSafeStandardObjects();
diff --git a/src/test/java/net/sourceforge/htmlunit/DecompileTest.java b/src/test/java/net/sourceforge/htmlunit/DecompileTest.java
@@ -16,12 +16,12 @@ public class DecompileTest {
 
     /**
      * As of head of trunk on 30.09.09, decompile of "new Date()" returns "new Date" without parentheses.
-     * @see <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=519692">Bug 519692</a> 
+     * @see <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=519692">Bug 519692</a>
      */
     @Test
     public void newObject0Arg() {
         final String source = "var x = new Date().getTime();";
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 final Script script = cx.compileString(source, "my script", 0, null);
diff --git a/src/test/java/net/sourceforge/htmlunit/DelegatorAndHostObjectTest.java b/src/test/java/net/sourceforge/htmlunit/DelegatorAndHostObjectTest.java
@@ -76,7 +76,7 @@ public void strictEqualsDelegators() {
     }
 
     private static void test(final String script, final Object expected) {
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 try {
diff --git a/src/test/java/net/sourceforge/htmlunit/EvalScopeTest.java b/src/test/java/net/sourceforge/htmlunit/EvalScopeTest.java
@@ -51,7 +51,7 @@ protected boolean hasFeature(Context cx, int featureIndex) {
                 return super.hasFeature(cx, featureIndex);
             }
         };
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 try {
diff --git a/src/test/java/net/sourceforge/htmlunit/ExceptionMessageTest.java b/src/test/java/net/sourceforge/htmlunit/ExceptionMessageTest.java
@@ -39,7 +39,7 @@ public void undefinedFromUndefined() {
     }
 
     private static void exceptionMessage(final String script, final String expectedMesage) {
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 try {
@@ -83,7 +83,7 @@ protected boolean hasFeature(Context cx, int featureIndex) {
 
         final String script = "o.readonlyProp = 123";
 
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 try {
diff --git a/src/test/java/net/sourceforge/htmlunit/ExceptionPropertiesTest.java b/src/test/java/net/sourceforge/htmlunit/ExceptionPropertiesTest.java
@@ -67,7 +67,7 @@ public void stack() {
     }
 
     private static void testIt(final String script, final Object expected) {
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 cx.setLanguageVersion(Context.VERSION_ES6);
diff --git a/src/test/java/net/sourceforge/htmlunit/FunctionCallerTest.java b/src/test/java/net/sourceforge/htmlunit/FunctionCallerTest.java
@@ -26,7 +26,7 @@ public class FunctionCallerTest {
     public void upperScopeVarShouldntBeSetWithVarFunctionWithSameName() throws Exception {
         final String script = "var g = true; (function() { var g = function g() { return 1; };\n"
                 + "return this.g == undefined })();g;\n";
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 final Scriptable scope = cx.initSafeStandardObjects();
@@ -53,7 +53,7 @@ public void notEnumerated() throws Exception {
                 + "  return f();\n"
                 + "}\n"
                 + "g();\n";
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 final Scriptable scope = cx.initSafeStandardObjects();
@@ -84,7 +84,7 @@ public void callee() throws Exception {
             + "}\n"
             + "f();\n";
 
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 final Scriptable scope = cx.initSafeStandardObjects();
@@ -117,7 +117,7 @@ public void callerArguments() throws Exception {
             + "f();\n"
             + "output";
 
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 final Scriptable scope = cx.initSafeStandardObjects();
@@ -151,7 +151,7 @@ public void arguments() throws Exception {
             + "f();\n"
             + "output";
 
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 final Scriptable scope = cx.initSafeStandardObjects();
@@ -181,7 +181,7 @@ public void callerArgumentsCallee() throws Exception {
             + "g();\n"
             + "output";
 
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 final Scriptable scope = cx.initSafeStandardObjects();
diff --git a/src/test/java/net/sourceforge/htmlunit/FunctionNullSetTest.java b/src/test/java/net/sourceforge/htmlunit/FunctionNullSetTest.java
@@ -25,7 +25,7 @@ public class FunctionNullSetTest {
     @Test
     public void setFunctionToNull() throws Exception {
         final String script = "function onclick() {onclick=null}";
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 try {
diff --git a/src/test/java/net/sourceforge/htmlunit/FunctionTest.java b/src/test/java/net/sourceforge/htmlunit/FunctionTest.java
@@ -29,7 +29,7 @@ public void testFunctionWithSlashSlash() {
     }
 
     private static void assertEvaluates(final Object expected, final String source) {
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(Context cx) {
                 final Scriptable scope = cx.initSafeStandardObjects();
diff --git a/src/test/java/net/sourceforge/htmlunit/HostExceptionsTest.java b/src/test/java/net/sourceforge/htmlunit/HostExceptionsTest.java
@@ -58,7 +58,7 @@ public void testDontCatchJavaException_inFunction() throws Exception {
     private static void doTest(final String jsExpression) throws Exception {
         final String script = "var foo = new MyScriptable(); try { " + jsExpression + "} catch(e) {}";
 
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 final Scriptable scope = cx.initSafeStandardObjects();
diff --git a/src/test/java/net/sourceforge/htmlunit/LookupSetterTest.java b/src/test/java/net/sourceforge/htmlunit/LookupSetterTest.java
@@ -39,15 +39,21 @@ public void lookedUpGetter_equals() throws Exception {
     }
 
     private void test(final String expected, final String src) throws Exception {
-        final ContextAction action = new ContextActionImpl() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
-            protected Object doRun(Context cx) throws Exception {
-                final Scriptable scope = cx.initSafeStandardObjects(new TopScope());
-                ScriptableObject.defineClass(scope, Foo.class);
-                cx.evaluateString(scope, defineSetterAndGetterX, "initX", 1, null);
-                Object result = String.valueOf(cx.evaluateString(scope, src, "test", 1, null));
-                assertEquals(expected, result);
-                return null;
+            public Object run(final Context cx) {
+                try {
+                    final Scriptable scope = cx.initSafeStandardObjects(new TopScope());
+                    ScriptableObject.defineClass(scope, Foo.class);
+                    cx.evaluateString(scope, defineSetterAndGetterX, "initX", 1, null);
+                    Object result = String.valueOf(cx.evaluateString(scope, src, "test", 1, null));
+                    assertEquals(expected, result);
+                    return null;
+                } catch (final Exception e) {
+                    if (e instanceof RuntimeException)
+                        throw (RuntimeException) e;
+                    throw new RuntimeException(e);
+                }
             }
         };
 
diff --git a/src/test/java/net/sourceforge/htmlunit/MemberBoxTest.java b/src/test/java/net/sourceforge/htmlunit/MemberBoxTest.java
@@ -22,7 +22,7 @@ public class MemberBoxTest {
     public void descriptionOfIllegalArgumentException() {
         final String script = "var o = new MyHostObject(); o.someFunction(new Object())";
 
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 try {
diff --git a/src/test/java/net/sourceforge/htmlunit/NativeArrayTest.java b/src/test/java/net/sourceforge/htmlunit/NativeArrayTest.java
@@ -41,7 +41,7 @@ public void java7Sort() {
     }
 
     private static void test(final String script) {
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 try {
diff --git a/src/test/java/net/sourceforge/htmlunit/NativeErrorTest.java b/src/test/java/net/sourceforge/htmlunit/NativeErrorTest.java
@@ -35,7 +35,7 @@ public void stack() throws Exception {
                 + "test();\n"
                 + "output";
 
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 final Scriptable scope = cx.initSafeStandardObjects();
@@ -68,7 +68,7 @@ public void stackNewError() throws Exception {
                 + "test();\n"
                 + "output";
 
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 final Scriptable scope = cx.initSafeStandardObjects();
@@ -97,7 +97,7 @@ public void stackNewErrorWithoutThrow() throws Exception {
                 + "test();\n"
                 + "output";
 
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 final Scriptable scope = cx.initSafeStandardObjects();
diff --git a/src/test/java/net/sourceforge/htmlunit/NativeGlobalTest.java b/src/test/java/net/sourceforge/htmlunit/NativeGlobalTest.java
@@ -30,7 +30,7 @@ public void parseInt() throws Exception {
     }
 
     private static void doTest(final double expected, final String src) throws Exception {
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 cx.setLanguageVersion(Context.VERSION_ES6);
diff --git a/src/test/java/net/sourceforge/htmlunit/NativeObjectTest.java b/src/test/java/net/sourceforge/htmlunit/NativeObjectTest.java
@@ -29,7 +29,7 @@ public void assign() throws Exception {
                 + "test();\n"
                 + "output";
 
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 final Scriptable scope = cx.initSafeStandardObjects();
@@ -55,7 +55,7 @@ public void assignNull() throws Exception {
                 + "test();\n"
                 + "output";
 
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 final Scriptable scope = cx.initSafeStandardObjects();
diff --git a/src/test/java/net/sourceforge/htmlunit/NativeRegExpTest.java b/src/test/java/net/sourceforge/htmlunit/NativeRegExpTest.java
@@ -45,7 +45,7 @@ public void changed() throws Exception {
     }
 
     private static void test(final String script, final Object expected) {
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 try {
diff --git a/src/test/java/net/sourceforge/htmlunit/ParserTest.java b/src/test/java/net/sourceforge/htmlunit/ParserTest.java
@@ -61,7 +61,7 @@ public void functionObjectMethod() {
     }
 
     private static void test(final String script, final Object expected) {
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 try {
diff --git a/src/test/java/net/sourceforge/htmlunit/PrimitiveTypeScopeResolutionTest.java b/src/test/java/net/sourceforge/htmlunit/PrimitiveTypeScopeResolutionTest.java
@@ -45,11 +45,9 @@ public void propertyAccess() {
     }
 
     private static void testWithTwoScopes(final String scriptScope1, final String scriptScope2) {
-        final ContextAction action = new ContextAction()
-        {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
-            public Object run(final Context cx)
-            {
+            public Object run(final Context cx){
                 final Scriptable scope1 = cx.initSafeStandardObjects(new MySimpleScriptableObject("scope1"));
                 final Scriptable scope2 = cx.initSafeStandardObjects(new MySimpleScriptableObject("scope2"));
                 cx.evaluateString(scope2, scriptScope2, "source2", 1, null);
diff --git a/src/test/java/net/sourceforge/htmlunit/ScriptRuntimeTest.java b/src/test/java/net/sourceforge/htmlunit/ScriptRuntimeTest.java
@@ -88,7 +88,7 @@ protected boolean hasFeature(Context cx, int featureIndex) {
             }
         };
 
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 try {
@@ -127,7 +127,7 @@ public void enumChangeObject() {
     }
 
     private static void test(final String script, final Object expected) {
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 try {
diff --git a/src/test/java/net/sourceforge/htmlunit/ScriptableObjectTest.java b/src/test/java/net/sourceforge/htmlunit/ScriptableObjectTest.java
@@ -39,7 +39,7 @@ public void arrayConstructor() {
     }
 
     private static void test(final String script) {
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 try {
diff --git a/src/test/java/net/sourceforge/htmlunit/StackTraceTest.java b/src/test/java/net/sourceforge/htmlunit/StackTraceTest.java
@@ -33,7 +33,7 @@ public void testFailureStackTrace() {
     }
 
     private static void runWithExpectedStackTrace(final String _source, final String _expectedStackTrace) {
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(final Context cx) {
                 final Scriptable scope = cx.initSafeStandardObjects();
diff --git a/src/test/java/net/sourceforge/htmlunit/Utilities.java b/src/test/java/net/sourceforge/htmlunit/Utilities.java
@@ -14,7 +14,7 @@ public class Utilities {
      * @param script the script
      */
     static void executeScript(final String script) {
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(Context cx) {
                 final Scriptable scope = cx.initSafeStandardObjects();
@@ -29,7 +29,7 @@ public Object run(Context cx) {
      * @param script the script
      */
     static void executeScript(final String script, final int optimizationLevel) {
-        final ContextAction action = new ContextAction() {
+        final ContextAction<Object> action = new ContextAction<Object>() {
             @Override
             public Object run(Context cx) {
                 final Scriptable scope = cx.initSafeStandardObjects();
diff --git a/src/test/java/net/sourceforge/htmlunit/Utils.java b/src/test/java/net/sourceforge/htmlunit/Utils.java
@@ -12,7 +12,7 @@ public class Utils {
     /**
      * Runs the action successively with all available optimization levels
      */
-    public static void runWithAllOptimizationLevels(final ContextAction action) {
+    public static void runWithAllOptimizationLevels(final ContextAction<Object> action) {
         runWithOptimizationLevel(action, -1);
         runWithOptimizationLevel(action, 0);
         runWithOptimizationLevel(action, 1);
@@ -21,7 +21,7 @@ public static void runWithAllOptimizationLevels(final ContextAction action) {
     /**
      * Runs the action successively with all available optimization levels
      */
-    public static void runWithAllOptimizationLevels(final ContextFactory contextFactory, final ContextAction action) {
+    public static void runWithAllOptimizationLevels(final ContextFactory contextFactory, final ContextAction<Object> action) {
         runWithOptimizationLevel(contextFactory, action, -1);
         runWithOptimizationLevel(contextFactory, action, 0);
         runWithOptimizationLevel(contextFactory, action, 1);
@@ -30,14 +30,14 @@ public static void runWithAllOptimizationLevels(final ContextFactory contextFact
     /**
      * Runs the provided action at the given optimization level
      */
-    public static void runWithOptimizationLevel(final ContextAction action, final int optimizationLevel) {
+    public static void runWithOptimizationLevel(final ContextAction<Object> action, final int optimizationLevel) {
         runWithOptimizationLevel(new ContextFactory(), action, optimizationLevel);
     }
 
     /**
      * Runs the provided action at the given optimization level
      */
-    public static void runWithOptimizationLevel(final ContextFactory contextFactory, final ContextAction action, final int optimizationLevel) {
+    public static void runWithOptimizationLevel(final ContextFactory contextFactory, final ContextAction<Object> action, final int optimizationLevel) {
         final Context cx = contextFactory.enterContext();
         try {
             cx.setOptimizationLevel(optimizationLevel);

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public void strictEqualsDelegators() {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`private static void test(final String script, final Object expected) {`
`79`		`- final ContextAction action = new ContextAction() {`
	`79`	`+ final ContextAction<Object> action = new ContextAction<Object>() {`
`80`	`80`	`@Override`
`81`	`81`	`public Object run(final Context cx) {`
`82`	`82`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ protected boolean hasFeature(Context cx, int featureIndex) {`
`51`	`51`	`return super.hasFeature(cx, featureIndex);`
`52`	`52`	`}`
`53`	`53`	`};`
`54`		`- final ContextAction action = new ContextAction() {`
	`54`	`+ final ContextAction<Object> action = new ContextAction<Object>() {`
`55`	`55`	`@Override`
`56`	`56`	`public Object run(final Context cx) {`
`57`	`57`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public void stack() {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`private static void testIt(final String script, final Object expected) {`
`70`		`- final ContextAction action = new ContextAction() {`
	`70`	`+ final ContextAction<Object> action = new ContextAction<Object>() {`
`71`	`71`	`@Override`
`72`	`72`	`public Object run(final Context cx) {`
`73`	`73`	`cx.setLanguageVersion(Context.VERSION_ES6);`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public void testFunctionWithSlashSlash() {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`private static void assertEvaluates(final Object expected, final String source) {`
`32`		`- final ContextAction action = new ContextAction() {`
	`32`	`+ final ContextAction<Object> action = new ContextAction<Object>() {`
`33`	`33`	`@Override`
`34`	`34`	`public Object run(Context cx) {`
`35`	`35`	`final Scriptable scope = cx.initSafeStandardObjects();`