Integrate missing changes

Valekta · Valekta · commit 429ece7e4c81 · 2018-07-13T12:41:15.000+02:00
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/PrawnTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/PrawnTest.xtend
@@ -7,12 +7,14 @@ import java.io.File
 import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
 import org.apache.commons.io.FileUtils
+import org.svis.generator.SettingsConfiguration
 
 class PrawnTest {
 	
 			//TODO reimplement tests for new dynamix metamodel
 	@BeforeClass
 	def static void launch() {
+		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/prawn/input/PrawnTest.properties")
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/rd/Dynamix2RD.mwe2", "-p", "famixPath=testdata/prawn/input/famixDyn",
 			"dynamixPath=testdata/prawn/input/dynamix","outputPath=output/rd/dynamix/prawn/original"])
 	}
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Prawn_X3DomFlashingMethodsTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Prawn_X3DomFlashingMethodsTest.xtend
@@ -7,7 +7,6 @@ import java.io.File
 import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
 import org.apache.commons.io.FileUtils
-//import org.svis.generator.rd.RDSettings.OutputFormat
 import org.svis.generator.rd.RDSettings
 import org.svis.generator.rd.RDSettings.InvocationRepresentation
 import org.svis.generator.rd.RDSettings.Variant
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Prawn_X3DomMovingFlashingTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Prawn_X3DomMovingFlashingTest.xtend
@@ -7,7 +7,6 @@ import java.io.File
 import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
 import org.apache.commons.io.FileUtils
-//import org.svis.generator.rd.RDSettings.OutputFormat
 import org.svis.generator.rd.RDSettings
 import org.svis.generator.rd.RDSettings.InvocationRepresentation
 import org.svis.generator.rd.RDSettings.Variant
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/AndroidPhoneTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/AndroidPhoneTest.xtend
@@ -16,6 +16,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath
 import static org.hamcrest.Matchers.*
 import static org.junit.Assert.assertThat
 import org.svis.generator.tests.helper.JSONUtil
