From 83195685d77e0530e62aadb30a99f1e92300f25a Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Thu, 23 Feb 2012 15:44:25 +0000
Subject: [PATCH] LMS-2807 Fixed text of task and tests.
SVN: 24550
---
.../server/task/DataSetRegistrationSummaryTask.java | 2 +-
.../task/DataSetRegistrationSummaryTaskTest.java | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTask.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTask.java
index 64feded6448..45d9461f95f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTask.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTask.java
@@ -96,7 +96,7 @@ public class DataSetRegistrationSummaryTask implements IMaintenanceTask
+ "between ${from-date} and ${until-date}");
private static final Template REPORT_TEMPLATE = new Template("Dear user\n\n"
- + "This report summarizes data sets registered in openBIS"
+ + "This report summarizes data sets registered in openBIS "
+ "between ${from-date} and ${until-date}.\n\n${configured-content}\n\n"
+ "${data-sets}\n\nRegards,\nopenBIS");
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTaskTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTaskTest.java
index eced296b764..9c100fea978 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTaskTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTaskTest.java
@@ -175,8 +175,8 @@ public class DataSetRegistrationSummaryTaskTest extends AssertJUnit
EMailContentChecker checker =
prepareForSendingEMail("New data sets registered between "
+ "2012-01-02 and 2012-01-04", "Dear user\n" + "\n"
- + "This is a report from openBIS about data sets registered between "
- + "2012-01-02 and 2012-01-04. " + "The data sets are grouped by type.\n"
+ + "This report summarizes data sets registered in openBIS between "
+ + "2012-01-02 and 2012-01-04.\n\n" + "The data sets are grouped by type.\n"
+ "\n" + "\n" + "\n" + "Regards,\n" + "openBIS", "a@bc.de", "x@y.z");
createTask(properties).execute();
@@ -241,8 +241,8 @@ public class DataSetRegistrationSummaryTaskTest extends AssertJUnit
EMailContentChecker checker =
prepareForSendingEMail("New data sets registered between "
+ "2012-01-01 and 2012-01-04", "Dear user\n\n"
- + "This is a report from openBIS about data sets registered between "
- + "2012-01-01 and 2012-01-04. " + "The data sets are grouped by type.\n\n"
+ + "This report summarizes data sets registered in openBIS between "
+ + "2012-01-01 and 2012-01-04.\n\n" + "The data sets are grouped by type.\n\n"
+ "MY-TYPE: Total number: 5. Number of new data sets: 4\n"
+ "\tds1, ds2, ds3, ds4\n"
+ "YOUR-TYPE: Total number: 5. Number of new data sets: 5\n"
@@ -294,8 +294,8 @@ public class DataSetRegistrationSummaryTaskTest extends AssertJUnit
EMailContentChecker checker =
prepareForSendingEMail("New data sets registered between "
+ "2011-12-04 and 2012-01-04", "Dear user\n\n"
- + "This is a report from openBIS about data sets registered between "
- + "2011-12-04 and 2012-01-04. " + "The data sets are grouped by type.\n\n"
+ + "This report summarizes data sets registered in openBIS between "
+ + "2011-12-04 and 2012-01-04.\n\n" + "The data sets are grouped by type.\n\n"
+ "MY-TYPE: Total number: 5. Number of new data sets: 3\n"
+ "\tds1: ALPHA = 123, BETA = 456\n" + "\tds2: ALPHA = 42\n" + "\tds3\n"
+ "YOUR-TYPE: Total number: 0. No new data sets.\n" + "\n" + "\n"
--
GitLab