From f055096e89ed23235d2dd52d81f642922a11818a Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Mon, 13 Aug 2012 11:09:18 +0000
Subject: [PATCH] Fix unit tests which need the displaySettingsProvider field
of AbstractServer.
SVN: 26351
---
.../query/server/api/v1/QueryApiServerTest.java | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.java
index 2d3a3ef8dd3..bab65020934 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.java
@@ -29,6 +29,7 @@ import org.testng.annotations.Test;
import ch.systemsx.cisd.authentication.Principal;
import ch.systemsx.cisd.common.test.RecordingMatcher;
+import ch.systemsx.cisd.openbis.generic.server.DisplaySettingsProvider;
import ch.systemsx.cisd.openbis.generic.shared.AbstractServerTestCase;
import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
@@ -74,9 +75,11 @@ public class QueryApiServerTest extends AbstractServerTestCase
{
queryServer = context.mock(IQueryServer.class);
commonServer = context.mock(ICommonServer.class);
- queryApiServer =
+ final QueryApiServer queryApiServerInt =
new QueryApiServer(queryServer, commonServer, sessionManager, daoFactory,
propertiesBatchManager);
+ queryApiServerInt.setDisplaySettingsProvider(new DisplaySettingsProvider());
+ queryApiServer = queryApiServerInt;
}
@Test
@@ -91,14 +94,11 @@ public class QueryApiServerTest extends AbstractServerTestCase
one(sessionManager).getSession(SESSION_TOKEN);
will(returnValue(SESSION));
- one(personDAO).listPersons();
PersonPE person = new PersonPE();
person.setUserId("Albert");
person.setRoleAssignments(new HashSet<RoleAssignmentPE>(Arrays
.asList(new RoleAssignmentPE())));
person.setActive(true);
- will(returnValue(Arrays.asList(person)));
-
one(personDAO).tryFindPersonByUserId(SESSION.getUserName());
will(returnValue(person));
@@ -315,7 +315,8 @@ public class QueryApiServerTest extends AbstractServerTestCase
one(sessionManager).getSession(SESSION_TOKEN);
will(returnValue(new Session("u", SESSION_TOKEN, new Principal(), "", 1)));
- one(commonServer).createReportFromAggregationService(with(SESSION_TOKEN), with(descriptionMatcher), with(serviceParams));
+ one(commonServer).createReportFromAggregationService(with(SESSION_TOKEN),
+ with(descriptionMatcher), with(serviceParams));
SimpleTableModelBuilder builder = new SimpleTableModelBuilder();
builder.addFullHeader("Integer", "Double", "String");
builder.addRow(Arrays.asList(new IntegerTableCell(42), new DoubleTableCell(
@@ -325,7 +326,8 @@ public class QueryApiServerTest extends AbstractServerTestCase
});
QueryTableModel tableModel =
- queryApiServer.createReportFromAggregationService(SESSION_TOKEN, "DS", "S1", serviceParams);
+ queryApiServer.createReportFromAggregationService(SESSION_TOKEN, "DS", "S1",
+ serviceParams);
DatastoreServiceDescription description = descriptionMatcher.recordedObject();
assertEquals("S1", description.getKey());
@@ -333,7 +335,8 @@ public class QueryApiServerTest extends AbstractServerTestCase
assertEquals("DS", description.getDatastoreCode());
assertEquals("[]", Arrays.asList(description.getDatasetTypeCodes()).toString());
assertEquals(DataStoreServiceKind.QUERIES, description.getServiceKind());
- assertEquals(ReportingPluginType.AGGREGATION_TABLE_MODEL, description.tryReportingPluginType());
+ assertEquals(ReportingPluginType.AGGREGATION_TABLE_MODEL,
+ description.tryReportingPluginType());
List<QueryTableColumn> columns = tableModel.getColumns();
assertEquals("Integer", columns.get(0).getTitle());
assertEquals(QueryTableColumnDataType.LONG, columns.get(0).getDataType());
--
GitLab