refactor assertEquals to use assertThat whe appropriate

Pazus · Pazus · commit 67326ce2c60e · 2019-02-17T16:04:40.000+03:00
diff --git a/pom.xml b/pom.xml
@@ -53,6 +53,12 @@
       <version>${junit.jupiter.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <version>2.1</version>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>ch.qos.logback</groupId>
diff --git a/src/test/java/org/utplsql/api/JavaApiVersionTest.java b/src/test/java/org/utplsql/api/JavaApiVersionTest.java
@@ -2,12 +2,13 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.startsWith;
 
 class JavaApiVersionTest {
 
     @Test
     void getJavaApiVersion() {
-        assertTrue(JavaApiVersionInfo.getVersion().startsWith("3.1"));
+        assertThat(JavaApiVersionInfo.getVersion(), startsWith("3.1"));
     }
 }
diff --git a/src/test/java/org/utplsql/api/OutputBufferIT.java b/src/test/java/org/utplsql/api/OutputBufferIT.java
@@ -17,7 +17,11 @@
 import java.util.List;
 import java.util.concurrent.*;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.emptyIterable;
+import static org.hamcrest.Matchers.not;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Integration-test for OutputBuffers
@@ -104,7 +108,7 @@ void fetchAllLines() throws SQLException {
 
         List<String> outputLines = reporter.getOutputBuffer().fetchAll(getConnection());
 
-        assertTrue(outputLines.size() > 0);
+        assertThat(outputLines, not(emptyIterable()));
     }
 
     @Test
@@ -118,7 +122,7 @@ void getOutputFromSonarReporter() throws SQLException {
 
         List<String> outputLines = reporter.getOutputBuffer().fetchAll(getConnection());
 
-        assertTrue(outputLines.size() > 0);
+        assertThat(outputLines, not(emptyIterable()));
     }
 
     @Test
diff --git a/src/test/java/org/utplsql/api/ReporterFactoryIT.java b/src/test/java/org/utplsql/api/ReporterFactoryIT.java
@@ -1,5 +1,6 @@
 package org.utplsql.api;
 
+import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 import org.utplsql.api.compatibility.CompatibilityProxy;
 import org.utplsql.api.reporter.CoreReporters;
@@ -9,7 +10,7 @@
 
 import java.sql.SQLException;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 class ReporterFactoryIT extends AbstractDatabaseTest {
 
@@ -20,7 +21,7 @@ void createDefaultReporterFactoryMethod() throws SQLException {
 
         ReporterFactory reporterFactory = ReporterFactory.createDefault(proxy);
 
-        assertTrue( reporterFactory.createReporter(CoreReporters.UT_DOCUMENTATION_REPORTER.name()) instanceof DocumentationReporter );
-        assertTrue( reporterFactory.createReporter(CoreReporters.UT_COVERAGE_HTML_REPORTER.name()) instanceof CoverageHTMLReporter);
+        assertThat(reporterFactory.createReporter(CoreReporters.UT_DOCUMENTATION_REPORTER.name()), Matchers.isA(DocumentationReporter.class));
+        assertThat(reporterFactory.createReporter(CoreReporters.UT_COVERAGE_HTML_REPORTER.name()), Matchers.isA(CoverageHTMLReporter.class));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,13 @@`
`2`	`2`
`3`	`3`	`import org.junit.jupiter.api.Test;`
`4`	`4`
`5`		`-import static org.junit.jupiter.api.Assertions.assertTrue;`
	`5`	`+import static org.hamcrest.MatcherAssert.assertThat;`
	`6`	`+import static org.hamcrest.Matchers.startsWith;`
`6`	`7`
`7`	`8`	`class JavaApiVersionTest {`
`8`	`9`
`9`	`10`	`@Test`
`10`	`11`	`void getJavaApiVersion() {`
`11`		`- assertTrue(JavaApiVersionInfo.getVersion().startsWith("3.1"));`
	`12`	`+ assertThat(JavaApiVersionInfo.getVersion(), startsWith("3.1"));`
`12`	`13`	`}`
`13`	`14`	`}`