LMS-2819 Fix screening tests.

SVN: 24687

openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchCriteria.java

@@ -124,7 +124,7 @@ public class SearchCriteria implements Serializable
 
         private String desiredValue;
         
-        private CompareMode compareMode;
+        private CompareMode compareMode = CompareMode.EQUALS;
         
         private Date date;
 

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]],"
+                + "[SearchCriteria.AttributeMatchClause[ATTRIBUTE,TYPE,PLATE,EQUALS,<null>]],"
                 + "[SearchSubCriteria[EXPERIMENT,SearchCriteria[MATCH_ALL_CLAUSES,"
-                + "[SearchCriteria.AttributeMatchClause[ATTRIBUTE,CODE,E], "
-                + "SearchCriteria.AttributeMatchClause[ATTRIBUTE,PROJECT,P], "
-                + "SearchCriteria.AttributeMatchClause[ATTRIBUTE,SPACE,S]],[]]]]]",
+                + "[SearchCriteria.AttributeMatchClause[ATTRIBUTE,CODE,E,EQUALS,<null>], "
+                + "SearchCriteria.AttributeMatchClause[ATTRIBUTE,PROJECT,P,EQUALS,<null>], "
+                + "SearchCriteria.AttributeMatchClause[ATTRIBUTE,SPACE,S,EQUALS,<null>]],[]]]]]",
                 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], "
-                + "SearchCriteria.AttributeMatchClause[ATTRIBUTE,PROJECT,P], "
-                + "SearchCriteria.AttributeMatchClause[ATTRIBUTE,SPACE,S]],[]]]]]",
+                + "[SearchCriteria.AttributeMatchClause[ATTRIBUTE,CODE,E,EQUALS,<null>], "
+                + "SearchCriteria.AttributeMatchClause[ATTRIBUTE,PROJECT,P,EQUALS,<null>], "
+                + "SearchCriteria.AttributeMatchClause[ATTRIBUTE,SPACE,S,EQUALS,<null>]],[]]]]]",
                 searchCriteriaMatcher.recordedObject().toString());
         context.assertIsSatisfied();
     }