Skip to content

Commit 92528fb

Browse files
author
David Baum
committed
remove FAMIXSettings and RDSettings
1 parent 2cc0c1e commit 92528fb

44 files changed

Lines changed: 47 additions & 315 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/BankTest.xtend‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
99
import org.apache.commons.io.FileUtils
1010

1111
class BankTest {
12-
//TODO reimplement tests for new dynamix metamodel
1312
@BeforeClass
1413
def static launch() {
1514
new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/rd/Dynamix2RD.mwe2", "-p", "famixPath=testdata/bank/input/famixDyn",

‎generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Bank_X3DomFlashingMethodsTest.xtend‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,15 @@ import java.io.File
77
import java.io.FileNotFoundException
88
import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
99
import org.apache.commons.io.FileUtils
10-
//import org.svis.generator.rd.RDSettings.OutputFormat
11-
import org.svis.generator.rd.RDSettings
12-
import org.svis.generator.rd.RDSettings.InvocationRepresentation
13-
import org.svis.generator.rd.RDSettings.Variant
1410
import org.svis.generator.SettingsConfiguration
1511

1612
class Bank_X3DomFlashingMethodsTest {
1713

18-
//TODO reimplement tests for new dynamix metamodel
1914
@BeforeClass
2015
def static void launch() {
21-
/*
22-
RDSettings::OUTPUT_FORMAT = OutputFormat::X3DOM
23-
RDSettings::INVOCATION_REPRESENTATION = InvocationRepresentation.FLASHING_METHODS
24-
RDSettings::VARIANT = Variant::DYNAMIC
25-
*/
2616
SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/bank/input/BankFlashingMethodsTest.properties")
2717
new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/rd/Dynamix2RD.mwe2", "-p", "famixPath=testdata/bank/input/famixDyn",
2818
"dynamixPath=testdata/bank/input/dynamix","outputPath=output/rd/dynamix/bank/bank_x3dom_flashing_methods"])
29-
/*
30-
RDSettings::VARIANT = Variant::STATIC
31-
RDSettings::OUTPUT_FORMAT = OutputFormat::X3D
32-
RDSettings::INVOCATION_REPRESENTATION = InvocationRepresentation.NONE
33-
*/
3419
}
3520

3621
@Test

‎generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Bank_X3DomMovingFlashingTest.xtend‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,15 @@ import java.io.File
77
import java.io.FileNotFoundException
88
import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
99
import org.apache.commons.io.FileUtils
10-
//import org.svis.generator.rd.RDSettings.OutputFormat
11-
import org.svis.generator.rd.RDSettings
12-
import org.svis.generator.rd.RDSettings.InvocationRepresentation
13-
import org.svis.generator.rd.RDSettings.Variant
1410
import org.svis.generator.SettingsConfiguration
1511

1612
class Bank_X3DomMovingFlashingTest {
1713

18-
//TODO reimplement tests for new dynamix metamodel
1914
@BeforeClass
2015
def static void launch() {
21-
/*
22-
RDSettings::OUTPUT_FORMAT = OutputFormat::X3DOM
23-
RDSettings::INVOCATION_REPRESENTATION = InvocationRepresentation.MOVING_FLASHING
24-
RDSettings::VARIANT = Variant::DYNAMIC
25-
*/
2616
SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/bank/input/BankMovingFlashingTest.properties")
2717
new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/rd/Dynamix2RD.mwe2", "-p", "famixPath=testdata/bank/input/famixDyn",
2818
"dynamixPath=testdata/bank/input/dynamix","outputPath=output/rd/dynamix/bank/bank_x3dom_moving_flashing"])
29-
/*
30-
RDSettings::VARIANT = Variant::STATIC
31-
RDSettings::OUTPUT_FORMAT = OutputFormat::X3D
32-
RDSettings::INVOCATION_REPRESENTATION = InvocationRepresentation.NONE
33-
*/
3419
}
3520

3621
@Test

‎generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Bank_X3DomMovingSpheresTest.xtend‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,15 @@ import java.io.File
77
import java.io.FileNotFoundException
88
import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
99
import org.apache.commons.io.FileUtils
10-
//import org.svis.generator.rd.RDSettings.OutputFormat
11-
import org.svis.generator.rd.RDSettings
12-
import org.svis.generator.rd.RDSettings.InvocationRepresentation
13-
import org.svis.generator.rd.RDSettings.Variant
1410
import org.svis.generator.SettingsConfiguration
1511

