Rename generic -> miscellaneous.

The intent is to reduce confusion with the language feature "generics."
lf-lang · Jun 5, 2023 · ba1268d · ba1268d · lhstrh · Jun 5, 2023
1 parent 5b445ca
commit ba1268d
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 19 deletions.
diff --git a/core/src/integrationTest/java/org/lflang/tests/RuntimeTest.java b/core/src/integrationTest/java/org/lflang/tests/RuntimeTest.java
@@ -54,10 +54,10 @@ protected boolean supportsDockerOption() {
   }
 
   @Test
-  public void runGenericTests() {
+  public void runMiscellaneousTests() {
     runTestsForTargets(
-        Message.DESC_GENERIC,
-        TestCategory.GENERIC::equals,
+        Message.DESC_MISCELLANEOUS,
+        TestCategory.MISCELLANEOUS::equals,
         Configurators::noChanges,
         TestLevel.EXECUTION,
         false);

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CTest.java
@@ -62,8 +62,8 @@ protected boolean supportsDockerOption() {
 
   @Test
   @Override
-  public void runGenericTests() {
-    super.runGenericTests();
+  public void runMiscellaneousTests() {
+    super.runMiscellaneousTests();
   }
 
   @Test

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CZephyrTest.java
@@ -56,12 +56,12 @@ public void buildZephyrTests() {
   }
 
   @Test
-  public void buildGenericTests() {
+  public void buildMiscellaneousTests() {
     Assumptions.assumeTrue(isLinux(), "Zephyr tests only run on Linux");
     super.runTestsFor(
         List.of(Target.C),
-        Message.DESC_GENERIC,
-        TestCategory.GENERIC::equals,
+        Message.DESC_MISCELLANEOUS,
+        TestCategory.MISCELLANEOUS::equals,
         Configurators::makeZephyrCompatibleUnthreaded,
         TestLevel.BUILD,
         false);

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/CppTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/CppTest.java
@@ -51,8 +51,8 @@ protected boolean supportsEnclaves() {
 
   @Test
   @Override
-  public void runGenericTests() {
-    super.runGenericTests();
+  public void runMiscellaneousTests() {
+    super.runMiscellaneousTests();
   }
 
   @Test

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/PythonTest.java
@@ -73,8 +73,8 @@ protected boolean supportsDockerOption() {
 
   @Test
   @Override
-  public void runGenericTests() {
-    super.runGenericTests();
+  public void runMiscellaneousTests() {
+    super.runMiscellaneousTests();
   }
 
   @Test

diff --git a/core/src/integrationTest/java/org/lflang/tests/runtime/TypeScriptTest.java b/core/src/integrationTest/java/org/lflang/tests/runtime/TypeScriptTest.java
@@ -31,8 +31,8 @@ protected boolean supportsFederatedExecution() {
 
   @Test
   @Override
-  public void runGenericTests() {
-    super.runGenericTests();
+  public void runMiscellaneousTests() {
+    super.runMiscellaneousTests();
   }
 
   @Test

diff --git a/core/src/testFixtures/java/org/lflang/tests/TestBase.java b/core/src/testFixtures/java/org/lflang/tests/TestBase.java
@@ -139,7 +139,7 @@ public static class Message {
 
     /* Descriptions of collections of tests. */
     public static final String DESC_SERIALIZATION = "Run serialization tests.";
-    public static final String DESC_GENERIC = "Run generic tests.";
+    public static final String DESC_MISCELLANEOUS = "Run miscellaneous tests.";
     public static final String DESC_GENERICS = "Run generics tests.";
     public static final String DESC_TYPE_PARMS = "Run tests for reactors with type parameters.";
     public static final String DESC_MULTIPORT = "Run multiport tests.";

diff --git a/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java b/core/src/testFixtures/java/org/lflang/tests/TestRegistry.java
@@ -118,9 +118,9 @@ public enum TestCategory {
     CONCURRENT(true),
     /** Test about enclaves */
     ENCLAVE(false),
-    /** Generic tests, ie, tests that all targets are supposed to implement. */
-    GENERIC(true),
-    /** Tests about generics, not to confuse with {@link #GENERIC}. */
+    /** Miscellaneous tests, ie, tests that all targets are supposed to implement. */
+    MISCELLANEOUS(true),
+    /** Tests about generics. */
     GENERICS(true),
     /** Tests about multiports and banks of reactors. */
     MULTIPORT(true),
@@ -313,7 +313,7 @@ public static class TestDirVisitor extends SimpleFileVisitor<Path> {
      * @param srcBasePath The test sources directory
      */
     public TestDirVisitor(ResourceSet rs, Target target, Path srcBasePath) {
-      stack.push(TestCategory.GENERIC);
+      stack.push(TestCategory.MISCELLANEOUS);
       this.rs = rs;
       this.target = target;
       this.srcBasePath = srcBasePath;