diff --git a/common/source/java/ch/systemsx/cisd/common/logging/BufferedAppender.java b/common/source/java/ch/systemsx/cisd/common/logging/BufferedAppender.java index 0719164bd8d41c63bd900f5ddd2cc7a216aeaf9b..ffe58dce4ec88a9ae0fdc4cf9487c6a4ca82a12f 100644 --- a/common/source/java/ch/systemsx/cisd/common/logging/BufferedAppender.java +++ b/common/source/java/ch/systemsx/cisd/common/logging/BufferedAppender.java @@ -17,6 +17,8 @@ package ch.systemsx.cisd.common.logging; import java.io.ByteArrayOutputStream; +import java.util.Arrays; +import java.util.List; import org.apache.log4j.Layout; import org.apache.log4j.Level; @@ -113,6 +115,10 @@ public final class BufferedAppender extends WriterAppender { return new String(logRecorder.toByteArray()).trim(); } + + public List<String> getLogLines() { + return Arrays.asList(getLogContent().split("\n")); + } public final void resetLogContent() { diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTaskTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTaskTest.java index 3627cd6bae4dec92c230efc4df90809bcfa9ae5a..e2b08661b57878c0070db3194ef86ef2ff520320 100644 --- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTaskTest.java +++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTaskTest.java @@ -16,6 +16,9 @@ package ch.systemsx.cisd.etlserver.path; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasItem; + import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -97,8 +100,9 @@ public class DataSetAndPathInfoDBConsistencyCheckTaskTest extends AssertJUnit task.execute(); - assertEquals("INFO OPERATION.DataSetAndPathInfoDBConsistencyCheckTask - " - + "Check 1 data sets registered since 1970-01-01 01:00:00", logRecorder.getLogContent()); + assertThat(logRecorder.getLogLines(), hasItem("INFO OPERATION.DataSetAndPathInfoDBConsistencyCheckTask - " + + "Check 1 data sets registered since 1970-01-01 01:00:00")); + assertEquals(true, fileContent.isClosed()); assertEquals(true, pathInfoContent.isClosed()); context.assertIsSatisfied();