1612
class Bank_X3DomMovingSpheresTest {
1713

18-
//TODO reimplement tests for new dynamix metamodel
1914
@BeforeClass
2015
def static void launch() {
21-
/*
22-
RDSettings::OUTPUT_FORMAT = OutputFormat::X3DOM
23-
RDSettings::INVOCATION_REPRESENTATION = InvocationRepresentation.MOVING_SPHERES
24-
RDSettings::VARIANT = Variant::DYNAMIC
25-
*/
2616
SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/bank/input/BankMovingSpheresTest.properties")
2717
new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/rd/Dynamix2RD.mwe2", "-p", "famixPath=testdata/bank/input/famixDyn",
2818
"dynamixPath=testdata/bank/input/dynamix","outputPath=output/rd/dynamix/bank/bank_x3dom_moving_spheres"])
29-
/*
30-
RDSettings::OUTPUT_FORMAT = OutputFormat::X3D
31-
RDSettings::VARIANT = Variant::STATIC
32-
RDSettings::INVOCATION_REPRESENTATION = InvocationRepresentation.NONE
33-
*/
3419
}
3520

3621
@Test

‎generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Bank_X3DomNoneTest.xtend‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,15 @@ import java.io.File
77
import java.io.FileNotFoundException
88
import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
99
import org.apache.commons.io.FileUtils
10-
//import org.svis.generator.rd.RDSettings.OutputFormat
11-
import org.svis.generator.rd.RDSettings
1210
import org.svis.generator.SettingsConfiguration
1311

1412
class Bank_X3DomNoneTest {
1513

16-
//TODO reimplement tests for new dynamix metamodel
1714
@BeforeClass
1815
def static void launch() {
19-
//RDSettings::OUTPUT_FORMAT = OutputFormat::X3DOM
2016
SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/bank/input/BankX3DOMNoneTest.properties")
2117
new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/rd/Dynamix2RD.mwe2", "-p", "famixPath=testdata/bank/input/famixDyn",
2218
"dynamixPath=testdata/bank/input/dynamix","outputPath=output/rd/dynamix/bank/bank_x3dom_none"])
23-
//RDSettings::OUTPUT_FORMAT = OutputFormat::X3D
2419
}
2520

2621
@Test

‎generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/PrawnTest.xtend‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import org.svis.generator.SettingsConfiguration
1111

1212
class PrawnTest {
1313

14-
//TODO reimplement tests for new dynamix metamodel
1514
@BeforeClass
1615
def static void launch() {
1716
SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/prawn/input/PrawnTest.properties")

‎generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Prawn_X3DomFlashingMethodsTest.xtend‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,15 @@ import java.io.File
77
import java.io.FileNotFoundException
88
import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
99
import org.apache.commons.io.FileUtils
10-
import org.svis.generator.rd.RDSettings
11-
import org.svis.generator.rd.RDSettings.InvocationRepresentation
12-
import org.svis.generator.rd.RDSettings.Variant
1310
import org.svis.generator.SettingsConfiguration
1411

1512
class Prawn_X3DomFlashingMethodsTest {
1613

17-
//TODO reimplement tests for new dynamix metamodel
1814
@BeforeClass
1915
def static void launch() {
20-
/*
21-
RDSettings::OUTPUT_FORMAT = OutputFormat::X3DOM
22-
RDSettings::INVOCATION_REPRESENTATION = InvocationRepresentation::FLASHING_METHODS
23-
RDSettings::VARIANT = Variant::DYNAMIC
24-
*/
2516
SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/prawn/input/PrawnFlashingMethodsTest.properties")
2617
new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/rd/Dynamix2RD.mwe2", "-p", "famixPath=testdata/prawn/input/famixDyn",
2718
"dynamixPath=testdata/prawn/input/dynamix","outputPath=output/rd/dynamix/prawn/prawn_x3dom_flashing_methods"])
28-
/*
29-
RDSettings::OUTPUT_FORMAT = OutputFormat::X3D
30-
RDSettings::VARIANT = Variant::STATIC
31-
RDSettings::INVOCATION_REPRESENTATION = InvocationRepresentation::NONE
32-
*/
3319
}
3420

3521
@Test

‎generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Prawn_X3DomMovingFlashingTest.xtend‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,15 @@ import java.io.File
77
import java.io.FileNotFoundException
88
import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
99
import org.apache.commons.io.FileUtils
10-
import org.svis.generator.rd.RDSettings
11-
import org.svis.generator.rd.RDSettings.InvocationRepresentation
12-
import org.svis.generator.rd.RDSettings.Variant
1310
import org.svis.generator.SettingsConfiguration
1411

1512
class Prawn_X3DomMovingFlashingTest {
1613

17-
//TODO reimplement tests for new dynamix metamodel
1814
@BeforeClass
1915
def static void launch() {
20-
/*
21-
RDSettings::OUTPUT_FORMAT = OutputFormat::X3DOM
22-
RDSettings::INVOCATION_REPRESENTATION = InvocationRepresentation::MOVING_FLASHING
23-
RDSettings::VARIANT = Variant::DYNAMIC
24-
*/
2516
SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/prawn/input/PrawnMovingFlashingTest.properties")
2617
new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/rd/Dynamix2RD.mwe2", "-p", "famixPath=testdata/prawn/input/famixDyn",
2718
"dynamixPath=testdata/prawn/input/dynamix","outputPath=output/rd/dynamix/prawn/prawn_x3dom_moving_flashing"])
28-
/*
29-
RDSettings::OUTPUT_FORMAT = OutputFormat::X3D
30-
RDSettings::VARIANT = Variant::STATIC
31-
RDSettings::INVOCATION_REPRESENTATION = InvocationRepresentation::NONE
32-
*/
3319
}
3420

