Merge pull request #82 from eMoflon/fixed-tgg-tests

Enable sucessful, but ignored TGG tests
eMoflon · Jun 22, 2018 · 538a3e3 · 538a3e3
2 parents 472cfb2 + 596359e
commit 538a3e3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 19 deletions.
diff --git a/testsuites/Testsuite/test/testsuite/ibex/ClassInhHier2DB_MA/sync/AlternatingSync.java b/testsuites/Testsuite/test/testsuite/ibex/ClassInhHier2DB_MA/sync/AlternatingSync.java
@@ -6,43 +6,40 @@
 import Database.DB;
 import testsuite.ibex.ClassInhHier2DB_MA.sync.util.SyncTestCaseCD2DB;
 
+public class AlternatingSync extends SyncTestCaseCD2DB {
 
-public class AlternatingSync extends SyncTestCaseCD2DB{
-
 	@Test
 	public void testCreateTableThenSubClass() {
-		tool.performAndPropagateTargetEdit(util.execute( (DB db) -> helperDB.createTable(db, "C1")));
+		tool.performAndPropagateTargetEdit(util.execute((DB db) -> helperDB.createTable(db, "C1")));
 		tool.performAndPropagateSourceEdit(p -> helperClass.createSubClass(p, "SC1", 0));
 		assertPostcondition("in/04_SubClassToTable_FWD", "expected/04_SubClassToTable_FWD");
 	}
-	
+
 	@Test
 	public void testAddSubAttributeDeleteColumn() {
-		tool.performAndPropagateTargetEdit(util.execute( (DB db) -> helperDB.createTable(db, "C1")));
+		tool.performAndPropagateTargetEdit(util.execute((DB db) -> helperDB.createTable(db, "C1")));
 		tool.performAndPropagateSourceEdit(p -> helperClass.createSubClass(p, "SC1", 0));
-		//add attribute
-		tool.performAndPropagateSourceEdit( p -> helperClass.createAttributeInClass(p, "a2", null, 1));
-		//delete column
+		// add attribute
+		tool.performAndPropagateSourceEdit(p -> helperClass.createAttributeInClass(p, "a2", null, 1));
+		// delete column
 		tool.performAndPropagateTargetEdit(db -> helperDB.deleteColumnFromTable(db, "a2", "SC1"));
 		assertPostcondition("in/04_SubClassToTable_FWD", "expected/04_SubClassToTable_FWD");
 	}
-	
-	@Ignore("TODO:  Robrecht? Problems with deletion!")
+
+	@Ignore("TODO: Problems with deletion - non-deterministic!")
 	@Test
 	public void testCreateSubClassDeleteSubTable() {
 		createInheritance();
 		tool.performAndPropagateTargetEdit(db -> helperDB.deleteTable(db, "SC1"));
 		assertPostcondition("in/02_ClassToTable_FWD", "expected/02_ClassToTable_FWD");
 	}
-	
-	@Ignore("TODO:  Robrecht? Problems with deletion!")
+
+	@Ignore("TODO: Problems with deletion - non-deterministic!")
 	@Test
 	public void testCreateSuperClassDeleteSuperTable() {
 		createInheritance();
 		tool.performAndPropagateTargetEdit(db -> helperDB.deleteTable(db, "SC1"));
 		tool.performAndPropagateTargetEdit(db -> helperDB.deleteTable(db, "C1"));
 		assertPostcondition("in/01_PackageToDatabase_FWD", "expected/01_PackageToDatabase_FWD");
 	}
-
-
 }
diff --git a/testsuites/Testsuite/test/testsuite/ibex/ClassInhHier2DB_MA/sync/SyncForward.java b/testsuites/Testsuite/test/testsuite/ibex/ClassInhHier2DB_MA/sync/SyncForward.java
@@ -6,7 +6,6 @@
 import ClassInheritanceHierarchy.ClassPackage;
 import testsuite.ibex.ClassInhHier2DB_MA.sync.util.SyncTestCaseCD2DB;
 
-
 public class SyncForward extends SyncTestCaseCD2DB{
 
 	@Test
@@ -162,8 +161,7 @@ public void testDeleteSubClass_FWD() {
 		tool.performAndPropagateSourceEdit(p -> helperClass.deleteClass(p, "SC1"));
 		assertPostcondition("in/02_ClassToTable_FWD", "expected/02_ClassToTable_FWD");
 	}
-
-	@Ignore("FIXME Greg:  Why does this fail? We use the same deletion strategy for all other test cases.")
+
 	@Test
 	public void testDeleteIntermediateSuperClass_FWD() {
 		createInheritance();

diff --git a/...es/Testsuite/test/testsuite/ibex/FamiliesToPersons_V0/gen/TestContainmentConstraints.java b/...es/Testsuite/test/testsuite/ibex/FamiliesToPersons_V0/gen/TestContainmentConstraints.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class TestContainmentConstraints extends FamiliesToPersonsModelGenTestCase {
@@ -28,7 +27,6 @@ public void testContainmentConstraintForSameContainmentReference() throws IOExce
 	 * correctly prevents the application of ConnectFather on an already connected mother.
 	 * @throws IOException
 	 */
-	@Ignore("Waiting for fix for issue #11 on emoflon-ibex-democles")
 	@Test
 	public void testContainmentConstraintForDifferentContainmentReference() throws IOException {
 		stop.setMaxRuleCount("HandleRegisters", 1);