From f9497a0d9266fe7a5009f5ab9dbe4e7bb2fa71ff Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 25 Mar 2013 11:21:23 +0000
Subject: [PATCH] SP-527, BIS-343: log message improved
SVN: 28682
---
.../path/DataSetAndPathInfoDBConsistencyCheckTask.java | 2 +-
.../path/DataSetAndPathInfoDBConsistencyCheckTaskTest.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
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 b84ccdf88e9..6d9cf469656 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 d748f715ee9..18a3cd51b7e 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"
--
GitLab