SSDM-4686 : v3 API roles bug: better test data (roles) to fix failing tests

SVN: 37675

openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java

@@ -38,6 +38,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 
+import junit.framework.Assert;
+
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -107,8 +109,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
 import ch.systemsx.cisd.openbis.systemtest.SystemTestCase;
 import ch.systemsx.cisd.openbis.util.LogRecordingUtils;
 
-import junit.framework.Assert;
-
 /**
  * @author Jakub Straszewski
  */
@@ -121,6 +121,8 @@ public class AbstractTest extends SystemTestCase
 
     protected static final String TEST_SPACE_USER = "test_space";
 
+    protected static final String TEST_ROLE_V3 = "test_v3";
+
     protected static final String TEST_USER = "test";
 
     protected static final String TEST_POWER_USER_CISD = "test_role";

openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteDataSetTest.java

@@ -129,7 +129,7 @@ public class DeleteDataSetTest extends AbstractDeletionTest
                 @Override
                 public void execute()
                 {
-                    String sessionToken = v3api.login(TEST_POWER_USER_CISD, PASSWORD);
+                    String sessionToken = v3api.login(TEST_ROLE_V3, PASSWORD);
 
                     DataSetDeletionOptions options = new DataSetDeletionOptions();
                     options.setReason("It is just a test");

openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteExperimentTest.java

@@ -166,7 +166,7 @@ public class DeleteExperimentTest extends AbstractDeletionTest
     }
 
     @Test
-    public void testDeleteExperimentWithPowerUserInAnotherSpace()
+    public void testExperimentWithPowerUserInAnotherSpace()
     {
         final ExperimentPermId permId = new ExperimentPermId("200902091255058-1037");
 
@@ -175,7 +175,7 @@ public class DeleteExperimentTest extends AbstractDeletionTest
                 @Override
                 public void execute()
                 {
-                    String sessionToken = v3api.login(TEST_POWER_USER_CISD, PASSWORD);
+                    String sessionToken = v3api.login(TEST_ROLE_V3, PASSWORD);
 
                     ExperimentDeletionOptions options = new ExperimentDeletionOptions();
                     options.setReason("It is just a test");

openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteProjectTest.java

@@ -113,7 +113,7 @@ public class DeleteProjectTest extends AbstractDeletionTest
                 @Override
                 public void execute()
                 {
-                    String sessionToken = v3api.login(TEST_POWER_USER_CISD, PASSWORD);
+                    String sessionToken = v3api.login(TEST_ROLE_V3, PASSWORD);
 
                     ProjectDeletionOptions options = new ProjectDeletionOptions();
                     options.setReason("It is just a test");

openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSampleTest.java

@@ -67,7 +67,7 @@ public class DeleteSampleTest extends AbstractDeletionTest
                 @Override
                 public void execute()
                 {
-                    String sessionToken = v3api.login(TEST_POWER_USER_CISD, PASSWORD);
+                    String sessionToken = v3api.login(TEST_ROLE_V3, PASSWORD);
 
                     SampleDeletionOptions options = new SampleDeletionOptions();
                     options.setReason("It is just a test");

openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateDataSetTest.java

@@ -148,7 +148,7 @@ public class UpdateDataSetTest extends AbstractSampleTest
         assertEquals(result.getExperiment().getCode(), "EXP-SPACE-TEST");
     }
 
-    @Test(expectedExceptions = { UserFailureException.class }, expectedExceptionsMessageRegExp = "(?s).*Authorization failure.*")
+    @Test(expectedExceptions = { UserFailureException.class }, expectedExceptionsMessageRegExp = "(?s).*Access denied.*")
     public void testUpdateWithSampleNotAllowed()
     {
         String sessionToken = v3api.login(TEST_POWER_USER_CISD, PASSWORD);

openbis/sourceTest/sql/postgresql/156/044=persons.tsv

@@ -5,3 +5,4 @@
 5	John	Inactive	inactive	inactive@in.active	1	2008-11-05 09:18:10.581+01	\N	\\xaced00057372004163682e73797374656d73782e636973642e6f70656e6269732e67656e657269632e7368617265642e62617369632e64746f2e446973706c617953657474696e677300000000000000010200035a001575736557696c64636172645365617263684d6f64654c000e636f6c756d6e53657474696e677374000f4c6a6176612f7574696c2f4d61703b4c000f73656374696f6e53657474696e677371007e0001787001737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f72646572787200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c7708000000100000000078007371007e00043f4000000000000c7708000000100000000078	f
 6	John	Doe test role	test_role	inactive@in.active	1	2008-11-05 09:18:10.581+01	2	\\xaced00057372004163682e73797374656d73782e636973642e6f70656e6269732e67656e657269632e7368617265642e62617369632e64746f2e446973706c617953657474696e677300000000000000010200035a001575736557696c64636172645365617263684d6f64654c000e636f6c756d6e53657474696e677374000f4c6a6176612f7574696c2f4d61703b4c000f73656374696f6e53657474696e677371007e0001787001737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f72646572787200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c7708000000100000000078007371007e00043f4000000000000c7708000000100000000078	t
 7	John	Doe test space	test_space	inactive@in.active	3	2008-11-05 09:18:10.581+01	\N	\\xaced00057372004163682e73797374656d73782e636973642e6f70656e6269732e67656e657269632e7368617265642e62617369632e64746f2e446973706c617953657474696e677300000000000000010200035a001575736557696c64636172645365617263684d6f64654c000e636f6c756d6e53657474696e677374000f4c6a6176612f7574696c2f4d61703b4c000f73656374696f6e53657474696e677371007e0001787001737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f72646572787200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c7708000000100000000078007371007e00043f4000000000000c7708000000100000000078	t
+8	Jane	Doe test role	test_v3	ganime.akin@in.active	1	2008-11-05 09:18:10.581+01	\N	\\xaced00057372004163682e73797374656d73782e636973642e6f70656e6269732e67656e657269632e7368617265642e62617369632e64746f2e446973706c617953657474696e677300000000000000010200035a001575736557696c64636172645365617263684d6f64654c000e636f6c756d6e53657474696e677374000f4c6a6176612f7574696c2f4d61703b4c000f73656374696f6e53657474696e677371007e0001787001737200176a6176612e7574696c2e4c696e6b6564486173684d617034c04e5c106cc0fb0200015a000b6163636573734f72646572787200116a6176612e7574696c2e486173684d61700507dac1c31660d103000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000c7708000000100000000078007371007e00043f4000000000000c7708000000100000000078	t
\ No newline at end of file

openbis/sourceTest/sql/postgresql/156/051=role_assignments.tsv

@@ -7,4 +7,5 @@
 7	ETL_SERVER	\N	4	2	2008-11-05 09:18:11.471+01	\N
 8	POWER_USER	1	6	2	2008-11-05 09:18:11.471+01	\N
 9	ADMIN	3	7	2	2008-11-05 09:18:11.471+01	\N
-10	OBSERVER	3	6	2	2008-11-05 09:18:11.471+01	\N
+10	OBSERVER	3	8	2	2008-11-05 09:18:11.471+01	\N
+11	POWER_USER	1	8	2	2008-11-05 09:18:11.471+01	\N