add assertj depdendency & assertEquals to assertThat

Author: javajigi

build.gradle

@@ -14,4 +14,5 @@ dependencies {
     compile('com.google.guava:guava:23.0')
     compile('ch.qos.logback:logback-classic:1.2.3')
     testCompile('junit:junit:4.12')
+    testCompile('org.assertj:assertj-core:3.9.0')
 }

pom.xml

@@ -44,6 +44,12 @@
 			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>3.9.0</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

src/test/java/next/exception/PositionTest.java

@@ -1,22 +1,22 @@
 package next.exception;
 
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 
 public class PositionTest {
     @Test
     public void create_00() {
         Position p = new Position("a1");
-        assertEquals(0, p.getX());
-        assertEquals(0, p.getY());
+        assertThat(p.getX()).isEqualTo(0);
+        assertThat(p.getY()).isEqualTo(0);
     }
 
     @Test
     public void create_77() {
         Position p = new Position("h8");
-        assertEquals(7, p.getX());
-        assertEquals(7, p.getY());
+        assertThat(p.getX()).isEqualTo(7);
+        assertThat(p.getY()).isEqualTo(7);
     }
 
     @Test (expected = InValidPositionException.class)

src/test/java/next/fp/CarTest.java

@@ -1,8 +1,8 @@
 package next.fp;
 
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.Test;
 
 public class CarTest {
     @Test
@@ -14,7 +14,7 @@ public boolean isMovable() {
                 return true;
             }
         });
-        assertEquals(new Car("pobi", 1), actual);
+        assertThat(actual).isEqualTo(new Car("pobi", 1));
     }
 
     @Test
@@ -26,6 +26,6 @@ public boolean isMovable() {
                 return false;
             }
         });
-        assertEquals(new Car("pobi", 0), actual);
+        assertThat(actual).isEqualTo(new Car("pobi", 0));
     }
 }

src/test/java/next/fp/LambdaTest.java