+import org.svis.generator.SettingsConfiguration
 
 class AndroidPhoneTest {
 	
@@ -29,6 +30,7 @@ class AndroidPhoneTest {
 	def static void launch() {
 		XMLUnit::ignoreWhitespace = true
     	XMLUnit::ignoreComments = true
+    	SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/android_phone/input/RDAndroidPhoneTest.properties")
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/rd/Famix2RD.mwe2", "-p", "inputPath=testdata/android_phone/input/famix", "outputPath=" + path])
 		json = JSONUtil::read("./testdata/android_phone/output/rd/famix/original/metaData.json")
 	}
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/AndroidPhone_CompressedTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/AndroidPhone_CompressedTest.xtend
@@ -16,13 +16,11 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath
 import static org.hamcrest.Matchers.*
 import static org.junit.Assert.assertThat
 import org.svis.generator.tests.helper.JSONUtil
-import org.svis.generator.rd.RDSettings
-//import org.svis.generator.rd.RDSettings.OutputFormat
 import org.svis.generator.SettingsConfiguration
 
 class AndroidPhone_CompressedTest {
 	
-		val static path = "./output/rd/famix/android_phone/compressed/"
+	val static path = "./output/rd/famix/android_phone/compressed/"
 	val static engine = XMLUnit.newXpathEngine
 	var static String json
 	val rd = XMLUnit::buildControlDocument(Files::toString(new File(path + "rd.xml"), Charset.forName("UTF-8")))
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/Bank_AttributeDiskTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/Bank_AttributeDiskTest.xtend
@@ -16,8 +16,6 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath
 import static org.hamcrest.Matchers.*
 import static org.junit.Assert.assertThat
 import org.svis.generator.tests.helper.JSONUtil
-import org.svis.generator.rd.RDSettings
-import org.junit.AfterClass
 import org.svis.generator.SettingsConfiguration
 
 class Bank_AttributeDiskTest {
@@ -234,9 +232,4 @@ class Bank_AttributeDiskTest {
     	
     	assertEquals(FileUtils.checksumCRC32(file1), FileUtils.checksumCRC32(file2))
     }
-    
-    @AfterClass
-    def static void end() {
-//    	RDSettings::DATA_DISKS = false
-    }
 }
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/Bank_JdtParserTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/Bank_JdtParserTest.xtend
@@ -240,9 +240,4 @@ class Bank_JdtParserTest {
     	
     	assertEquals(FileUtils.checksumCRC32(file1), FileUtils.checksumCRC32(file2))
     }
-    
-    @AfterClass
-    def static void end() {
-//    	FAMIXSettings::FAMIX_PARSER = FAMIXSettings::FamixParser.VERVEINEJ
-    }
 }
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/Bank_MethodTypeTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/Bank_MethodTypeTest.xtend
@@ -237,10 +237,4 @@ class Bank_MethodTypeTest {
     	
 		assertEquals(FileUtils.checksumCRC32(file1), FileUtils.checksumCRC32(file2))
 	}
-    
-    @AfterClass
-    def static void end(){
-//    	RDSettings::METHOD_TYPE_MODE = false
-//    	FAMIXSettings::HIDE_PRIVATE_ELEMENTS = false
-    }
 }
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/Bank_OriginalTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/Bank_OriginalTest.xtend
@@ -16,6 +16,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath
 import static org.hamcrest.Matchers.*
 import static org.junit.Assert.assertThat
 import org.svis.generator.tests.helper.JSONUtil
+import org.svis.generator.SettingsConfiguration
 
 class Bank_OriginalTest {
 	
@@ -30,6 +31,7 @@ class Bank_OriginalTest {
 	def static void launch() {
 		XMLUnit::ignoreWhitespace = true
 		XMLUnit::ignoreComments = true
+		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/bank/input/BankOriginalTest.properties")
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/rd/Famix2RD.mwe2", "-p", "inputPath=testdata/bank/input/famix", "outputPath=" + path])
 		json = JSONUtil::read("./testdata/bank/output/rd/famix/original/metaData.json")
 	}
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/MasterRootTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/MasterRootTest.xtend
@@ -1,6 +1,5 @@
 package org.svis.generator.tests.rd.famix
 
-import org.svis.generator.famix.FAMIXSettings
 import static org.junit.Assert.*
 import org.junit.Test
 import org.junit.BeforeClass
@@ -16,7 +15,6 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath
 import static org.hamcrest.Matchers.*
 import static org.junit.Assert.assertThat
 import org.svis.generator.tests.helper.JSONUtil
-import org.junit.AfterClass
 import org.svis.generator.SettingsConfiguration
 
 class MasterRootTest {
@@ -28,8 +26,6 @@ class MasterRootTest {
 	
 	@BeforeClass
 	def static void launch() {
-		//FAMIXSettings::MASTER_ROOT = true
-		//FAMIXSettings::MERGE_PACKAGES = true
 		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/nested_package_test/input/MasterRootTest.properties")
 		XMLUnit::ignoreWhitespace = true
 		XMLUnit::ignoreComments = true
@@ -131,10 +127,4 @@ class MasterRootTest {
     	
 		assertEquals(FileUtils.checksumCRC32(file1), FileUtils.checksumCRC32(file2))
 	}
-    
-    @AfterClass
-    def static void end() {
-//    	FAMIXSettings::MASTER_ROOT = false
-//    	FAMIXSettings::MERGE_PACKAGES = false
-    }
 }
diff --git a/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/Prawn_OriginalTest.xtend b/generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/famix/Prawn_OriginalTest.xtend
@@ -9,6 +9,7 @@ import java.io.FileNotFoundException
 import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
 import org.apache.commons.io.FileUtils
 import org.svis.generator.tests.helper.JSONUtil
+import org.svis.generator.SettingsConfiguration
 
 class Prawn_OriginalTest {
 	
@@ -20,6 +21,7 @@ class Prawn_OriginalTest {
 	def static void launch() {
 		XMLUnit::ignoreWhitespace = true
 		XMLUnit::ignoreComments = true
+		SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/prawn/input/PrawnOriginalTest.properties")
 		new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/rd/Famix2RD.mwe2", "-p", "inputPath=testdata/prawn/input/famix", "outputPath=" + path])
 		json = JSONUtil::read("./testdata/prawn/output/rd/famix/original/metaData.json")
 	}
diff --git a/generator/org.svis.generator.tests/testdata/android_phone/input/RDAndroidPhoneTest.properties b/generator/org.svis.generator.tests/testdata/android_phone/input/RDAndroidPhoneTest.properties
diff --git a/generator/org.svis.generator.tests/testdata/bank/input/BankOriginalTest.properties b/generator/org.svis.generator.tests/testdata/bank/input/BankOriginalTest.properties
diff --git a/generator/org.svis.generator.tests/testdata/prawn/input/PrawnOriginalTest.properties b/generator/org.svis.generator.tests/testdata/prawn/input/PrawnOriginalTest.properties
diff --git a/generator/org.svis.generator.tests/testdata/prawn/input/PrawnTest.properties b/generator/org.svis.generator.tests/testdata/prawn/input/PrawnTest.properties
diff --git a/generator/org.svis.generator/src/org/svis/generator/rd/m2t/RD2X3DCompressed.xtend b/generator/org.svis.generator/src/org/svis/generator/rd/m2t/RD2X3DCompressed.xtend
@@ -204,7 +204,6 @@ class RD2X3DCompressed {
 		«FOR segs : segments.values»
 			«FOR segment :segs»
 				«IF(segment.color != config.RDDataColorAsPercentage)»
-				«log.info("Method: " + segment.color + " : " + config.RDDataColorAsPercentage)»
 					<Transform  translation='«(segment.
 			eContainer as Disk).position.x + " " + (segment.eContainer as Disk).position.y + " " +
 			(segment.eContainer as Disk).position.z»' rotation='0 0 1 1.57'>
diff --git a/generator/org.svis.generator/src/org/svis/generator/rd/s2m/Famix2RD.xtend b/generator/org.svis.generator/src/org/svis/generator/rd/s2m/Famix2RD.xtend
@@ -167,7 +167,6 @@ class Famix2RD extends WorkflowComponentWithModelSlot {
 			diskSegment.color = config.RDMethodColorHex
 		} else {
 			diskSegment.color = config.RDMethodColorAsPercentage
-			println("Nicht AFrame: " + config.RDMethodColorAsPercentage)
 		}
 		diskSegment.transparency = config.RDMethodTransparency
 		

Original file line number	Diff line number	Diff line change
`@@ -240,9 +240,4 @@ class Bank_JdtParserTest {`
`240`	`240`
`241`	`241`	`assertEquals(FileUtils.checksumCRC32(file1), FileUtils.checksumCRC32(file2))`
`242`	`242`	`}`
`243`		`-`
`244`		`- @AfterClass`
`245`		`- def static void end() {`
`246`		`-// FAMIXSettings::FAMIX_PARSER = FAMIXSettings::FamixParser.VERVEINEJ`
`247`		`- }`
`248`	`243`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,10 +237,4 @@ class Bank_MethodTypeTest {`
`237`	`237`
`238`	`238`	`assertEquals(FileUtils.checksumCRC32(file1), FileUtils.checksumCRC32(file2))`
`239`	`239`	`}`
`240`		`-`
`241`		`- @AfterClass`
`242`		`- def static void end(){`
`243`		`-// RDSettings::METHOD_TYPE_MODE = false`
`244`		`-// FAMIXSettings::HIDE_PRIVATE_ELEMENTS = false`
`245`		`- }`
`246`	`240`	`}`