Merge pull request #59 from pecoose/main

Update testing scripts and descriptions in README

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "enre-java-test"]
 	path = enre-java-test
-	url = git@github.com:ba1man/enre-java-test.git
+	url = git@github.com:xjtu-enre/enre-java-test.git

README.md

@@ -105,25 +105,26 @@ $java -jar enre_java.jar java ...\frameworks\base base -d ...\base
 
 ## Testing
 
-### Prerequests
+### Prerequisite
 
 * Node.js 16~18
 
 ### Steps
 
 ENRE-java is integrated with [ENRE-test](https://github.com/xjtu-enre/enre-test). All you need to do for performing unit test is running the following script:
 
+1. Fetch the latest enre-java-test codebase locally:
+
 ```sh
-./scripts/gen_tests.sh
+python3 ./scripts/update_submodule.py
 ```
 
-or (In case you're using Windows platform):
+2. Generate test cases and suites:
 
-```cmd
-scripts\gen_tests.bat
+```sh
+python3 ./scripts/gen_tests.py
 ```
-
-Test cases and `JUnit` java files will be generated under directory `src/test/resources` and `src/test/java/client`.
+Test cases and `JUnit` java files will be generated under directory `src/test/resources/cases` and `src/test/java/client`.
 
 you can execute all `JUnit` test cases by executing the following command in the project directory:
 
@@ -137,3 +138,9 @@ or execute specific test case by passing class name:
 mvn clean test -DTest=AClassDefinesAFieldTest
 ```
 
+If you want to build the package without executing any test case:
+
+```sh
+mvn clean package assembly:single -DskipTests
+```
+

scripts/gen_tests.py

@@ -0,0 +1,51 @@
+#! /usr/bin/env python3
+
+import sys
+import os
+import shutil
+import subprocess
+
+ENRE_REPO = os.getcwd()
+TEST_REPO = os.path.join(ENRE_REPO, "enre-java-test")
+
+enre_paths = {
+    "docs": os.path.join(ENRE_REPO, "docs"),
+    "suites": os.path.join(ENRE_REPO, "src", "test", "java", "client"),
+    "cases": os.path.join(ENRE_REPO, "src", "test", "resources", "cases"),
+}
+
+test_paths = {
+    "docs": os.path.join(TEST_REPO, "docs"),
+    "tests": os.path.join(TEST_REPO, "tests"),
+    "suites": os.path.join(TEST_REPO, "tests", "suites"),
+    "cases": os.path.join(TEST_REPO, "tests", "cases"),
+}
+
+def preprocess():
+  if os.path.isdir(test_paths["docs"]):
+    shutil.rmtree(test_paths["docs"])
+  if os.path.isdir(test_paths["tests"]):
+    shutil.rmtree(test_paths["tests"])
+  if os.path.isdir(enre_paths["suites"]):
+    shutil.rmtree(enre_paths["suites"])
+  if os.path.isdir(enre_paths["cases"]):
+    shutil.rmtree(enre_paths["cases"])
+  shutil.copytree(enre_paths["docs"], test_paths["docs"])
+  os.makedirs(enre_paths["suites"], exist_ok=True)
+  # os.makedirs(enre_paths["cases"], exist_ok=True)
+  return
+
+def build():
+  os.chdir(TEST_REPO)
+  subprocess.run(["npm", "install"])
+  subprocess.run(["node", "--experimental-specifier-resolution", "node", os.path.join("src", "index.js")])
+  os.chdir(ENRE_REPO)
+  for file in os.listdir(test_paths["suites"]):
+    if not file.endswith(".java"):
+      continue
+    shutil.copy(os.path.join(test_paths["suites"], file), enre_paths["suites"])
+  shutil.copytree(test_paths["cases"], enre_paths["cases"])
+
+if __name__ == '__main__':
+  preprocess()
+  build()

scripts/update_submodule.py

@@ -0,0 +1,14 @@
+#! /usr/bin/env python3
+
+import subprocess
+import os
+
+ENRE_REPO = os.getcwd()
+TEST_REPO = "enre-java-test"
+
+subprocess.run(["git", "submodule", "init"])
+subprocess.run(["git", "submodule", "update"])
+os.chdir(TEST_REPO)
+subprocess.run(["git", "pull", "origin", "main"])
+subprocess.run(["git", "checkout", "main"])
+os.chdir(ENRE_REPO)