Use system-lambda instead of system-rules. (#554)

Author: tokuhirom

build.gradle

@@ -92,7 +92,7 @@ subprojects {
 
         dependencies {
             dependency 'com.google.guava:guava:' + ext['guava.version']
-            dependency 'com.github.stefanbirkner:system-rules:1.19.0'
+            dependency 'com.github.stefanbirkner:system-lambda:1.0.0'
             dependencySet(group: 'com.squareup.retrofit2', version: ext['retrofit.version']) {
                 entry 'converter-jackson'
                 entry 'retrofit'
@@ -110,7 +110,7 @@ subprojects {
         // http://docs.spring.io/spring-boot/docs/current/reference/html/configuration-metadata.html#configuration-metadata-annotation-processor
 
         testImplementation 'com.google.guava:guava'
-        testImplementation 'com.github.stefanbirkner:system-rules'
+        testImplementation 'com.github.stefanbirkner:system-lambda'
         testImplementation 'com.squareup.okhttp3:mockwebserver'
         testImplementation 'org.hibernate.validator:hibernate-validator'
         testImplementation 'org.springframework.boot:spring-boot-starter-test' // MockHttpServletRequest

line-bot-api-client/src/test/java/com/linecorp/bot/client/exception/LineMessagingExceptionTest.java

@@ -16,30 +16,26 @@
 
 package com.linecorp.bot.client.exception;
 
+import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemOut;
 import static java.util.Collections.emptyList;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.contrib.java.lang.system.SystemOutRule;
 
 import com.linecorp.bot.model.error.ErrorResponse;
 
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class LineMessagingExceptionTest {
-    @Rule
-    public final SystemOutRule systemOutRule = new SystemOutRule().enableLog();
-
     @Test
-    public void errorResponseIncludedInMessageTest() {
+    public void errorResponseIncludedInMessageTest() throws Exception {
         final ErrorResponse errorResponse = new ErrorResponse("requestId_in_response", null, emptyList());
         final BadRequestException exception = new BadRequestException("Message", errorResponse);
 
-        log.error("", exception);
+        String systemOut = tapSystemOut(() -> log.error("", exception));
 
-        assertThat(systemOutRule.getLogWithNormalizedLineSeparator())
+        assertThat(systemOut)
                 .contains("requestId_in_response")
                 .contains(errorResponse.toString());
     }

line-bot-cli/src/test/java/com/linecorp/bot/cli/ApplicationTest.java

@@ -16,21 +16,18 @@
 
 package com.linecorp.bot.cli;
 
+import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemOut;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.contrib.java.lang.system.SystemOutRule;
 
 public class ApplicationTest {
-    @Rule
-    public final SystemOutRule systemOut = new SystemOutRule().enableLog();
-
     @Test
     public void contextStartupTest() throws Exception {
-        Application.main("--line.bot.channel-secret=xxx", "--line.bot.channel-token=token");
+        String systemOut = tapSystemOut(
+                () -> Application.main("--line.bot.channel-secret=xxx", "--line.bot.channel-token=token"));
 
-        assertThat(systemOut.getLogWithNormalizedLineSeparator())
+        assertThat(systemOut)
                 .contains("No command resolved.");
     }
 }

line-bot-spring-boot/src/test/java/com/linecorp/bot/spring/boot/support/ReplyByReturnValueConsumerTest.java

@@ -16,6 +16,7 @@
 
 package com.linecorp.bot.spring.boot.support;
 
+import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemOut;
 import static java.util.Collections.singletonList;
 import static java.util.concurrent.CompletableFuture.completedFuture;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -32,7 +33,6 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.contrib.java.lang.system.SystemOutRule;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnit;
@@ -52,9 +52,6 @@ public class ReplyByReturnValueConsumerTest {
     @Rule
     public final MockitoRule mockitoRule = MockitoJUnit.rule();
 
-    @Rule
-    public final SystemOutRule systemOut = new SystemOutRule().enableLog();
-
     @Mock
     private LineMessagingClient lineMessagingClient;
 
@@ -121,32 +118,37 @@ public void acceptCompletableListReplyTest() throws Exception {
     }
 
     @Test
-    public void errorInCompletableLoggingTest() {
+    public void errorInCompletableLoggingTest() throws Exception {
         // Do
-        final CompletableFuture<List<TextMessage>> returnValue = new CompletableFuture<>();
-        target.accept(returnValue);
-        returnValue.completeExceptionally(new GeneralLineMessagingException("EXCEPTION HAPPEN!", null, null));
+        String systemOut = tapSystemOut(() -> {
+            final CompletableFuture<List<TextMessage>> returnValue = new CompletableFuture<>();
+            target.accept(returnValue);
+            returnValue.completeExceptionally(
+                    new GeneralLineMessagingException("EXCEPTION HAPPEN!", null, null));
+        });
 
         // Verify
-        assertThat(systemOut.getLogWithNormalizedLineSeparator())
+        assertThat(systemOut)
                 .contains("EXCEPTION HAPPEN!");
     }
 
     @Test
-    public void errorInLineMessagingClientLoggingTest() {
+    public void errorInLineMessagingClientLoggingTest() throws Exception {
         reset(lineMessagingClient);
         when(lineMessagingClient.replyMessage(any()))
                 .thenReturn(new CompletableFuture<BotApiResponse>() {{
                     completeExceptionally(new GeneralLineMessagingException("EXCEPTION HAPPEN!", null, null));
                 }});
 
         // Do
-        final CompletableFuture<List<TextMessage>> returnValue = new CompletableFuture<>();
-        target.accept(returnValue);
-        returnValue.complete(singletonList(new TextMessage("Reply Text")));
+        String systemOut = tapSystemOut(() -> {
+            final CompletableFuture<List<TextMessage>> returnValue = new CompletableFuture<>();
+            target.accept(returnValue);
+            returnValue.complete(singletonList(new TextMessage("Reply Text")));
+        });
 
         // Verify
-        assertThat(systemOut.getLogWithNormalizedLineSeparator())
+        assertThat(systemOut)
                 .contains("failed")
                 .contains("EXCEPTION HAPPEN!");
     }