优化

app/src/androidTest/java/io/legado/app/JsTest.kt

@@ -1,102 +1,12 @@
 package io.legado.app
 
-import com.script.SimpleBindings
 import io.legado.app.constant.SCRIPT_ENGINE
-import io.legado.app.data.entities.BookChapter
 import org.intellij.lang.annotations.Language
 import org.junit.Assert
 import org.junit.Test
-import org.mozilla.javascript.Context
 
 class JsTest {
 
-    @Language("js")
-    private val printJs = """
-        function print(str, newline) {
-            if (typeof(str) == 'undefined') {
-                str = 'undefined';
-            } else if (str == null) {
-                str = 'null';
-            } 
-            java.lang.System.out.print(String(str));
-            if (newline) java.lang.System.out.print("\n");
-        }
-        function println(str) { 
-            print(str, true);
-        }
-    """.trimIndent()
-
-    @Test
-    fun testMap() {
-        val map = hashMapOf("id" to "3242532321")
-        val bindings = SimpleBindings()
-        bindings["result"] = map
-        @Language("js")
-        val jsMap = "$=result;id=$.id;id"
-        val result = SCRIPT_ENGINE.eval(jsMap, bindings)?.toString()
-        Assert.assertEquals("3242532321", result)
-        @Language("js")
-        val jsMap1 = """result.get("id")"""
-        val result1 = SCRIPT_ENGINE.eval(jsMap1, bindings)?.toString()
-        Assert.assertEquals("3242532321", result1)
-    }
-
-    @Test
-    fun testFor() {
-        val context = SCRIPT_ENGINE.getScriptContext(SimpleBindings())
-        val scope = SCRIPT_ENGINE.getRuntimeScope(context)
-        try {
-            Context.enter().evaluateString(scope, printJs, "print", 1, null)
-        } finally {
-            Context.exit()
-        }
-        @Language("js")
-        val jsFor = """
-            let result = 0
-            let a=[1,2,3]
-            let l=a.length
-            for (let i = 0;i<l;i++){
-            	result = result + a[i]
-                println(i)
-            }
-            for (let o of a){
-            	result = result + o
-                println(o)
-            }
-            for (let o in a){
-            	result = result + o
-                println(o)
-            }
-            result
-        """.trimIndent()
-        val result = SCRIPT_ENGINE.eval(jsFor, scope).toString()
-        Assert.assertEquals("12012", result)
-    }
-
-    @Test
-    fun testReturnNull() {
-        val result = SCRIPT_ENGINE.eval("null")
-        Assert.assertEquals(null, result)
-    }
-
-    @Test
-    fun testReplace() {
-        @Language("js")
-        val js = """
-          result.replace(/\,/g,"，")
-            .replace(/\./g,"。")
-            .replace(/\!/g,"！")
-            .replace(/\?/g,"？")
-            .replace(/\…/g,"……")
-            .replace(/\;/g,"；")
-            .replace(/\:/g,"：")
-        """.trimIndent()
-        val bindings = SimpleBindings()
-        bindings["result"] = ",.!?…;:"
-        val result = SCRIPT_ENGINE.eval(js, bindings).toString()
-        Assert.assertEquals(result, "，。！？……；：")
-    }
-
     @Test
     fun testPackages() {
         @Language("js")
@@ -135,14 +45,4 @@ class JsTest {
         Assert.assertEquals(result1, "未知错误,请联系开发者!")
     }
 
-    @Test
-    fun chapterText() {
-        val chapter = BookChapter(title = "xxxyyy")
-        val bindings = SimpleBindings()
-        bindings["chapter"] = chapter
-        val js = "chapter.title"
-        val result = SCRIPT_ENGINE.eval(js, bindings)
-        Assert.assertEquals(result, "xxxyyy")
-    }
-
 }

app/src/test/java/io/legado/app/JsTest.kt

@@ -0,0 +1,127 @@
+package io.legado.app
+
+import com.script.SimpleBindings
+import io.legado.app.constant.SCRIPT_ENGINE
+import io.legado.app.data.entities.BookChapter
+import org.intellij.lang.annotations.Language
+import org.junit.Assert
+import org.junit.Test
+import org.mozilla.javascript.Context
+
+class JsTest {
+
+    @Language("js")
+    private val printJs = """
+        function print(str, newline) {
+            if (typeof(str) == 'undefined') {
+                str = 'undefined';
+            } else if (str == null) {
+                str = 'null';
+            } 
+            java.lang.System.out.print(String(str));
+            if (newline) java.lang.System.out.print("\n");
+        }
+        function println(str) { 
+            print(str, true);
+        }
+    """.trimIndent()
+
+    @Test
+    fun testMap() {
+        val map = hashMapOf("id" to "3242532321")
+        val bindings = SimpleBindings()
+        bindings["result"] = map
+        @Language("js")
+        val jsMap = "$=result;id=$.id;id"
+        val result = SCRIPT_ENGINE.eval(jsMap, bindings)?.toString()
+        Assert.assertEquals("3242532321", result)
+        @Language("js")
+        val jsMap1 = """result.get("id")"""
+        val result1 = SCRIPT_ENGINE.eval(jsMap1, bindings)?.toString()
+        Assert.assertEquals("3242532321", result1)
+    }
+
+    @Test
+    fun testFor() {
+        val context = SCRIPT_ENGINE.getScriptContext(SimpleBindings())
+        val scope = SCRIPT_ENGINE.getRuntimeScope(context)
+        try {
+            Context.enter().evaluateString(scope, printJs, "print", 1, null)
+        } finally {
+            Context.exit()
+        }
+        @Language("js")
+        val jsFor = """
+            let result = 0
+            let a=[1,2,3]
+            let l=a.length
+            for (let i = 0;i<l;i++){
+            	result = result + a[i]
+                println(i)
+            }
+            for (let o of a){
+            	result = result + o
+                println(o)
+            }
+            for (let o in a){
+            	result = result + o
+                println(o)
+            }
+            result
+        """.trimIndent()
+        val result = SCRIPT_ENGINE.eval(jsFor, scope).toString()
+        Assert.assertEquals("12012", result)
+    }
+
+    @Test
+    fun testReturnNull() {
+        val result = SCRIPT_ENGINE.eval("null")
+        Assert.assertEquals(null, result)
+    }
+
+    @Test
+    fun testReplace() {
+        @Language("js")
+        val js = """
+          result.replace(/\,/g,"，")
+            .replace(/\./g,"。")
+            .replace(/\!/g,"！")
+            .replace(/\?/g,"？")
+            .replace(/\…/g,"……")
+            .replace(/\;/g,"；")
+            .replace(/\:/g,"：")
+        """.trimIndent()
+        val bindings = SimpleBindings()
+        bindings["result"] = ",.!?…;:"
+        val result = SCRIPT_ENGINE.eval(js, bindings).toString()
+        Assert.assertEquals(result, "，。！？……；：")
+    }
+
+
+    @Test
+    fun chapterText() {
+        val chapter = BookChapter(title = "xxxyyy")
+        val bindings = SimpleBindings()
+        bindings["chapter"] = chapter
+        @Language("js")
+        val js = "chapter.title"
+        val result = SCRIPT_ENGINE.eval(js, bindings)
+        Assert.assertEquals(result, "xxxyyy")
+    }
+
+    @Test
+    fun javaListForEach() {
+        val list = arrayListOf(1, 2, 3)
+        val bindings = SimpleBindings()
+        bindings["list"] = list
+        @Language("js")
+        val js = """
+            var result = 0
+            list.forEach(item => {result = result + item})
+            result
+        """.trimIndent()
+        val result = SCRIPT_ENGINE.eval(js, bindings)
+        Assert.assertEquals(result, 6.0)
+    }
+
+}