From 33ab49e62660bc4cf23da7847275ba022d846dab Mon Sep 17 00:00:00 2001 From: felmer <franz-josef.elmer@id.ethz.ch> Date: Thu, 8 Nov 2018 09:11:45 +0100 Subject: [PATCH] make tests more robust --- .../openbis/generic/server/dataaccess/db/DAOFactoryTest.java | 3 ++- .../dataaccess/db/search/DefaultFullTextIndexerTest.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactoryTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactoryTest.java index ae79645eb60..30f3e98a1a6 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactoryTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactoryTest.java @@ -12,6 +12,7 @@ import org.testng.annotations.Test; import ch.systemsx.cisd.common.logging.BufferedAppender; import ch.systemsx.cisd.common.spring.ExposablePropertyPlaceholderConfigurer; import ch.systemsx.cisd.openbis.generic.shared.Constants; +import ch.systemsx.cisd.openbis.util.LogRecordingUtils; //@Test(groups = "db") public class DAOFactoryTest extends AbstractDAOTest @@ -24,7 +25,7 @@ public class DAOFactoryTest extends AbstractDAOTest @BeforeMethod public void setUpLogRecorder() { - logRecorder = new BufferedAppender(null, Level.INFO, ".*\\." + DAOFactory.class.getSimpleName()); + logRecorder = LogRecordingUtils.createRecorder(null, Level.INFO, ".*\\." + DAOFactory.class.getSimpleName()); } @Test(priority = -1, groups = "project-samples") diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/search/DefaultFullTextIndexerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/search/DefaultFullTextIndexerTest.java index d6ea025fcff..74d82f19f23 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/search/DefaultFullTextIndexerTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/search/DefaultFullTextIndexerTest.java @@ -38,6 +38,7 @@ import org.testng.annotations.Test; import ch.systemsx.cisd.common.logging.BufferedAppender; import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE; +import ch.systemsx.cisd.openbis.util.LogRecordingUtils; /** * @author Franz-Josef Elmer @@ -65,7 +66,7 @@ public class DefaultFullTextIndexerTest extends AssertJUnit @BeforeMethod public final void setUp() { - logRecorder = new BufferedAppender("%-5p %c - %m%n", Level.INFO); + logRecorder = LogRecordingUtils.createRecorder("%-5p %c - %m%n", Level.INFO); context = new Mockery(); criteria = context.mock(Criteria.class); session = context.mock(FullTextSession.class); -- GitLab