SP-594, BIS-389: fixing tests

SVN: 28801

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ScriptProviderTest.java

@@ -56,7 +56,7 @@ public class ScriptProviderTest extends AbstractProviderTest
         TypedTableModel<Script> tableModel = scriptProvider.createTableModel();
 
         assertEquals(
-                "[NAME, DESCRIPTION, SCRIPT, ENTITY_KIND, SCRIPT_TYPE, PLUGIN_TYPE, REGISTRATOR, REGISTRATION_DATE, IS_AVAILABLE]",
+                "[NAME, DESCRIPTION, SCRIPT, ENTITY_KIND, SCRIPT_TYPE, PLUGIN_TYPE, REGISTRATOR, MODIFICATION_DATE, IS_AVAILABLE]",
                 getHeaderIDs(tableModel).toString());
         assertEquals(
                 "[VARCHAR, VARCHAR, VARCHAR, VARCHAR, VARCHAR, VARCHAR, VARCHAR, TIMESTAMP, VARCHAR]",
@@ -89,7 +89,7 @@ public class ScriptProviderTest extends AbstractProviderTest
         script.setScript("do something with " + kind);
         script.setScriptType(ScriptType.DYNAMIC_PROPERTY);
         script.setPluginType(PluginType.JYTHON);
-        script.setRegistrationDate(new Date(4711));
+        script.setModificationDate(new Date(4711));
         script.setRegistrator(new PersonBuilder().name("Albert", "Einstein").getPerson());
         return script;
     }

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabulariesProviderTest.java

@@ -61,12 +61,12 @@ public class VocabulariesProviderTest extends AbstractProviderTest
     {
         VocabulariesProvider vocabulariesProvider =
                 new VocabulariesProvider(server, SESSION_TOKEN, true, false);
-        TypedTableModel<Vocabulary> tableModel = vocabulariesProvider.getTableModel(Integer.MAX_VALUE);
+        TypedTableModel<Vocabulary> tableModel =
+                vocabulariesProvider.getTableModel(Integer.MAX_VALUE);
 
-        assertEquals(
-                "[CODE, DESCRIPTION, IS_MANAGED_INTERNALLY, REGISTRATOR, REGISTRATION_DATE, URL_TEMPLATE, "
-                        + "VOCABULARY_SHOW_AVAILABLE_TERMS_IN_CHOOSERS]", getHeaderIDs(tableModel)
-                        .toString());
+        assertEquals("[CODE, DESCRIPTION, IS_MANAGED_INTERNALLY, REGISTRATOR, REGISTRATION_DATE, "
+                + "MODIFICATION_DATE, URL_TEMPLATE, VOCABULARY_SHOW_AVAILABLE_TERMS_IN_CHOOSERS]",
+                getHeaderIDs(tableModel).toString());
 
         List<TableModelRowWithObject<Vocabulary>> rows = tableModel.getRows();
         assertSame(animals, rows.get(0).getObjectOrNull());
@@ -74,7 +74,7 @@ public class VocabulariesProviderTest extends AbstractProviderTest
         List<String> expectedValues =
                 Arrays.asList(animals.getCode(), animals.getDescription(), "no", animals
                         .getRegistrator().getLastName(), animals.getRegistrator().getFirstName(),
-                        "", animals.getURLTemplate(), "yes");
+                        "", "", animals.getURLTemplate(), "yes");
 
         assertEquals(expectedValues.toString(), rows.get(0).getValues().toString());
         assertEquals(1, rows.size());

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBOTest.java

@@ -19,6 +19,7 @@ package ch.systemsx.cisd.openbis.generic.server.business.bo;
 import static ch.systemsx.cisd.openbis.generic.server.business.ManagerTestTool.EXAMPLE_SESSION;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 import org.jmock.Expectations;
@@ -163,6 +164,7 @@ public final class EntityTypePropertyTypeBOTest extends AbstractBOTest
         script1.setScriptType(ScriptType.DYNAMIC_PROPERTY);
         final ScriptPE script2 = new ScriptPE();
         script2.setName("name2");
+        etpt.setModificationDate(new Date(42));
         etpt.setScript(script1);
         etpt.setOrdinal(1L);
 
@@ -188,7 +190,8 @@ public final class EntityTypePropertyTypeBOTest extends AbstractBOTest
                 new NewETPTAssignment(
                         ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind.EXPERIMENT,
                         propertyType.getCode(), experimentType.getCode(), false, null, "s",
-                        etpt.getOrdinal() - 1, true, false, script2.getName(), false, false);
+                        etpt.getOrdinal() - 1, true, false, etpt.getModificationDate(),
+                        script2.getName(), false, false);
         bo.updateLoadedAssignment(updatedAssignment);
     }
 

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/GridCustomFilterBOTest.java

@@ -18,6 +18,8 @@ package ch.systemsx.cisd.openbis.generic.server.business.bo;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.ManagerTestTool.EXAMPLE_SESSION;
 
+import java.util.Date;
+
 import org.jmock.Expectations;
 import org.testng.annotations.Test;
 
@@ -59,6 +61,7 @@ public class GridCustomFilterBOTest extends AbstractBOTest
                     filter.setDescription(updates.getDescription());
                     filter.setExpression(updates.getExpression());
                     filter.setPublic(updates.isPublic());
