Finalized Tests, added to AllTests.java

test-plugins/org.yakindu.sct.model.sexec.test/src/org/yakindu/sct/model/sexec/transformation/test/AllTests.java

@@ -29,7 +29,10 @@ import org.junit.runners.Suite.SuiteClasses;
 		ModelSequencerStateVectorTest.class, 
 		ModelSequencerHistoryTest.class,
 		SelfTransitionTest.class,
+		ShortStringTest.class,
 		StatechartEnterExistActionTest.class,
+		StringTreeNodeTest.class,
+		TreeNamingServiceTest.class,
 		DefaultNamingServiceTest.class,
 		NullCallTest.class
 		})

test-plugins/org.yakindu.sct.model.sexec.test/src/org/yakindu/sct/model/sexec/transformation/test/ShortStringTest.java

@@ -53,17 +53,17 @@ public class ShortStringTest {
 	{
 		shortstr = new ShortString("AAab_7");
 		
-		assertEquals(ShortString.cost_firstLetter + ShortString.cost_Uppercase, shortstr.getBaseCutCost(0));
+		assertEquals(ShortString.COST_FIRSTLETTER + ShortString.COST_UPPERCASE, shortstr.getBaseCutCost(0));
 		
-		assertEquals(ShortString.cost_Uppercase, shortstr.getBaseCutCost(1));
+		assertEquals(ShortString.COST_UPPERCASE, shortstr.getBaseCutCost(1));
 		
-		assertEquals(ShortString.cost_lowercase_vocals, shortstr.getBaseCutCost(2));
+		assertEquals(ShortString.COST_LOWERCASE_VOCALS, shortstr.getBaseCutCost(2));
 		
-		assertEquals(ShortString.cost_lowercase_consonants, shortstr.getBaseCutCost(3));
+		assertEquals(ShortString.COST_LOWERCASE_CONSONANTS, shortstr.getBaseCutCost(3));
 		
-		assertEquals(ShortString.cost_underscore, shortstr.getBaseCutCost(4));
+		assertEquals(ShortString.COST_UNDERSCORE, shortstr.getBaseCutCost(4));
 		
-		assertEquals(ShortString.cost_digit, shortstr.getBaseCutCost(5));
+		assertEquals(ShortString.COST_DIGIT, shortstr.getBaseCutCost(5));
 	}
 	
 	@Test
@@ -117,7 +117,7 @@ public class ShortStringTest {
 		shortstr.removeIndex(18); // o
 		shortstr.removeIndex(19); // o
 		
-		int expectedCost = 8 * ShortString.cost_lowercase_vocals * shortstr.getCutCostFactor();
+		int expectedCost = 8 * ShortString.COST_LOWERCASE_VOCALS * shortstr.getCutCostFactor();
 		
 		assertEquals(expectedCost, shortstr.getCutCost());
 	}
@@ -130,8 +130,8 @@ public class ShortStringTest {
 		shortstr.removeIndex(0);
 		
 		int expectedCost = (
-				1 * ShortString.cost_firstLetter +
-				1 * ShortString.cost_lowercase_vocals
+				1 * ShortString.COST_FIRSTLETTER +
+				1 * ShortString.COST_LOWERCASE_VOCALS
 				) * shortstr.getCutCostFactor();
 		
 		assertEquals(expectedCost, shortstr.getCutCost());
@@ -145,8 +145,8 @@ public class ShortStringTest {
 		shortstr.removeIndex(0);
 		
 		int expectedCost = (
-				1 * ShortString.cost_firstLetter + 
-				1 * ShortString.cost_Uppercase
+				1 * ShortString.COST_FIRSTLETTER + 
+				1 * ShortString.COST_UPPERCASE
 				) * shortstr.getCutCostFactor();
 		
 		assertEquals(expectedCost, shortstr.getCutCost());

test-plugins/org.yakindu.sct.model.sexec.test/src/org/yakindu/sct/model/sexec/transformation/test/TreeNamingServiceTest.java

@@ -213,14 +213,14 @@ public class TreeNamingServiceTest extends ModelSequencerTest {
 		List<String> names = new ArrayList<String>();
 		
 		List<String> expectedNames = new ArrayList<String>(Arrays.asList(
-						"StateA",
-						"StateB",
+						"main_region_StateA",
+						"main_region_StateB",
 						"second_region_StateA",
 						"third_region_StateA",
-						"AnotherRegion_StateA",
-						"AnotherRegion_StateB",
-						"StateA_AnotherRegion_StateA",
-						"StateA_AnotherRegion_StateB"
+						"second_region_StateA_AnotherRegion_StateA",
+						"second_region_StateA_AnotherRegion_StateB",
+						"third_region_StateA_AnotherRegion_StateA",
+						"third_region_StateA_AnotherRegion_StateB"
 						));
 		
 		ExecutionFlow flow = optimizer.transform(sequencer.transform(toTest));
@@ -253,14 +253,14 @@ public class TreeNamingServiceTest extends ModelSequencerTest {
 		
 		// these names are shorter than 15 characters because there are more elements containing these names, e.g. state actions
 		List<String> expectedNames = new ArrayList<String>(Arrays.asList(
-					"StateA",
-					"StateB",
-					"srgn_StateA",
-					"trgn_SA",
-					"ARgn_SttA", 
-					"ARgn_SttB",
-					"SA_ARn_SA", 
-					"SA_ARn_StB" 
+					"mgn_SA",
+					"mgn_StteB",
+					"s_S",
+					"t_S",
+					"t_S_AR_SA", 
+					"t_S_AR_StB",
+					"s_S_AR_SA", 
+					"s_S_AR_StB"
 						));
 		
 		ExecutionFlow flow = optimizer.transform(sequencer.transform(toTest));