use assertj assertions.

Author: tokuhirom

config/checkstyle/checkstyle.xml

@@ -76,6 +76,18 @@
     </module>
     <module name="MissingDeprecated" />
 
+    <module name="IllegalImport">
+      <property name="id" value="junitAssert" />
+      <property name="illegalClasses" value="org.junit.Assert" />
+      <message key="import.illegal" value="Use AssertJ (org.assertj.core.api.Assertions.assertThat) instead." />
+    </module>
+    <module name="IllegalImport">
+      <property name="id" value="junitAssume" />
+      <property name="illegalClasses" value="org.junit.Assume" />
+      <message key="import.illegal"
+               value="Use AssertJ (org.assertj.core.api.Assumptions.assumeThat) instead." />
+    </module>
+
     <module name="AvoidNestedBlocks">
       <property name="allowInSwitchCase" value="true" />
     </module>

line-bot-api-client/src/integrationTest/java/com/linecorp/bot/client/IntegrationTestSettings.java

@@ -16,9 +16,9 @@
 
 package com.linecorp.bot.client;
 
-import java.util.List;
+import static org.assertj.core.api.Assumptions.assumeThat;
 
-import org.junit.Assume;
+import java.util.List;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
@@ -42,18 +42,22 @@ public class IntegrationTestSettings {
     private boolean failOnUnknownProperties = true;
 
     public String getUserId() {
-        Assume.assumeTrue("userId in integration_test_settings.yml is not null", userId != null);
+        assumeThat(userId)
+                .as("userId in integration_test_settings.yml is not null")
+                .isNotNull();
         return userId;
     }
 
     public List<String> getAudienceIfas() {
-        Assume.assumeNotNull(audienceIfas);
-        Assume.assumeFalse(audienceIfas.isEmpty());
+        assumeThat(audienceIfas)
+                .isNotNull()
+                .isNotEmpty();
         return audienceIfas;
     }
 
     public String getRetargetingRequestId() {
-        Assume.assumeNotNull(retargetingRequestId);
+        assumeThat(retargetingRequestId)
+                .isNotNull();
         return retargetingRequestId;
     }
 

line-bot-api-client/src/integrationTest/java/com/linecorp/bot/client/IntegrationTestSettingsLoader.java

@@ -16,11 +16,11 @@
 
 package com.linecorp.bot.client;
 
+import static org.assertj.core.api.Assumptions.assumeThat;
+
 import java.io.IOException;
 import java.net.URL;
 
-import org.junit.Assume;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
@@ -31,8 +31,9 @@ public class IntegrationTestSettingsLoader {
     public static IntegrationTestSettings load() throws IOException {
         // Do not run all test cases in this class when src/test/resources/integration_test_settings.yml doesn't
         // exist.
-        Assume.assumeTrue("exists integration_test_settings.yml in resource directory",
-                          TEST_RESOURCE != null);
+        assumeThat(TEST_RESOURCE)
+                .as("exists integration_test_settings.yml in resource directory")
+                .isNotNull();
 
         return new ObjectMapper(new YAMLFactory())
                 .registerModule(new ParameterNamesModule())

line-bot-api-client/src/integrationTest/java/com/linecorp/bot/client/LineOAuthClientIntegrationTest.java

@@ -17,6 +17,7 @@
 package com.linecorp.bot.client;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assumptions.assumeThat;
 
 import java.io.IOException;
 import java.net.URL;
@@ -27,7 +28,6 @@
 import java.time.Instant;
 import java.util.Map;
 
-import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.bridge.SLF4JBridgeHandler;
@@ -57,7 +57,8 @@ public class LineOAuthClientIntegrationTest {
 
     @Before
     public void setUp() throws IOException {
-        Assume.assumeTrue(TEST_RESOURCE != null);
+        assumeThat(TEST_RESOURCE)
+                .isNotNull();
 
         final Map<?, ?> map = new ObjectMapper()
                 .convertValue(new Yaml().load(TEST_RESOURCE.openStream()), Map.class);

line-bot-api-client/src/integrationTest/java/com/linecorp/bot/client/ManageAudienceIntegrationTest.java

@@ -16,13 +16,14 @@
 
 package com.linecorp.bot.client;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.io.IOException;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -134,18 +135,19 @@ public void getAudienceGroups() throws ExecutionException, InterruptedException
                 .getAudienceGroups(1L, null, null, 40L,
                                    false, AudienceGroupCreateRoute.OA_MANAGER)
                 .get();
-        Assert.assertEquals(1L, response.getPage().longValue());
-        Assert.assertEquals(40L, response.getSize().longValue());
-        Assert.assertNotNull(response.getTotalCount());
+        assertThat(response.getPage()).isEqualTo(1L);
+        assertThat(response.getSize()).isEqualTo(40L);
+        assertThat(response.getTotalCount()).isNotNull();
         log.info(response.toString());
 
         List<AudienceGroup> audienceGroups = response.getAudienceGroups();
         for (AudienceGroup audienceGroup : audienceGroups) {
             GetAudienceDataResponse dataResponse = target.getAudienceData(
                     audienceGroup.getAudienceGroupId()).get();
-            Assert.assertNotNull(dataResponse.getAudienceGroup());
-            Assert.assertEquals(audienceGroup.getAudienceGroupId(),
-                                dataResponse.getAudienceGroup().getAudienceGroupId());
+            assertThat(dataResponse.getAudienceGroup())
+                    .isNotNull();
+            assertThat(dataResponse.getAudienceGroup().getAudienceGroupId())
+                    .isEqualTo(audienceGroup.getAudienceGroupId());
             log.info("id={} data={}", audienceGroup.getAudienceGroupId(), dataResponse);
         }
     }