From ff75732fc0223042a83d06814eb093e5d1fde389 Mon Sep 17 00:00:00 2001 From: Mark-de-Haan Date: Thu, 4 Feb 2016 12:18:29 +0100 Subject: [PATCH] Fix test --- .../org/molgenis/data/mysql/MysqlRepositoryTest.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/molgenis-data-mysql/src/test/java/org/molgenis/data/mysql/MysqlRepositoryTest.java b/molgenis-data-mysql/src/test/java/org/molgenis/data/mysql/MysqlRepositoryTest.java index 5f154683bb6..b4f2b182c63 100644 --- a/molgenis-data-mysql/src/test/java/org/molgenis/data/mysql/MysqlRepositoryTest.java +++ b/molgenis-data-mysql/src/test/java/org/molgenis/data/mysql/MysqlRepositoryTest.java @@ -122,17 +122,15 @@ public void addStreamUpdateStreamFindAll() @Test(expectedExceptions = MolgenisDataException.class) public void testIfDeleteFailsForSelfReferencingEntity() { - DefaultEntityMetaData metaData = new DefaultEntityMetaData("XrefTable"); + DefaultEntityMetaData metaData = new DefaultEntityMetaData("SelfRefTable"); metaData.addAttribute("id", ROLE_ID).setDataType(MolgenisFieldTypes.STRING).setNillable(false); metaData.addAttribute("xrefAttr").setDataType(MolgenisFieldTypes.XREF).setRefEntity(metaData) .setNillable(false); Repository repo = metaDataRepositories.addEntityMeta(metaData); - List xrefTableEntities = new ArrayList<>(); Entity xrefTableEntity = new MapEntity("xrefAttr"); xrefTableEntity.set("id", "value_1"); xrefTableEntity.set("xrefAttr", "value_1"); - xrefTableEntities.addAll(newArrayList(xrefTableEntity)); repo.deleteAll(); // Test delete } @@ -141,8 +139,7 @@ public void testIfDeleteFailsForSelfReferencingEntity() public void testDeleteAllForXrefs() { DefaultEntityMetaData refMetaData = new DefaultEntityMetaData("RefEntityTable"); - refMetaData.addAttribute("refAttr", ROLE_ID).setDataType(MolgenisFieldTypes.STRING) - .setNillable(false); + refMetaData.addAttribute("refAttr", ROLE_ID).setDataType(MolgenisFieldTypes.STRING).setNillable(false); DefaultEntityMetaData metaData = new DefaultEntityMetaData("XrefTable"); metaData.addAttribute("id", ROLE_ID).setDataType(MolgenisFieldTypes.INT).setNillable(false); @@ -152,16 +149,12 @@ public void testDeleteAllForXrefs() Repository refRepo = metaDataRepositories.addEntityMeta(refMetaData); Repository repo = metaDataRepositories.addEntityMeta(metaData); - List refEntityTableEntities = new ArrayList<>(); Entity refEntityTableEntity = new MapEntity("refAttr"); refEntityTableEntity.set("refAttr", "xref_value_1"); - refEntityTableEntities.addAll(newArrayList(refEntityTableEntity)); - List xrefTableEntities = new ArrayList<>(); Entity xrefTableEntity = new MapEntity("xrefAttr"); xrefTableEntity.set("id", 1); xrefTableEntity.set("xrefAttr", "xref_value_1"); - xrefTableEntities.addAll(newArrayList(xrefTableEntity)); // Test delete repo.deleteAll();