From 09dfb53758293d189f84fe39caa0d99bc14aa0d2 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Thu, 6 Jul 2017 08:16:52 +0000
Subject: [PATCH] SSDM-5299 : Project Authorization - modify @RolesAllowed
annotations at experiment related methods - fix automated tests
SVN: 38501
---
.../generic/server/dataaccess/db/EntityPropertyTypeDAOTest.java | 2 +-
.../plugin/generic/server/GenericServerDatabaseTest.java | 2 +-
.../api/v1/GeneralInformationServiceJsonApiTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAOTest.java
index 813e2854592..7f0bb03df2e 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAOTest.java
@@ -152,7 +152,7 @@ public class EntityPropertyTypeDAOTest extends AbstractDAOTest
int afterDeletionPropertiesRowCount =
countRowsInTable(TableNames.EXPERIMENT_PROPERTIES_TABLE);
- assertEquals(beforeDeletionPropertiesRowCount - 7, afterDeletionPropertiesRowCount);
+ assertEquals(beforeDeletionPropertiesRowCount - 8, afterDeletionPropertiesRowCount);
}
private EntityTypePropertyTypePE tryToGetAssignment(EntityKind entityKind,
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerDatabaseTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerDatabaseTest.java
index 307807ced97..550b003d386 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerDatabaseTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerDatabaseTest.java
@@ -352,7 +352,7 @@ public class GenericServerDatabaseTest extends AbstractDAOTest
UpdatedBasicExperiment update = new UpdatedBasicExperiment();
update.setIdentifier("/TEST-SPACE/TEST-PROJECT/EXP-SPACE-TEST");
update.setProperties(new IEntityProperty[] { property });
- update.setBatchUpdateDetails(new ExperimentBatchUpdateDetails());
+ update.setBatchUpdateDetails(new ExperimentBatchUpdateDetails(Collections.singleton("DESCRIPTION")));
ExperimentType type = new ExperimentType();
type.setCode("SIRNA_HCS");
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceJsonApiTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceJsonApiTest.java
index cb78eca098f..cded305ed1e 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceJsonApiTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceJsonApiTest.java
@@ -282,7 +282,7 @@ public class GeneralInformationServiceJsonApiTest extends RemoteApiTestCase
ec.addMatchClause(MatchClause.createPropertyMatch("DESCRIPTION", "A simple experiment"));
sc.addSubCriteria(SearchSubCriteria.createExperimentCriteria(ec));
List<Sample> result = generalInformationService.searchForSamples(sessionToken, sc);
- assertEquals(2, result.size());
+ assertEquals(9, result.size());
}
@Test
--
GitLab