Skip to content
Snippets Groups Projects
Commit 316de7bf authored by felmer's avatar felmer
Browse files

SSDM-7171: change in column names 'experiments' -> 'collections' and 'samples' -> 'objects'.

parent 675ec6ea
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/UsageReportingTask.java
+ 1
− 1
View file @ 316de7bf
......@@ -188,7 +188,7 @@ public class UsageReportingTask extends AbstractMaintenanceTask
{
StringBuilder builder = new StringBuilder();
builder.append("period start" + DELIM + "period end" + DELIM + "group name" + DELIM + "number of users" + DELIM
+ "idle users" + DELIM + "number of new experiments" + DELIM + "number of new samples" + DELIM
+ "idle users" + DELIM + "number of new collections" + DELIM + "number of new objects" + DELIM
+ "number of new data sets");
if (usageAndGroupsInfoForAllEntitiesOrNull != null)
{
......
openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/UsageReportingTaskTest.java
+ 6
− 6
View file @ 316de7bf
......@@ -144,7 +144,7 @@ public class UsageReportingTaskTest extends AbstractFileSystemTestCase
ByteArrayOutputStream baos = new ByteArrayOutputStream();
attachmentRecorder.getRecordedObjects().get(0).writeTo(baos);
assertEquals("period start" + D + "period end" + D + "group name" + D + "number of users" + D + "idle users" + D
+ "number of new experiments" + D + "number of new samples" + D + "number of new data sets\n"
+ "number of new collections" + D + "number of new objects" + D + "number of new data sets\n"
+ "1969-12-01 00:00:00" + D + "1970-01-01 00:00:00" + D + "" + D + "5" + D + "u4 u5" + D + "7" + D + "10" + D + "6\n"
+ "1969-12-01 00:00:00" + D + "1970-01-01 00:00:00" + D + "A" + D + "2" + D + "u4" + D + "2" + D + "0" + D + "1\n"
+ "1969-12-01 00:00:00" + D + "1970-01-01 00:00:00" + D + "B" + D + "2" + D + D + "5" + D + "0" + D + "0\n", baos.toString());
......@@ -196,7 +196,7 @@ public class UsageReportingTaskTest extends AbstractFileSystemTestCase
ByteArrayOutputStream baos = new ByteArrayOutputStream();
attachmentRecorder.getRecordedObjects().get(0).writeTo(baos);
assertEquals("period start" + D + "period end" + D + "group name" + D + "number of users" + D + "idle users" + D
+ "number of new experiments" + D + "number of new samples" + D + "number of new data sets\n"
+ "number of new collections" + D + "number of new objects" + D + "number of new data sets\n"
+ "1969-12-21 00:00:00" + D + "1969-12-28 00:00:00" + D + "" + D + "5" + D + "u4 u5" + D + "2" + D + "15" + D + "6\n"
+ "1969-12-21 00:00:00" + D + "1969-12-28 00:00:00" + D + "A" + D + "2" + D + "u4" + D + "2" + D + "0" + D + "1\n"
+ "1969-12-21 00:00:00" + D + "1969-12-28 00:00:00" + D + "B" + D + "2" + D + D + "0" + D + "5" + D + "0\n"
......@@ -257,7 +257,7 @@ public class UsageReportingTaskTest extends AbstractFileSystemTestCase
ByteArrayOutputStream baos = new ByteArrayOutputStream();
attachmentRecorder.getRecordedObjects().get(0).writeTo(baos);
assertEquals("period start" + D + "period end" + D + "group name" + D + "number of users" + D + "idle users" + D
+ "number of new experiments" + D + "number of new samples" + D + "number of new data sets" + D + "total number of entities\n"
+ "number of new collections" + D + "number of new objects" + D + "number of new data sets" + D + "total number of entities\n"
+ "1970-01-04 00:00:00" + D + "1970-01-11 00:00:00" + D + "" + D + "5" + D + "u4 u5" + D + "2" + D + "13" + D + "6" + D + "91\n"
+ "1970-01-04 00:00:00" + D + "1970-01-11 00:00:00" + D + "A" + D + "2" + D + "u4" + D + "2" + D + "0" + D + "1" + D + "35\n"
+ "1970-01-04 00:00:00" + D + "1970-01-11 00:00:00" + D + "B" + D + "2" + D + "u2 u3" + D + "0" + D + "0" + D + "0" + D + "37\n"
......@@ -312,7 +312,7 @@ public class UsageReportingTaskTest extends AbstractFileSystemTestCase
ByteArrayOutputStream baos = new ByteArrayOutputStream();
attachmentRecorder.getRecordedObjects().get(0).writeTo(baos);
assertEquals("period start" + D + "period end" + D + "group name" + D + "number of users" + D + "idle users" + D
+ "number of new experiments" + D + "number of new samples" + D + "number of new data sets\n"
+ "number of new collections" + D + "number of new objects" + D + "number of new data sets\n"
+ "1969-12-31 00:00:00" + D + "1970-01-01 00:00:00" + D + "" + D + "5" + D + "u4 u5" + D + "2" + D + "10" + D + "11\n"
+ "1969-12-31 00:00:00" + D + "1970-01-01 00:00:00" + D + "A" + D + "2" + D + "u4" + D + "2" + D + "0" + D + "1\n"
+ "1969-12-31 00:00:00" + D + "1970-01-01 00:00:00" + D + "B" + D + "2" + D + D + "0" + D + "0" + D + "5\n"
......@@ -359,7 +359,7 @@ public class UsageReportingTaskTest extends AbstractFileSystemTestCase
ByteArrayOutputStream baos = new ByteArrayOutputStream();
attachmentRecorder.getRecordedObjects().get(1).writeTo(baos);
assertEquals("period start" + D + "period end" + D + "group name" + D + "number of users" + D + "idle users" + D
+ "number of new experiments" + D + "number of new samples" + D + "number of new data sets\n"
+ "number of new collections" + D + "number of new objects" + D + "number of new data sets\n"
+ "1969-12-31 00:00:00" + D + "1970-01-01 00:00:00" + D + "" + D + "4" + D + "u4" + D + "7" + D + "3" + D + "6\n"
+ "1969-12-31 00:00:00" + D + "1970-01-01 00:00:00" + D + "u1" + D + "1" + D + D + "2" + D + "1" + D + "1\n"
+ "1969-12-31 00:00:00" + D + "1970-01-01 00:00:00" + D + "u2" + D + "1" + D + D + "2" + D + "2" + D + "5\n"
......@@ -406,7 +406,7 @@ public class UsageReportingTaskTest extends AbstractFileSystemTestCase
ByteArrayOutputStream baos = new ByteArrayOutputStream();
attachmentRecorder.getRecordedObjects().get(1).writeTo(baos);
assertEquals("period start" + D + "period end" + D + "group name" + D + "number of users" + D + "idle users" + D
+ "number of new experiments" + D + "number of new samples" + D + "number of new data sets\n"
+ "number of new collections" + D + "number of new objects" + D + "number of new data sets\n"
+ "1969-12-31 00:00:00" + D + "1970-01-01 00:00:00" + D + "" + D + "4" + D + "u4" + D + "7" + D + "3" + D + "6\n"
+ "1969-12-31 00:00:00" + D + "1970-01-01 00:00:00" + D + "u1" + D + "1" + D + D + "2" + D + "1" + D + "1\n"
+ "1969-12-31 00:00:00" + D + "1970-01-01 00:00:00" + D + "u2" + D + "1" + D + D + "2" + D + "2" + D + "5\n"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment