Merge pull request #1356 from lf-lang/fix-1354

Reduction of output in formatter tests
lf-lang · Sep 6, 2022 · f5f7095 · f5f7095
2 parents de152ef + 707fa29
commit f5f7095
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 18 deletions.
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/RoundTripTests.java b/org.lflang.tests/src/org/lflang/tests/compiler/RoundTripTests.java
@@ -46,31 +46,30 @@ public void roundTripTest() throws Exception {
 
     private void run(Path file) throws Exception {
         Model originalModel = parse(file);
-        System.out.printf("Running formatter on %s...%n", file);
         Assertions.assertTrue(originalModel.eResource().getErrors().isEmpty());
         // TODO: Check that the output is a fixed point
         final int smallLineLength = 20;
-        String squishedTestCase = FormattingUtils.render(originalModel, smallLineLength);
-        System.out.printf(
-            "The following is what %s looks like after applying formatting with the preferred line "
-                + "length set to %d columns:%n%s%n%n",
-            file.getFileName(),
-            smallLineLength,
-            squishedTestCase
-        );
-        Model resultingModel = getResultingModel(file, squishedTestCase);
+        final String squishedTestCase = FormattingUtils.render(originalModel, smallLineLength);
+        final Model resultingModel = getResultingModel(file, squishedTestCase);
         Assertions.assertNotNull(resultingModel);
         if (!resultingModel.eResource().getErrors().isEmpty()) {
             resultingModel.eResource().getErrors().forEach(System.err::println);
             Assertions.assertTrue(resultingModel.eResource().getErrors().isEmpty());
         }
-        Assertions.assertTrue(new IsEqual(originalModel).doSwitch(resultingModel));
-        String normalTestCase = FormattingUtils.render(originalModel);
-        System.out.printf(
-            "The following is what %s looks like after applying formatting normally:%n%s%n%n",
-            file.getFileName(),
-            normalTestCase
-        );
+        if (!new IsEqual(originalModel).doSwitch(resultingModel)) {
+            System.out.printf(
+                "The following is what %s looks like after applying formatting with the preferred line "
+                    + "length set to %d columns:%n%s%n%n",
+                file.getFileName(),
+                smallLineLength,
+                squishedTestCase
+            );
+            throw new junit.framework.AssertionFailedError(String.format(
+                "The reformatted version of %s was not equivalent to the original file.",
+                file.getFileName()
+            ));
+        }
+        final String normalTestCase = FormattingUtils.render(originalModel);
         try {
             Assertions.assertEquals(
                 Files.readString(file).replaceAll("\\r\\n?", "\n"),
@@ -84,6 +83,11 @@ private void run(Path file) throws Exception {
                 file.getFileName(),
                 file.getFileName()
             );
+            System.out.printf(
+                "The following is what %s looks like after applying formatting normally:%n%s%n%n",
+                file.getFileName(),
+                normalTestCase
+            );
             throw e;
         }
     }

diff --git a/org.lflang.tests/src/org/lflang/tests/lsp/LspTests.java b/org.lflang.tests/src/org/lflang/tests/lsp/LspTests.java
@@ -99,7 +99,12 @@ private void targetLanguageValidationTest(Target target, ErrorInserter.Builder b
                         System.out.println(" Success.");
                     } else {
                         System.out.println(" but the expected error could not be found.");
-                        System.out.println("The following test failed:\n" + TestBase.THIN_LINE);
+                        System.out.printf(
+                            "%s failed. Content of altered version of %s:%n%s%n",
+                            alteredTest.getPath().getFileName(),
+                            alteredTest.getPath().getFileName(),
+                            TestBase.THIN_LINE
+                        );
                         System.out.println(alteredTest + "\n" + TestBase.THIN_LINE);
                     }
                     return result;