applying comment suggestions

shapesecurity · Feb 16, 2024 · ec2b399 · ec2b399
1 parent d94e3a6
commit ec2b399
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -64,4 +64,4 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 20
-      - run: node src/test/javascript/salvation.test.js
+      - run: node --
diff --git a/pom.xml b/pom.xml
@@ -109,11 +109,11 @@
                         </goals>
                         <phase>process-classes</phase>
                         <configuration>
-                            <mainClass>com.shapesecurity.salvation2.Salvation2</mainClass>
+                            <mainClass>com.shapesecurity.salvation2.JSInterface</mainClass>
                             <minifying>true</minifying>
                             <sourceMapsGenerated>false</sourceMapsGenerated>
                             <sourceFilesCopied>false</sourceFilesCopied>
-                            <targetFileName>salvation-v${project.version}.min.js</targetFileName>
+                            <targetFileName>salvation.min.js</targetFileName>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/.../shapesecurity/salvation2/Salvation2.java → ...shapesecurity/salvation2/JSInterface.java b/.../shapesecurity/salvation2/Salvation2.java → ...shapesecurity/salvation2/JSInterface.java
@@ -2,7 +2,7 @@
 
 import org.teavm.jso.JSBody;
 
-public class Salvation2 {
+public class JSInterface {
 	public static void main(String[] args) {
 		initParseList();
 		initParseSingle();
@@ -39,13 +39,13 @@ public static String getErrorsForSerializedCSP(String policyText) {
 
 	@JSBody(params = {}, script =
 		"(window || globalThis).getErrorsForSerializedCSPList = (policyText) => {\n" +
-		"return javaMethods.get('com.shapesecurity.salvation2.Salvation2.getErrorsForSerializedCSPList(Ljava/lang/String;)Ljava/lang/String;').invoke(policyText)\n" +
+		"return javaMethods.get('com.shapesecurity.salvation2.JSInterface.getErrorsForSerializedCSPList(Ljava/lang/String;)Ljava/lang/String;').invoke(policyText)\n" +
 		"}")
 	static native void initParseList();
 
 	@JSBody(params = {}, script =
 		"(window || globalThis).getErrorsForSerializedCSP = (policyText) => {\n" +
-			"return javaMethods.get('com.shapesecurity.salvation2.Salvation2.getErrorsForSerializedCSP(Ljava/lang/String;)Ljava/lang/String;').invoke(policyText)\n" +
+			"return javaMethods.get('com.shapesecurity.salvation2.JSInterface.getErrorsForSerializedCSP(Ljava/lang/String;)Ljava/lang/String;').invoke(policyText)\n" +
 			"}")
 	static native void initParseSingle();
 }

diff --git a/src/test/javascript/salvation.test.js b/src/test/javascript/salvation.test.js
@@ -1,16 +1,13 @@
+'use strict';
 const test = require('node:test');
 const assert = require('node:assert');
-const salvation = require('../../../target/javascript/salvation-v3.0.1.min.js');
+const salvation = require('../../../target/javascript/salvation.min.js');
 
 test('salvation initialization', () => {
     assert.notStrictEqual(salvation.main, undefined);
-    try {
-        salvation.main();
-        assert.notStrictEqual(getErrorsForSerializedCSP, undefined);
-        assert.notStrictEqual(getErrorsForSerializedCSPList, undefined);
-    } catch (e) {
-        assert.fail('main function should not throw an exception', e.message);
-    }
+    salvation.main();
+    assert.notStrictEqual(getErrorsForSerializedCSP, undefined);
+    assert.notStrictEqual(getErrorsForSerializedCSPList, undefined);
 });
 
 test('.getErrorsForSerializedCSP() gives no errors for a valid CSP', () => {