From c9486c43cababd55e91975cffc13d7320bbb991a Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Wed, 15 Apr 2015 11:43:31 +0000
Subject: [PATCH] SSDM-1676: more test fixes
SVN: 33838
---
.../systemtest/api/v3/UpdateSampleTest.java | 4 +--
.../server/business/bo/DataBOTest.java | 4 +--
.../DynamicPropertyEvaluatorTest.java | 6 ++---
.../GeneralInformationServiceJsonApiTest.java | 2 +-
.../systemtest/AttachmentUploadTest.java | 27 +++++++++++--------
5 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/UpdateSampleTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/UpdateSampleTest.java
index 5edb3f57039..915bc3cb3c3 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/UpdateSampleTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/UpdateSampleTest.java
@@ -960,7 +960,7 @@ public class UpdateSampleTest extends AbstractSampleTest
{
v3api.updateSamples(sessionToken, Arrays.asList(update));
}
- }, "Circular dependency found: /CISD/3VCP8");
+ }, "Circular dependency found: /CISD/3V-125");
}
@Test
@@ -1110,7 +1110,7 @@ public class UpdateSampleTest extends AbstractSampleTest
{
v3api.updateSamples(sessionToken, Arrays.asList(update));
}
- }, "Circular dependency found: /CISD/3VCP8");
+ }, "Circular dependency found: /CISD/3V-125");
}
@Test
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java
index 023377cdbd0..1f86b993ff9 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java
@@ -617,7 +617,7 @@ public class DataBOTest extends AbstractBOTest
one(propertiesConverter).checkMandatoryProperties(
Collections.<DataSetPropertyPE> emptySet(), dataSet.getDataSetType());
- one(dataDAO).validateAndSaveUpdatedEntity(dataSet);
+ allowing(dataDAO).validateAndSaveUpdatedEntity(dataSet);
}
});
@@ -762,7 +762,7 @@ public class DataBOTest extends AbstractBOTest
expectMandatoryPropertiesCheck(this, ds1.getDataSetType());
- one(dataDAO).validateAndSaveUpdatedEntity(ds1);
+ allowing(dataDAO).validateAndSaveUpdatedEntity(ds1);
}
});
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluatorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluatorTest.java
index aa47e01ae58..d5a1d528c15 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluatorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluatorTest.java
@@ -411,9 +411,9 @@ public class DynamicPropertyEvaluatorTest extends AbstractBOTest
sample = createSample("s1", properties);
evaluator.evaluateProperties(sample, sessionProvider.getSession());
// cyclic dependency should be found
- assertEquals(expectedCyclicDependencyErrorMessage(dp1, dp2, dp3, dp1), dp1.getValue());
- assertEquals(expectedCyclicDependencyErrorMessage(dp1, dp2, dp3, dp1), dp2.getValue());
- assertEquals(expectedCyclicDependencyErrorMessage(dp1, dp2, dp3, dp1), dp3.getValue());
+ assertEquals(expectedCyclicDependencyErrorMessage(dp2, dp3, dp1, dp2), dp1.getValue());
+ assertEquals(expectedCyclicDependencyErrorMessage(dp2, dp3, dp1, dp2), dp2.getValue());
+ assertEquals(expectedCyclicDependencyErrorMessage(dp2, dp3, dp1, dp2), dp3.getValue());
}
//
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 827eaa93264..9dbf1a26393 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
@@ -123,7 +123,7 @@ public class GeneralInformationServiceJsonApiTest extends RemoteApiTestCase
Map<String, Set<Role>> namedRoleSets =
generalInformationService.listNamedRoleSets(sessionToken);
- assertEquals("[ADMIN(instance), ADMIN(space)]", namedRoleSets.get("SPACE_ADMIN").toString());
+ assertEquals("[ADMIN(space), ADMIN(instance)]", namedRoleSets.get("SPACE_ADMIN").toString());
}
@Test
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AttachmentUploadTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AttachmentUploadTest.java
index 2ce7e13af8c..1ee5e6358fa 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AttachmentUploadTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AttachmentUploadTest.java
@@ -17,14 +17,15 @@
package ch.systemsx.cisd.openbis.systemtest;
import static org.testng.AssertJUnit.assertEquals;
-
-import java.util.List;
+import static org.testng.AssertJUnit.fail;
import org.testng.annotations.Test;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.DefaultResultSetConfig;
+import ch.systemsx.cisd.openbis.generic.client.web.client.dto.GridRowModels;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.SessionContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.TypedTableResultSet;
+import ch.systemsx.cisd.openbis.generic.shared.basic.GridRowModel;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Attachment;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AttachmentHolderKind;
@@ -105,15 +106,19 @@ public class AttachmentUploadTest extends SystemTestCase
holderID,
holderKind,
new DefaultResultSetConfig<String, TableModelRowWithObject<AttachmentVersions>>());
- List<Attachment> attachments =
- attachmentVersions.getResultSet().getList().get(0).getOriginalObject()
- .getObjectOrNull().getVersions();
- Attachment attachment = attachments.get(0);
- assertEquals(FILE_NAME, attachment.getFileName());
- assertEquals("my file", attachment.getTitle());
- assertEquals("example file", attachment.getDescription());
- assertEquals(1, attachment.getVersion());
- assertEquals(FILE_CONTENT, new String(attachmentWithContent.getContent()));
+ GridRowModels<TableModelRowWithObject<AttachmentVersions>> list = attachmentVersions.getResultSet().getList();
+ for (GridRowModel<TableModelRowWithObject<AttachmentVersions>> tmrl : list) {
+ Attachment attachment = tmrl.getOriginalObject().getObjectOrNull().getVersions().get(0);
+ if (attachment.getFileName().equals(FILE_NAME)) {
+ assertEquals("my file", attachment.getTitle());
+ assertEquals("example file", attachment.getDescription());
+ assertEquals(1, attachment.getVersion());
+ assertEquals(FILE_CONTENT, new String(attachmentWithContent.getContent()));
+ return;
+ }
+ }
+
+ fail("Attachment with file name "+FILE_NAME+" was not found");
}
}
--
GitLab