SSDM-1858: Adapt to the style of EntityDeletionTest where error messages are...

SSDM-1858: Adapt to the style of EntityDeletionTest where error messages are created by methods which can be overwritten in order to handle the "Context" part of the message in case of V3 API.

SVN: 34067

openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/AssignDataSetToExperimentAndSampleTest.java

@@ -26,6 +26,8 @@ import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.dataset.DataSetUpdat
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.dataset.DataSetPermId;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.experiment.ExperimentIdentifier;
 import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.sample.SamplePermId;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
 import ch.systemsx.cisd.openbis.systemtest.AbstractDataSetAssignmentTestCase;
 
 /**
@@ -36,6 +38,8 @@ import ch.systemsx.cisd.openbis.systemtest.AbstractDataSetAssignmentTestCase;
 @Test(groups = { "system-cleandb" })
 public class AssignDataSetToExperimentAndSampleTest extends AbstractDataSetAssignmentTestCase
 {
+    private static final String CONTEXT_DESCRIPTION = " (Context: [])";
+    
     @Autowired
     protected IApplicationServerApi v3api;
 
@@ -63,4 +67,11 @@ public class AssignDataSetToExperimentAndSampleTest extends AbstractDataSetAssig
         }
         v3api.updateDataSets(userSessionToken, Arrays.asList(dataSetUpdate));
     }
+
+    @Override
+    protected String createErrorMessage(AbstractExternalData dataset, Sample sample, String postfix)
+    {
+        return super.createErrorMessage(dataset, sample, postfix) + CONTEXT_DESCRIPTION;
+    }
+    
 }

openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AbstractDataSetAssignmentTestCase.java

@@ -27,7 +27,6 @@ import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.common.exceptions.AuthorizationFailureException;
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
-import ch.systemsx.cisd.common.test.AssertionUtil;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.entitygraph.DataSetNode;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.entitygraph.EntityGraphGenerator;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.entitygraph.ExperimentNode;
@@ -812,9 +811,13 @@ public abstract class AbstractDataSetAssignmentTestCase extends BaseTest
                 "not connected to any experiment and the data set type ("
                         + dataset.getDataSetType().getCode()
                         + ") doesn't match one of the following regular expressions:   NO-EXP-.* ,   NE.*  .";
-        AssertionUtil.assertStarts("The dataset '" + dataset.getCode()
-                + "' cannot be connected to the sample '" + sample.getIdentifier()
-                + "' because the new sample is " + postfix, ex.getMessage());
+        assertEquals(createErrorMessage(dataset, sample, postfix), ex.getMessage());
+    }
+
+    protected String createErrorMessage(AbstractExternalData dataset, Sample sample, String postfix)
+    {
+        return "The dataset '" + dataset.getCode() + "' cannot be connected to the sample '" 
+                + sample.getIdentifier() + "' because the new sample is " + postfix;
     }
 
     private void checkAssignmentToExperiment(RoleWithHierarchy sourceSpaceRole,