Reorganize test util functions for vectorized tests.

usnistgov · Dec 6, 2023 · cbed72c · cbed72c
1 parent 8635384
commit cbed72c
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/CLITest.java b/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/CLITest.java
@@ -41,6 +41,23 @@
  * Unit test for simple CLI.
  */
 public class CLITest {
+  void evaluateResult(@NonNull ExitStatus status, @NonNull ExitCode expectedCode) {
+	    status.generateMessage(true);
+	    assertAll(
+	        () -> assertEquals(expectedCode, status.getExitCode(), "exit code mismatch"),
+        () -> assertNull(status.getThrowable(), "expected null Throwable"));
+  }
+
+  void evaluateResult(@NonNull ExitStatus status, @NonNull ExitCode expectedCode,
+      @NonNull Class<? extends Throwable> thrownClass) {
+    status.generateMessage(true);
+    Throwable thrown = status.getThrowable();
+    assert thrown != null;
+    assertAll(
+        () -> assertEquals(expectedCode, status.getExitCode(), "exit code mismatch"),
+        () -> assertEquals(thrownClass, thrown.getClass(), "expected Throwable mismatch"));
+  }
+
   @Test
   void testHelp() {
     String[] args = {};
@@ -67,21 +84,4 @@ void testMetaschemaGenerateSchema() {
         "target/schema-test.json" };
     evaluateResult(CLI.runCli(args), ExitCode.OK);
   }
-
-  void evaluateResult(@NonNull ExitStatus status, @NonNull ExitCode expectedCode) {
-    status.generateMessage(true);
-    assertAll(
-        () -> assertEquals(expectedCode, status.getExitCode(), "exit code mismatch"),
-        () -> assertNull(status.getThrowable(), "expected null Throwable"));
-  }
-
-  void evaluateResult(@NonNull ExitStatus status, @NonNull ExitCode expectedCode,
-      @NonNull Class<? extends Throwable> thrownClass) {
-    status.generateMessage(true);
-    Throwable thrown = status.getThrowable();
-    assert thrown != null;
-    assertAll(
-        () -> assertEquals(expectedCode, status.getExitCode(), "exit code mismatch"),
-        () -> assertEquals(thrownClass, thrown.getClass(), "expected Throwable mismatch"));
-  }
 }