@@ -1,15 +1,13 @@
 package next.fp;
 
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import next.fp.Lambda;
-
 public class LambdaTest {
 	private List<Integer> numbers;
 
@@ -36,18 +34,18 @@ public void runThread() throws Exception {
 	@Test
 	public void sumAll() throws Exception {
 		int sum = Lambda.sumAll(numbers);
-		assertEquals(21, sum);
+		assertThat(sum).isEqualTo(21);
 	}
 
 	@Test
 	public void sumAllEven() throws Exception {
 		int sum = Lambda.sumAllEven(numbers);
-		assertEquals(12, sum);
+		assertThat(sum).isEqualTo(12);
 	}
 
 	@Test
 	public void sumAllOverThree() throws Exception {
 		int sum = Lambda.sumAllOverThree(numbers);
-		assertEquals(15, sum);
+		assertThat(sum).isEqualTo(15);
 	}
 }

src/test/java/next/fp/StreamStudyTest.java

@@ -1,15 +1,13 @@
 package next.fp;
 
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import next.fp.StreamStudy;
-
 public class StreamStudyTest {
 	private List<Integer> numbers;
 
@@ -38,13 +36,13 @@ public void map() throws Exception {
 	@Test
 	public void sumAll() throws Exception {
 		long sum = StreamStudy.sumAll(numbers);
-		assertEquals(21, sum);
+		assertThat(sum).isEqualTo(21);
 	}
 
 	@Test
 	public void sumOverThreeAndDouble() throws Exception {
 		numbers = Arrays.asList(3, 1, 6, 2, 4, 8);
 		long sum = StreamStudy.sumOverThreeAndDouble(numbers);
-		assertEquals(36, sum);
+		assertThat(sum).isEqualTo(36);
 	}
 }

src/test/java/next/optional/ComputerStoreTest.java

@@ -1,11 +1,9 @@
 package next.optional;
 
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 
-import next.optional.Computer;
-import next.optional.ComputerStore;
 import next.optional.Computer.Soundcard;
 import next.optional.Computer.USB;
 
@@ -16,23 +14,23 @@ public void getVersion() {
 		String version = "pobi's usb";
 		Soundcard soundcard = new Soundcard(new USB(version));
 		Computer computer = new Computer(soundcard);
-		assertEquals(version, ComputerStore.getVersion(computer));
+		assertThat(ComputerStore.getVersion(computer)).isEqualTo(version);
 	}
 
 	@Test
 	public void getVersionWhenComputerIsNull() throws Exception {
-		assertEquals(ComputerStore.UNKNOWN_VERSION, ComputerStore.getVersion(null));
+		assertThat(ComputerStore.getVersion(null)).isEqualTo(ComputerStore.UNKNOWN_VERSION);
 	}
 
 	@Test
 	public void getVersionWhenSoundcardIsNull() throws Exception {
 		Computer computer = new Computer(null);
-		assertEquals(ComputerStore.UNKNOWN_VERSION, ComputerStore.getVersion(computer));
+		assertThat(ComputerStore.getVersion(computer)).isEqualTo(ComputerStore.UNKNOWN_VERSION);
 	}
 
 	@Test
 	public void getVersionWhenUSBIsNull() throws Exception {
 		Computer computer = new Computer(new Soundcard(null));
-		assertEquals(ComputerStore.UNKNOWN_VERSION, ComputerStore.getVersion(computer));
+		assertThat(ComputerStore.getVersion(computer)).isEqualTo(ComputerStore.UNKNOWN_VERSION);
 	}
 }

src/test/java/next/optional/ExpressionTest.java

@@ -1,15 +1,14 @@
 package next.optional;
 
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 
-import next.optional.Expression;
 
 public class ExpressionTest {
     @Test
     public void of() {
-        assertTrue(Expression.PLUS == Expression.of("+"));
+        assertThat(Expression.PLUS == Expression.of("+")).isTrue();
     }
 
     @Test (expected = IllegalArgumentException.class)

src/test/java/next/optional/UserTest.java

@@ -1,28 +1,26 @@
 package next.optional;
 
 import static next.optional.User.*;
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 
-import next.optional.User;
-
 public class UserTest {
     @Test
     public void whenFiltersWithoutOptional_thenCorrect() {
-        assertTrue(ageIsInRange1(new User("crong", 35)));
-        assertFalse(ageIsInRange1(new User("crong", 48)));
-        assertFalse(ageIsInRange1(new User("crong", null)));
-        assertFalse(ageIsInRange1(new User("crong", 29)));
-        assertFalse(ageIsInRange1(null));
+        assertThat(ageIsInRange1(new User("crong", 35))).isTrue();
+        assertThat(ageIsInRange1(new User("crong", 48))).isFalse();
+        assertThat(ageIsInRange1(new User("crong", null))).isFalse();
+        assertThat(ageIsInRange1(new User("crong", 29))).isFalse();
+        assertThat(ageIsInRange1(null)).isFalse();
     }
 
     @Test
     public void whenFiltersWithOptional_thenCorrect() {
-        assertTrue(ageIsInRange2(new User("crong", 35)));
-        assertFalse(ageIsInRange2(new User("crong", 48)));
-        assertFalse(ageIsInRange2(new User("crong", null)));
-        assertFalse(ageIsInRange2(new User("crong", 29)));
-        assertFalse(ageIsInRange2(null));
+        assertThat(ageIsInRange2(new User("crong", 35))).isTrue();
+        assertThat(ageIsInRange2(new User("crong", 48))).isFalse();
+        assertThat(ageIsInRange2(new User("crong", null))).isFalse();
+        assertThat(ageIsInRange2(new User("crong", 29))).isFalse();
+        assertThat(ageIsInRange2(null)).isFalse();
     }
 }

src/test/java/next/optional/UsersTest.java

@@ -1,24 +1,21 @@
 package next.optional;
 
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 
-import next.optional.User;
-import next.optional.Users;
-
 public class UsersTest {
 
     @Test
     public void getUser() {
         Users users = new Users();
-        assertEquals(new User("crong", 35), users.getUser("crong"));
+        assertThat(users.getUser("crong")).isEqualTo(new User("crong", 35));
     }
 
 
     @Test
     public void getDefaultUser() {
         Users users = new Users();
-        assertEquals(Users.DEFAULT_USER, users.getUser("codesquard"));
+        assertThat(users.getUser("codesquard")).isEqualTo(Users.DEFAULT_USER);
     }
 }