+                    filter.setModificationDate(updates.getModificationDate());
 
                     one(filterDAO).validateAndSaveUpdatedEntity(filter);
                 }
@@ -90,6 +93,7 @@ public class GridCustomFilterBOTest extends AbstractBOTest
         updates.setDescription(filter.getDescription() + " modified");
         updates.setExpression(filter.getExpression() + " modified");
         updates.setPublic(filter.isPublic() == false);
+        updates.setModificationDate(new Date(42));
         return updates;
     }
 

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ScriptBOTest.java

@@ -16,6 +16,8 @@
 
 package ch.systemsx.cisd.openbis.generic.server.business.bo;
 
+import java.util.Date;
+
 import org.jmock.Expectations;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.DataRetrievalFailureException;
@@ -45,6 +47,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
 public final class ScriptBOTest extends AbstractBOTest
 {
 
+    @SuppressWarnings("unused")
     @DataProvider
     private final static Object[][] scriptTypes()
     {
@@ -256,12 +259,14 @@ public final class ScriptBOTest extends AbstractBOTest
         String script = SCRIPT;
         updates.setScript(script);
         updates.setId(1L);
+        updates.setModificationDate(new Date(42));
 
         final ScriptPE scriptPE = new ScriptPE();
         scriptPE.setName(name + 1);
         scriptPE.setScript(script);
         scriptPE.setDescription(description + 1);
         scriptPE.setScriptType(scriptType);
+        scriptPE.setModificationDate(updates.getModificationDate());
 
         context.checking(new Expectations()
             {
@@ -300,12 +305,14 @@ public final class ScriptBOTest extends AbstractBOTest
         String script = SCRIPT;
         updates.setScript(script);
         updates.setId(1L);
+        updates.setModificationDate(new Date(42));
 
         final ScriptPE scriptPE = new ScriptPE();
         scriptPE.setName(name + 1);
         scriptPE.setScript(script + 1);
         scriptPE.setDescription(description + 1);
         scriptPE.setScriptType(scriptType);
+        scriptPE.setModificationDate(updates.getModificationDate());
         final SampleTypePropertyTypePE etpt = new SampleTypePropertyTypePE();
         SampleTypePE sampleType = new SampleTypePE();
         etpt.setEntityType(sampleType);

openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/resultset/QueryExpressionProviderTest.java

@@ -34,8 +34,6 @@ import ch.systemsx.cisd.openbis.plugin.query.shared.basic.dto.QueryDatabase;
 import ch.systemsx.cisd.openbis.plugin.query.shared.basic.dto.QueryExpression;
 
 /**
- * 
- *
  * @author Franz-Josef Elmer
  */
 public class QueryExpressionProviderTest extends AbstractProviderTest
@@ -53,6 +51,7 @@ public class QueryExpressionProviderTest extends AbstractProviderTest
         qe1.setQueryType(QueryType.EXPERIMENT);
         qe1.setRegistrationDate(new Date(4711));
         qe1.setRegistrator(new PersonBuilder().name("Albert", "Einstein").getPerson());
+        qe1.setModificationDate(new Date(5711));
         final IQueryServer queryServer = context.mock(IQueryServer.class);
         context.checking(new Expectations()
             {
@@ -67,16 +66,18 @@ public class QueryExpressionProviderTest extends AbstractProviderTest
         TypedTableModel<QueryExpression> model = provider.getTableModel(100);
 
         assertEquals("[NAME, DESCRIPTION, SQL_QUERY, IS_PUBLIC, QUERY_TYPE, ENTITY_TYPE, "
-                + "QUERY_DATABASE, REGISTRATOR, REGISTRATION_DATE]", getHeaderIDs(model).toString());
-        assertEquals("[null, null, null, null, null, null, null, null, null]",
+                + "QUERY_DATABASE, REGISTRATOR, REGISTRATION_DATE, MODIFICATION_DATE]",
+                getHeaderIDs(model).toString());
+        assertEquals("[null, null, null, null, null, null, null, null, null, null]",
                 getHeaderEntityKinds(model).toString());
         assertEquals("[VARCHAR, VARCHAR, VARCHAR, VARCHAR, VARCHAR, VARCHAR, "
-                + "VARCHAR, VARCHAR, TIMESTAMP]", getHeaderDataTypes(model).toString());
+                + "VARCHAR, VARCHAR, TIMESTAMP, TIMESTAMP]", getHeaderDataTypes(model).toString());
         List<TableModelRowWithObject<QueryExpression>> rows = model.getRows();
         assertSame(qe1, rows.get(0).getObjectOrNull());
-        assertEquals("[MY-QUERY, my query, select * from something, yes, EXPERIMENT, MY_TYPE, "
-                + "My DB, Einstein, Albert, Thu Jan 01 01:00:04 CET 1970]", rows.get(0).getValues()
-                .toString());
+        assertEquals(
+                "[MY-QUERY, my query, select * from something, yes, EXPERIMENT, MY_TYPE, "
+                        + "My DB, Einstein, Albert, Thu Jan 01 01:00:04 CET 1970, Thu Jan 01 01:00:05 CET 1970]",
+                rows.get(0).getValues().toString());
         assertEquals(1, rows.size());
         context.assertIsSatisfied();
     }