F!! Junit 3-5 reporters

Co-Authored-By: Lars Eckart <[email protected]>
Co-Authored-By: Ragunath Jawahar <[email protected]>

Author: 3 people

approvaltests/src/main/java/org/approvaltests/reporters/AbstractJUnitReporter.java

@@ -0,0 +1,43 @@
+package org.approvaltests.reporters;
+
+import com.spun.util.ObjectUtils;
+import com.spun.util.io.FileUtils;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public abstract class AbstractJUnitReporter implements EnvironmentAwareReporter {
+    private String className;
+
+    public AbstractJUnitReporter(String className) {
+        this.className = className;
+    }
+
+    public void assertEquals(String expected, String actual) {
+        try {
+            Class<?> clazz = ObjectUtils.loadClass(className);
+            Method assertEquals = clazz.getMethod("assertEquals", Object.class, Object.class);
+            assertEquals.invoke(null, expected, actual);
+        } catch(InvocationTargetException exception) {
+            throw ObjectUtils.throwAsError(exception.getTargetException());
+        }catch   (Throwable throwable) {
+            throw ObjectUtils.throwAsError(throwable);
+        }
+    }
+
+    @Override
+    public void report(String received, String approved) {
+        String aText = new File(approved).exists() ? FileUtils.readFile(approved) : "";
+        String rText = FileUtils.readFile(received);
+        String approveCommand = "To approve run : " + ClipboardReporter.getAcceptApprovalText(received, approved);
+        System.out.println(approveCommand);
+        assertEquals(aText, rText);
+    }
+
+    @Override
+    public boolean isWorkingInThisEnvironment(String forFile) {
+        boolean present = ObjectUtils.isClassPresent(className);
+        return present && GenericDiffReporter.isFileExtensionValid(forFile, GenericDiffReporter.TEXT_FILE_EXTENSIONS);
+    }
+}

approvaltests/src/main/java/org/approvaltests/reporters/Junit3Reporter.java

@@ -0,0 +1,8 @@
+package org.approvaltests.reporters;
+
+public class Junit3Reporter extends AbstractJUnitReporter {
+
+    public Junit3Reporter() {
+        super("junit.framework.Assert");
+    }
+}

approvaltests/src/main/java/org/approvaltests/reporters/Junit4Reporter.java

@@ -0,0 +1,8 @@
+package org.approvaltests.reporters;
+
+public class Junit4Reporter extends AbstractJUnitReporter {
+
+    public Junit4Reporter() {
+        super("org.junit.Assert");
+    }
+}

approvaltests/src/main/java/org/approvaltests/reporters/Junit5Reporter.java

@@ -0,0 +1,8 @@
+package org.approvaltests.reporters;
+
+public class Junit5Reporter extends AbstractJUnitReporter {
+
+    public Junit5Reporter() {
+        super("org.junit.jupiter.api.Assertions");
+    }
+}

approvaltests/src/main/java/org/approvaltests/reporters/JunitReporter.java

@@ -1,35 +1,12 @@
 package org.approvaltests.reporters;
 
-import java.io.File;
 
-import com.spun.util.ObjectUtils;
-import com.spun.util.io.FileUtils;
-
-import junit.framework.TestCase;
-
-public class JunitReporter implements EnvironmentAwareReporter
+public class JunitReporter extends FirstWorkingReporter
 {
   public static final JunitReporter INSTANCE = new JunitReporter();
-  @Override
-  public void report(String received, String approved)
+  public JunitReporter()
   {
-    String aText = new File(approved).exists() ? FileUtils.readFile(approved) : "";
-    String rText = FileUtils.readFile(received);
-    String approveCommand = "To approve run : " + ClipboardReporter.getAcceptApprovalText(received, approved);
-    System.out.println(approveCommand);
-    TestCase.assertEquals(aText, rText);
-  }
-  @Override
-  public boolean isWorkingInThisEnvironment(String forFile)
-  {
-    try
-    {
-      ObjectUtils.loadClass("junit.framework.TestCase");
-    }
-    catch (Throwable t)
-    {
-      return false;
-    }
-    return GenericDiffReporter.isFileExtensionValid(forFile, GenericDiffReporter.TEXT_FILE_EXTENSIONS);
+    super(new Junit5Reporter(), new Junit4Reporter(), new Junit3Reporter());
   }
+
 }

approvaltests/src/test/java/org/approvaltests/reporters/JUnitReporterTest.java

@@ -0,0 +1,34 @@
+package org.approvaltests.reporters;
+
+import org.approvaltests.Approvals;
+import org.approvaltests.core.ApprovalFailureReporter;
+import org.junit.jupiter.api.Test;
+
+import com.spun.util.ClassUtils;
+
+public class JUnitReporterTest
+{
+  @Test
+  void testJUnit3()
+  {
+    verifyReporter(new Junit3Reporter());
+  }
+  @Test
+  void testJUnit4()
+  {
+    verifyReporter(new Junit4Reporter());
+  }
+  @Test
+  void testJUnit5()
+  {
+    verifyReporter(new Junit5Reporter());
+  }
+  private void verifyReporter(ApprovalFailureReporter reporter)
+  {
+    String a = ClassUtils.getAdjacentFile(this.getClass(), "a.txt").getAbsolutePath();
+    String b = ClassUtils.getAdjacentFile(this.getClass(), "b.txt").getAbsolutePath();
+    Approvals.verifyException(() -> {
+      reporter.report(b, a);
+    });
+  }
+}

approvaltests/src/test/java/org/approvaltests/reporters/JUnitReporterTest.testJUnit3.approved.txt

@@ -0,0 +1,7 @@
+junit.framework.AssertionFailedError: expected:<1
+a
+I
+> but was:<1
+b
+I
+>

approvaltests/src/test/java/org/approvaltests/reporters/JUnitReporterTest.testJUnit4.approved.txt

@@ -0,0 +1,7 @@
+org.junit.ComparisonFailure: expected:<1
+[a]
+I
+> but was:<1
+[b]
+I
+>

approvaltests/src/test/java/org/approvaltests/reporters/JUnitReporterTest.testJUnit5.approved.txt

@@ -0,0 +1,7 @@
+org.opentest4j.AssertionFailedError: expected: <1
+a
+I
+> but was: <1
+b
+I
+>

approvaltests/src/test/java/org/approvaltests/reporters/a.txt

@@ -0,0 +1,3 @@
+1
+a
+I