From 5aaf54d004623455f0cd382bdaba7f90ea58f670 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Mon, 16 Jan 2017 18:45:40 +0000
Subject: [PATCH] SSDM-4613 : V3 AS API - createSampleTypes method - fix a test
SVN: 37592
---
.../server/dataaccess/db/ScriptDAOTest.java | 22 ++++++++++++-------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ScriptDAOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ScriptDAOTest.java
index 466c51457d2..36afe2e2792 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ScriptDAOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ScriptDAOTest.java
@@ -20,6 +20,7 @@ import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNotNull;
import static org.testng.AssertJUnit.assertNull;
+import java.util.ArrayList;
import java.util.List;
import org.testng.AssertJUnit;
@@ -37,8 +38,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.SpacePE;
*
* @author Izabela Adamczyk
*/
-@Test(groups =
-{ "db", "script" })
+@Test(groups = { "db", "script" })
@Friend(toClasses = SpacePE.class)
public final class ScriptDAOTest extends AbstractDAOTest
{
@@ -46,8 +46,7 @@ public final class ScriptDAOTest extends AbstractDAOTest
@DataProvider
private final static Object[][] scriptTypes()
{
- return new Object[][]
- {
+ return new Object[][] {
{ ScriptType.DYNAMIC_PROPERTY },
{ ScriptType.MANAGED_PROPERTY }
@@ -154,12 +153,19 @@ public final class ScriptDAOTest extends AbstractDAOTest
int scriptNumber = 1;
createScriptInDB(scriptType, createScriptName(scriptNumber),
createScriptText(scriptNumber), createScriptDescription(scriptNumber), entityKind);
- final List<ScriptPE> scripts = daoFactory.getScriptDAO().listAllEntities();
- assertEquals(1 + initialNumberOfScripts, scripts.size());
- for (ScriptPE s : scripts)
+
+ final List<ScriptPE> allScripts = daoFactory.getScriptDAO().listAllEntities();
+ final List<ScriptPE> sampleCompatibleScripts = new ArrayList<ScriptPE>();
+
+ for (ScriptPE s : allScripts)
{
- AssertJUnit.assertTrue(s.getEntityKind() == null || s.getEntityKind() == entityKind);
+ if (s.getEntityKind() == null || s.getEntityKind() == entityKind)
+ {
+ sampleCompatibleScripts.add(s);
+ }
}
+
+ assertEquals(1 + initialNumberOfScripts, sampleCompatibleScripts.size());
}
@Test(dataProvider = "scriptTypes")
--
GitLab