Use both aspect's name and target class to test copied aspects

diverse-project · Sep 21, 2015 · 846a026 · 846a026
1 parent 777f6a3
commit 846a026
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/...nge.tests.eclipse/src/main/java/fr/inria/diverse/melange/tests/eclipse/RenamingTest.xtend b/...nge.tests.eclipse/src/main/java/fr/inria/diverse/melange/tests/eclipse/RenamingTest.xtend
@@ -41,7 +41,21 @@ public class RenamingTest extends AbstractXtextTests
 		helper.assertProjectExists(PROJECT_1)
 		helper.assertProjectExists(PROJECT_2)
 
-		helper.assertK3AspectsExists(#["ClassA2Aspect","ClassB2Aspect","SuperB2Aspect"],PROJECT_1)
-		helper.assertK3AspectsExists(#["ClassAAspect","ClassBAspect","SuperBAspect"],PROJECT_2)
+		helper.assertK3AspectsExists(
+			#[
+				"ClassAAspect" -> "ClassA2",
+				"ClassBAspect" -> "ClassB2",
+				"SuperBAspect" -> "SuperB2"
+			],
+			PROJECT_1)
+
+		helper.assertK3AspectsExists(
+			#[
+				"ClassAAspect" -> "ClassA",
+				"ClassBAspect" -> "ClassB",
+				"SuperBAspect" -> "SuperB"
+			],
+			PROJECT_2
+		)
 	}
 }
diff --git a/...pse/src/main/java/fr/inria/diverse/melange/tests/eclipse/shared/WorkspaceTestHelper.xtend b/...pse/src/main/java/fr/inria/diverse/melange/tests/eclipse/shared/WorkspaceTestHelper.xtend
@@ -202,17 +202,21 @@ class WorkspaceTestHelper {
 
 	/**
 	 * Check for each aspect from {@link aspects} that K3-generated files are inside {@link project}
+	 * 
+	 * @param aspects Pairs of [AspectName->AspectedClass]
 	 */
-	def void assertK3AspectsExists(List<String> aspects, String project){
+	def void assertK3AspectsExists(List<Pair<String,String>> aspects, String project){
 
 		val ASPECTS_NS = project+".aspects"
 		val ASPECTS_FOLDER = ASPECTS_NS.replaceAll("\\.","/")
-		val SRC_GEN = "/src-gen/"
+		val SRC_GEN = "src-gen"
 
 		aspects.forEach[asp |
-			val aspect     = '''«project»/«SRC_GEN»/«ASPECTS_FOLDER»/«asp».java'''
-			val context    = '''«project»/«SRC_GEN»/«ASPECTS_FOLDER»/«asp»«asp»Context.java'''
-			val properties = '''«project»/«SRC_GEN»/«ASPECTS_FOLDER»/«asp»«asp»Properties.java'''
+			val aspectName = asp.key
+			val targetClass = asp.value
+			val aspect     = '''«project»/«SRC_GEN»/«ASPECTS_FOLDER»/«aspectName».java'''
+			val context    = '''«project»/«SRC_GEN»/«ASPECTS_FOLDER»/«aspectName»«targetClass»Context.java'''
+			val properties = '''«project»/«SRC_GEN»/«ASPECTS_FOLDER»/«aspectName»«targetClass»Properties.java'''
 			assertFileExists(aspect)
 			assertFileExists(context)
 			assertFileExists(properties)