From cfe0a32ff00f38c7a33d0e79bbdde98257ff8c15 Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Wed, 14 Mar 2012 15:21:02 +0000
Subject: [PATCH] LMS-2819 Fix screening tests.
SVN: 24732
---
.../api/v1/ScreeningOpenbisServiceFacadeTest.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacadeTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacadeTest.java
index 9c282f1b5c2..e5025e93ae8 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacadeTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacadeTest.java
@@ -1005,11 +1005,11 @@ public class ScreeningOpenbisServiceFacadeTest extends AbstractFileSystemTestCas
facade.listPlates(new ExperimentIdentifier("E", "P", "S", null), "ap-42");
assertEquals("SearchCriteria[MATCH_ALL_CLAUSES,"
- + "[SearchCriteria.AttributeMatchClause[ATTRIBUTE,TYPE,PLATE,EQUALS,<null>]],"
+ + "[SearchCriteria.AttributeMatchClause[ATTRIBUTE,TYPE,PLATE,EQUALS]],"
+ "[SearchSubCriteria[EXPERIMENT,SearchCriteria[MATCH_ALL_CLAUSES,"
- + "[SearchCriteria.AttributeMatchClause[ATTRIBUTE,CODE,E,EQUALS,<null>], "
- + "SearchCriteria.AttributeMatchClause[ATTRIBUTE,PROJECT,P,EQUALS,<null>], "
- + "SearchCriteria.AttributeMatchClause[ATTRIBUTE,SPACE,S,EQUALS,<null>]],[]]]]]",
+ + "[SearchCriteria.AttributeMatchClause[ATTRIBUTE,CODE,E,EQUALS], "
+ + "SearchCriteria.AttributeMatchClause[ATTRIBUTE,PROJECT,P,EQUALS], "
+ + "SearchCriteria.AttributeMatchClause[ATTRIBUTE,SPACE,S,EQUALS]],[]]]]]",
searchCriteriaMatcher.recordedObject().toString());
assertEquals("/s/p1 [s-1] { Experiment: /S/P/E }", plates.get(0).toString());
assertEquals(1, plates.size());
@@ -1132,9 +1132,9 @@ public class ScreeningOpenbisServiceFacadeTest extends AbstractFileSystemTestCas
assertEquals("[ALPHA-42, FZ-87]", procedures.toString());
assertEquals("SearchCriteria[MATCH_ALL_CLAUSES,[],"
+ "[SearchSubCriteria[EXPERIMENT,SearchCriteria[MATCH_ALL_CLAUSES,"
- + "[SearchCriteria.AttributeMatchClause[ATTRIBUTE,CODE,E,EQUALS,<null>], "
- + "SearchCriteria.AttributeMatchClause[ATTRIBUTE,PROJECT,P,EQUALS,<null>], "
- + "SearchCriteria.AttributeMatchClause[ATTRIBUTE,SPACE,S,EQUALS,<null>]],[]]]]]",
+ + "[SearchCriteria.AttributeMatchClause[ATTRIBUTE,CODE,E,EQUALS], "
+ + "SearchCriteria.AttributeMatchClause[ATTRIBUTE,PROJECT,P,EQUALS], "
+ + "SearchCriteria.AttributeMatchClause[ATTRIBUTE,SPACE,S,EQUALS]],[]]]]]",
searchCriteriaMatcher.recordedObject().toString());
context.assertIsSatisfied();
}
--
GitLab