3521
@Test

‎generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Prawn_X3DomMovingSpheresTest.xtend‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,15 @@ import java.io.File
77
import java.io.FileNotFoundException
88
import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
99
import org.apache.commons.io.FileUtils
10-
//import org.svis.generator.rd.RDSettings.OutputFormat
11-
import org.svis.generator.rd.RDSettings
12-
import org.svis.generator.rd.RDSettings.InvocationRepresentation
13-
import org.svis.generator.rd.RDSettings.Variant
1410
import org.svis.generator.SettingsConfiguration
1511

1612
class Prawn_X3DomMovingSpheresTest {
1713

18-
//TODO reimplement tests for new dynamix metamodel
1914
@BeforeClass
2015
def static void launch() {
21-
/*
22-
RDSettings::OUTPUT_FORMAT = OutputFormat::X3DOM
23-
RDSettings::INVOCATION_REPRESENTATION = InvocationRepresentation::MOVING_SPHERES
24-
RDSettings::VARIANT = Variant::DYNAMIC
25-
*/
2616
SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/prawn/input/PrawnMovingSpheresTest.properties")
2717
new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/rd/Dynamix2RD.mwe2", "-p", "famixPath=testdata/prawn/input/famixDyn",
2818
"dynamixPath=testdata/prawn/input/dynamix","outputPath=output/rd/dynamix/prawn/prawn_x3dom_moving_spheres"])
29-
/*
30-
RDSettings::OUTPUT_FORMAT = OutputFormat::X3D
31-
RDSettings::VARIANT = Variant::STATIC
32-
RDSettings::INVOCATION_REPRESENTATION = InvocationRepresentation::NONE
33-
*/
3419
}
3520

3621
@Test

‎generator/org.svis.generator.tests/src/org/svis/generator/tests/rd/dynamix/Prawn_X3DomTest.xtend‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,15 @@ import java.io.File
77
import java.io.FileNotFoundException
88
import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher
99
import org.apache.commons.io.FileUtils
10-
//import org.svis.generator.rd.RDSettings.OutputFormat
11-
import org.svis.generator.rd.RDSettings
1210
import org.svis.generator.SettingsConfiguration
1311

1412
class Prawn_X3DomTest {
1513

16-
//TODO reimplement tests for new dynamix metamodel
1714
@BeforeClass
1815
def static void launch() {
19-
//RDSettings::OUTPUT_FORMAT = OutputFormat::X3DOM
2016
SettingsConfiguration.getInstance("../org.svis.generator.tests/testdata/prawn/input/PrawnX3DOMTest.properties")
2117
new Mwe2Launcher().run(#["../org.svis.generator.run/src/org/svis/generator/run/rd/Dynamix2RD.mwe2", "-p", "famixPath=testdata/prawn/input/famixDyn",
2218
"dynamixPath=testdata/prawn/input/dynamix","outputPath=output/rd/dynamix/prawn/prawn_x3dom_none"])
23-
//RDSettings::OUTPUT_FORMAT = OutputFormat::X3D
2419
}
2520

2621
@Test

0 commit comments

Comments
 (0)