From 27fd5bfa4ac23947d910c27f12eebfc94e826689 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Tue, 30 Nov 2010 13:01:43 +0000
Subject: [PATCH] minor: changed tests expectations for better reliability
SVN: 18939
---
.../generic/server/dataaccess/db/SampleTypeDAOTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleTypeDAOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleTypeDAOTest.java
index f73640a16d0..fe443434ce7 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleTypeDAOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleTypeDAOTest.java
@@ -153,13 +153,14 @@ public final class SampleTypeDAOTest extends AbstractDAOTest
logRecorder.resetLogContent();
final SampleTypePE sampleType = sampleTypeDAO.tryFindSampleTypeByExample(example);
checkSampleType(sampleType);
- assertEquals(
+ String expectedLogContent =
"tryFindSampleTypeByExample(SampleTypePE{"
+ "code=MASTER_PLATE,description=<null>,databaseInstance=<null>,listable=<null>,"
+ "containerHierarchyDepth=<null>,generatedFromHierarchyDepth=<null>}): Sample type "
+ "'SampleTypePE{code=MASTER_PLATE,description=Master Plate,"
+ "databaseInstance=DatabaseInstancePE{code=CISD},listable=true,"
- + "containerHierarchyDepth=0,generatedFromHierarchyDepth=0}' found.",
- logRecorder.getLogContent());
+ + "containerHierarchyDepth=0,generatedFromHierarchyDepth=0}' found.";
+ assertTrue("Expected content wasn't found in log:\n\n" + logRecorder.getLogContent(),
+ logRecorder.getLogContent().contains(expectedLogContent));
}
}
--
GitLab