diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-01-27 11:44:15 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-01-27 11:44:15 +0100 |
commit | 5dbee9b05ba81ba285cb266826ddb07745dc0e8e (patch) | |
tree | d51a034d1c77e956f72917335f723eb1ffd1d78d /jdisc_http_service/src | |
parent | 2079297d6060840e59c98fb377623473fc1108b0 (diff) |
Simplify unit tests
Diffstat (limited to 'jdisc_http_service/src')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/container/logging/LogFileHandler.java | 4 | ||||
-rw-r--r-- | jdisc_http_service/src/test/java/com/yahoo/container/logging/LogFileHandlerTestCase.java | 25 |
2 files changed, 11 insertions, 18 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/LogFileHandler.java b/jdisc_http_service/src/main/java/com/yahoo/container/logging/LogFileHandler.java index a61754b0a19..104c75a7b88 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/LogFileHandler.java +++ b/jdisc_http_service/src/main/java/com/yahoo/container/logging/LogFileHandler.java @@ -73,6 +73,10 @@ class LogFileHandler <LOGTYPE> { addOperation(new Operation<>(r)); } + void publishAndWait(LOGTYPE r) { + addOperationAndWait(new Operation<>(r)); + } + public void flush() { addOperationAndWait(new Operation<>(Operation.Type.flush)); } diff --git a/jdisc_http_service/src/test/java/com/yahoo/container/logging/LogFileHandlerTestCase.java b/jdisc_http_service/src/test/java/com/yahoo/container/logging/LogFileHandlerTestCase.java index cd3c174a12e..013f42cd5b0 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/container/logging/LogFileHandlerTestCase.java +++ b/jdisc_http_service/src/test/java/com/yahoo/container/logging/LogFileHandlerTestCase.java @@ -26,6 +26,7 @@ import java.util.zip.GZIPInputStream; import static com.yahoo.yolean.Exceptions.uncheck; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotEquals; /** * @author Bob Travis @@ -106,43 +107,31 @@ public class LogFileHandlerTestCase { Compression.NONE, root.getAbsolutePath() + "/logfilehandlertest.%Y%m%d%H%M%S%s", new long[]{0}, "symlink", new StringLogWriter()); String message = formatter.format(new LogRecord(Level.INFO, "test")); - handler.publish(message); - String firstFile; - do { - Thread.sleep(1); - firstFile = handler.getFileName(); - } while (firstFile == null); + handler.publishAndWait(message); + String firstFile = handler.getFileName(); handler.rotateNow(); - String secondFileName; - do { - Thread.sleep(1); - secondFileName = handler.getFileName(); - } while (firstFile.equals(secondFileName)); + String secondFileName = handler.getFileName(); + assertNotEquals(firstFile, secondFileName); String longMessage = formatter.format(new LogRecord(Level.INFO, "string which is way longer than the word test")); handler.publish(longMessage); handler.flush(); assertThat(Files.size(Paths.get(firstFile))).isEqualTo(31); final long expectedSecondFileLength = 72; - long secondFileLength; - do { - Thread.sleep(1); - secondFileLength = Files.size(Paths.get(secondFileName)); - } while (secondFileLength != expectedSecondFileLength); long symlinkFileLength = Files.size(root.toPath().resolve("symlink")); assertThat(symlinkFileLength).isEqualTo(expectedSecondFileLength); handler.shutdown(); } - @Test + @Test(timeout = /*5 minutes*/300_000) public void testcompression_gzip() throws InterruptedException, IOException { testcompression( Compression.GZIP, "gz", (compressedFile, __) -> uncheck(() -> new String(new GZIPInputStream(Files.newInputStream(compressedFile)).readAllBytes()))); } - @Test + @Test(timeout = /*5 minutes*/300_000) public void testcompression_zstd() throws InterruptedException, IOException { testcompression( Compression.ZSTD, "zst", |