diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTask.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTask.java index b84ccdf88e9a4fc714308b8e04725b4d07747ce1..6d9cf46965632095780b200d4a27e5ac0506f20b 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTask.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTask.java @@ -91,7 +91,7 @@ public class DataSetAndPathInfoDBConsistencyCheckTask implements IMaintenanceTas Date youngerThanDate = new Date(getTimeProvider().getTimeInMilliseconds() - timeInterval); List<SimpleDataSetInformationDTO> dataSets = getService().listOldestPhysicalDataSets(youngerThanDate, Integer.MAX_VALUE); - operationLog.info("Check " + dataSets.size() + " registered since " + operationLog.info("Check " + dataSets.size() + " data sets registered since " + DATE_FORMAT.format(youngerThanDate)); DataSetAndPathInfoDBConsistencyChecker checker = new DataSetAndPathInfoDBConsistencyChecker(fileProvider, pathInfoProvider); diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTaskTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTaskTest.java index d748f715ee9f805f5402fb23a27530ef5222c33d..18a3cd51b7e336cec227dc5d18256ac673acc649 100644 --- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTaskTest.java +++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTaskTest.java @@ -98,7 +98,7 @@ public class DataSetAndPathInfoDBConsistencyCheckTaskTest extends AssertJUnit task.execute(); assertEquals("INFO OPERATION.DataSetAndPathInfoDBConsistencyCheckTask - " - + "Check 1 registered since 1970-01-01 01:00:00", logRecorder.getLogContent()); + + "Check 1 data sets registered since 1970-01-01 01:00:00", logRecorder.getLogContent()); assertEquals(true, fileContent.isClosed()); assertEquals(true, pathInfoContent.isClosed()); context.assertIsSatisfied(); @@ -116,7 +116,7 @@ public class DataSetAndPathInfoDBConsistencyCheckTaskTest extends AssertJUnit task.execute(); assertEquals("INFO OPERATION.DataSetAndPathInfoDBConsistencyCheckTask - " - + "Check 1 registered since 1970-01-01 01:00:00\n" + + "Check 1 data sets registered since 1970-01-01 01:00:00\n" + "ERROR OPERATION.DataSetAndPathInfoDBConsistencyChecker - " + "Couldn't check consistency of the file system and " + "the path info database for a data set: ds1\n" @@ -162,7 +162,7 @@ public class DataSetAndPathInfoDBConsistencyCheckTaskTest extends AssertJUnit assertEquals( "INFO OPERATION.DataSetAndPathInfoDBConsistencyCheckTask - " - + "Check 4 registered since 1970-01-01 01:00:00\n" + + "Check 4 data sets registered since 1970-01-01 01:00:00\n" + "ERROR NOTIFY.DataSetAndPathInfoDBConsistencyCheckTask - " + "File system and path info DB consistency check report " + "for all data sets since 1970-01-01 01:00:00\n\n"