Bug 563666 - [Sonar] Fixed "Remove this array creation and simply pass the elements"
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/ConstraintsConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/ConstraintsConverterTest.java index 9d16621..a9d5542 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/ConstraintsConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/ConstraintsConverterTest.java
@@ -49,22 +49,25 @@ @Parameterized.Parameters(name = "{index}: Test data ID: {0}. Description : {3}") public static Collection<Object[]> getTestData() { - final String[] inputFiles500501 = new String[] { "/constraints/500501/constraints_500501.amxmi", + final String[] inputFiles500501 = { + "/constraints/500501/constraints_500501.amxmi", "/constraints/500501/constraints_2_500501.amxmi" }; - final String[] inputFiles500502 = new String[] { "/constraints/500502/constraints_500502.amxmi", + final String[] inputFiles500502 = { + "/constraints/500502/constraints_500502.amxmi", "/constraints/500502/constraints_sw_model.amxmi" }; - final String[] inputFiles500506 = new String[] { "/constraints/500506/constraints_500506.amxmi" }; + final String[] inputFiles500506 = { + "/constraints/500506/constraints_500506.amxmi" }; - return Arrays.asList(new Object[][] { { "500501", true, inputFiles500501, "AffinityConstraint change" }, - { "500502", true, inputFiles500502, "RunnableSequencingConstraint change" }, - { "500506", true, inputFiles500506, "Timing Constraints change" } }); + return Arrays.asList( + data("500501", true, inputFiles500501, "AffinityConstraint change"), + data("500502", true, inputFiles500502, "RunnableSequencingConstraint change"), + data("500506", true, inputFiles500506, "Timing Constraints change")); } public ConstraintsConverterTest(final String testDataID, final boolean canExecuteTestCase, final String[] xmlFiles, final String description) { - super(canExecuteTestCase, xmlFiles); }
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/HwConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/HwConverterTest.java index 024440a..16cbab4 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/HwConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/HwConverterTest.java
@@ -46,11 +46,11 @@ public static Collection<Object[]> getTestData() { return Arrays.asList( - new Object[][] { { "/hw/memorytype_size.amxmi", true }, { "/hw/hw_frequency_quartz.amxmi", true } }); + data("/hw/memorytype_size.amxmi", true), + data("/hw/hw_frequency_quartz.amxmi", true)); } public HwConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) { - super(canExecuteTestCase, xmlFileRelativeLocation); }
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/NamespaceConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/NamespaceConverterTest.java index d634a19..a0ba552 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/NamespaceConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/NamespaceConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters071.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.junit.FixMethodOrder; @@ -30,7 +30,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/namespace/AMALTHEA_Democar.amxmi", true } }); + + return Collections.singletonList( + data("/namespace/AMALTHEA_Democar.amxmi", true)); } public NamespaceConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/PropertyConstraintsConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/PropertyConstraintsConverterTest.java index f9e488c..563c148 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/PropertyConstraintsConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/PropertyConstraintsConverterTest.java
@@ -45,12 +45,12 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/property-constraints/memorytype_size.amxmi", true }, - { "/property-constraints/pc_frequency_quartz.amxmi", true } }); + return Arrays.asList( + data("/property-constraints/memorytype_size.amxmi", true), + data("/property-constraints/pc_frequency_quartz.amxmi", true)); } public PropertyConstraintsConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) { - super(canExecuteTestCase, xmlFileRelativeLocation); }
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/RootElementConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/RootElementConverterTest.java index 049c642..6645c3c 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/RootElementConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/RootElementConverterTest.java
@@ -39,16 +39,20 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/non-amalthea-root-tag/components.amxmi", true }, - { "/non-amalthea-root-tag/config.amxmi", true }, { "/non-amalthea-root-tag/constraints.amxmi", true }, - { "/non-amalthea-root-tag/eventmodel.amxmi", true }, { "/non-amalthea-root-tag/hwmodel.amxmi", true }, - { "/non-amalthea-root-tag/mappingmodel.amxmi", true }, { "/non-amalthea-root-tag/osmodel.amxmi", true }, - { "/non-amalthea-root-tag/propertyconstraints.amxmi", true }, - { "/non-amalthea-root-tag/stimuli.amxmi", true }, { "/non-amalthea-root-tag/swmodel.amxmi", true } }); + return Arrays.asList( + data("/non-amalthea-root-tag/components.amxmi", true), + data("/non-amalthea-root-tag/config.amxmi", true), + data("/non-amalthea-root-tag/constraints.amxmi", true), + data("/non-amalthea-root-tag/eventmodel.amxmi", true), + data("/non-amalthea-root-tag/hwmodel.amxmi", true), + data("/non-amalthea-root-tag/mappingmodel.amxmi", true), + data("/non-amalthea-root-tag/osmodel.amxmi", true), + data("/non-amalthea-root-tag/propertyconstraints.amxmi", true), + data("/non-amalthea-root-tag/stimuli.amxmi", true), + data("/non-amalthea-root-tag/swmodel.amxmi", true)); } public RootElementConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) { - super(canExecuteTestCase, xmlFileRelativeLocation); }
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/SwConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/SwConverterTest.java index 2f0effb..69f3ad2 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/SwConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/SwConverterTest.java
@@ -44,18 +44,19 @@ @Parameterized.Parameters(name = "{index}: Test data ID: {0}") public static Collection<Object[]> getTestData() { + final String[] inputFilesSection = { "/sw/AMALTHEA_Democar.amxmi" }; - final String[] inputFilesSection = new String[] { "/sw/AMALTHEA_Democar.amxmi" }; + final String[] inputFilesModeSwitch = { + "/sw/modeswitch/modeswitch.amxmi", + "/sw/modeswitch/modeliterals.amxmi", + "/sw/modeswitch/modeswtich_isrs.amxmi" }; - final String[] inputFilesModeSwitch = new String[] { "/sw/modeswitch/modeswitch.amxmi", - "/sw/modeswitch/modeliterals.amxmi", "/sw/modeswitch/modeswtich_isrs.amxmi" }; - - return Arrays.asList(new Object[][] { { "Sections : 1", true, inputFilesSection }, - { "ModeSwitchEntry_Scenario : 2", true, inputFilesModeSwitch } }); + return Arrays.asList( + data("Sections : 1", true, inputFilesSection), + data("ModeSwitchEntry_Scenario : 2", true, inputFilesModeSwitch)); } public SwConverterTest(final String testDataID, final boolean canExecuteTestCase, final String[] xmlFiles) { - super(canExecuteTestCase, xmlFiles); }
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/SwSectionConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/SwSectionConverterTest.java index a74db35..53f61dd 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/SwSectionConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.071.tests/src/org/eclipse/app4mc/amalthea/converters071/tests/SwSectionConverterTest.java
@@ -17,8 +17,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -46,15 +46,16 @@ @Parameterized.Parameters(name = "{index}: Test data ID: {0}") public static Collection<Object[]> getTestData() { - - final String[] inputFiles = new String[] { "/sw.sections/1.amxmi", "/sw.sections/2.amxmi", + final String[] inputFiles = { + "/sw.sections/1.amxmi", + "/sw.sections/2.amxmi", "/sw.sections/3.amxmi" }; - return Arrays.asList(new Object[][] { { "Sections-Constraints-Conversion : 1", true, inputFiles } }); + return Collections.singletonList( + data("Sections-Constraints-Conversion : 1", true, inputFiles)); } public SwSectionConverterTest(final String testDataID, final boolean canExecuteTestCase, final String[] xmlFiles) { - super(canExecuteTestCase, xmlFiles); }
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/CommonElementsConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/CommonElementsConverterTest.java index f6ffef1..c498021 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/CommonElementsConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/CommonElementsConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters072.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; @@ -42,11 +42,11 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/common-elements/common-elements.amxmi", true } }); + return Collections.singletonList( + data("/common-elements/common-elements.amxmi", true)); } public CommonElementsConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) { - super(canExecuteTestCase, xmlFileRelativeLocation); }
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/ConfigConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/ConfigConverterTest.java index 014aa47..3364c4b 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/ConfigConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/ConfigConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters072.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.eclipse.app4mc.amalthea.converters072.impl.ConfigConverter; @@ -32,7 +32,8 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/config/config.amxmi", true } }); + return Collections.singletonList( + data("/config/config.amxmi", true)); } public ConfigConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/ConstraintsConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/ConstraintsConverterTest.java index a08524c..f6196e4 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/ConstraintsConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/ConstraintsConverterTest.java
@@ -39,12 +39,12 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/constraints/constraints.amxmi", true }, - { "/constraints/targetProcess_callsequence/constraints.amxmi", true } }); + return Arrays.asList( + data("/constraints/constraints.amxmi", true), + data("/constraints/targetProcess_callsequence/constraints.amxmi", true)); } public ConstraintsConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) { - super(canExecuteTestCase, xmlFileRelativeLocation); }
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/NamespaceConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/NamespaceConverterTest.java index e79ea17..d02a32c 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/NamespaceConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/NamespaceConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters072.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.eclipse.app4mc.amalthea.converters072.impl.CommonElementsConverter; @@ -33,7 +33,8 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/namespace/AMALTHEA_Democar.amxmi", true } }); + return Collections.singletonList( + data("/namespace/AMALTHEA_Democar.amxmi", true)); } public NamespaceConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/OSConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/OSConverterTest.java index 261d910..93b5641 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/OSConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/OSConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters072.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.eclipse.app4mc.amalthea.converters072.impl.OSConverter; @@ -33,7 +33,8 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/osmodel/osmodel.amxmi", true } }); + return Collections.singletonList( + data("/osmodel/osmodel.amxmi", true)); } public OSConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/PropertyConstraintsConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/PropertyConstraintsConverterTest.java index 99aa498..6d07729 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/PropertyConstraintsConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/PropertyConstraintsConverterTest.java
@@ -45,9 +45,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays - .asList(new Object[][] { { "/property-constraints/case1/AMALTHEA_Democar_MappingExample.amxmi", true }, - { "/property-constraints/case2/AMALTHEA_Democar_MappingExample-without-hwmodel.amxmi", true } }); + return Arrays.asList( + data("/property-constraints/case1/AMALTHEA_Democar_MappingExample.amxmi", true), + data("/property-constraints/case2/AMALTHEA_Democar_MappingExample-without-hwmodel.amxmi", true)); } public PropertyConstraintsConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/StimuliConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/StimuliConverterTest.java index 232caff..6e86536 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/StimuliConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/StimuliConverterTest.java
@@ -16,8 +16,8 @@ import static org.junit.Assert.assertEquals; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; @@ -43,11 +43,11 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/stimuli/stimuli.amxmi", true } }); + return Collections.singletonList( + data("/stimuli/stimuli.amxmi", true)); } public StimuliConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) { - super(canExecuteTestCase, xmlFileRelativeLocation); }
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/SwConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/SwConverterTest.java index 53de1ae..1739504 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/SwConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.072.tests/src/org/eclipse/app4mc/amalthea/converters072/tests/SwConverterTest.java
@@ -41,12 +41,14 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/sw/sw.amxmi", true }, { "/sw/preemption/sw.amxmi", true }, - { "/sw/instructions/instructions.amxmi", true }, { "/sw/samplingtype/sw.amxmi", true } }); + return Arrays.asList( + data("/sw/sw.amxmi", true), + data("/sw/preemption/sw.amxmi", true), + data("/sw/instructions/instructions.amxmi", true), + data("/sw/samplingtype/sw.amxmi", true)); } public SwConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) { - super(canExecuteTestCase, xmlFileRelativeLocation); }
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/Abstract080ConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/Abstract080ConverterTest.java index adca6d3..82ade91 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/Abstract080ConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/Abstract080ConverterTest.java
@@ -11,6 +11,7 @@ * Robert Bosch GmbH - initial API and implementation ******************************************************************************** */ + package org.eclipse.app4mc.amalthea.converters080.tests; import org.eclipse.app4mc.amalthea.converters.common.tests.AbstractConverterTest;
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/DataSizeConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/DataSizeConverterTest.java index 436c834..043870f 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/DataSizeConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/DataSizeConverterTest.java
@@ -16,8 +16,8 @@ import static org.junit.Assert.assertTrue; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.eclipse.app4mc.amalthea.converters080.impl.RootElementConverter; @@ -36,10 +36,11 @@ @Parameterized.Parameters(name = "{index}: Test data ID: {0}. Description : {3}") public static Collection<Object[]> getTestData() { - String[] inputFilesModeLabels = new String[] { "/datasize/dataSizeChanges.amxmi" }; - return Arrays.asList(new Object[][] { { "Models with DataSize", true, inputFilesModeLabels, - "Migration of Amalthea models containing DataSize " } }); + String[] inputFiles = { "/datasize/dataSizeChanges.amxmi" }; + + return Collections.singletonList( + data("Models with DataSize", true, inputFiles, "Migration of Models containing DataSize")); } public DataSizeConverterTest(String testDataID, boolean canExecuteTestCase, String[] xmlFiles, String description) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/MappingConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/MappingConverterTest.java index 7e9b117..d743eb0 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/MappingConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/MappingConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters080.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.eclipse.app4mc.amalthea.converters080.impl.MappingConverter; @@ -34,15 +34,14 @@ @Parameterized.Parameters(name = "{index}: Test data ID: {0}. Description : {3}") public static Collection<Object[]> getTestData() { - String[] inputFilesModeLabels = new String[] { "/mapping/mapping.amxmi" }; + String[] inputFiles = { "/mapping/mapping.amxmi" }; - return Arrays.asList(new Object[][] { { "ModeLabel", true, inputFilesModeLabels, - "Migration of Amalthea models containing AbstractElementMapping" } }); + return Collections.singletonList( + data("ModeLabel", true, inputFiles, "Migration of Models containing AbstractElementMapping")); } public MappingConverterTest(final String testDataID, final boolean canExecuteTestCase, final String[] xmlFiles, final String description) { - super(canExecuteTestCase, xmlFiles); }
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/NamespaceConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/NamespaceConverterTest.java index bb3584e..e34bfce 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/NamespaceConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/NamespaceConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters080.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.junit.FixMethodOrder; @@ -30,7 +30,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/namespace/AMALTHEA_Democar.amxmi", true } }); + + return Collections.singletonList( + data("/namespace/AMALTHEA_Democar.amxmi", true)); } public NamespaceConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/OSConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/OSConverterTest.java index 2b7565b..88a8995 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/OSConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/OSConverterTest.java
@@ -16,8 +16,8 @@ import static org.junit.Assert.assertEquals; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; @@ -42,10 +42,10 @@ @Parameterized.Parameters(name = "{index}: Test data ID: {0}. Description : {3}") public static Collection<Object[]> getTestData() { - String[] inputFiles = new String[] { "/osmodel/osmodel.amxmi" }; + String[] inputFiles = { "/osmodel/osmodel.amxmi" }; - return Arrays.asList(new Object[][] { - { "Models with OS Model", true, inputFiles, "Migration of Amalthea models containing OS Model " } }); + return Collections.singletonList( + data("Models with OS Model", true, inputFiles, "Migration of Models containing OS Model")); } public OSConverterTest(String testDataID, boolean canExecuteTestCase, String[] xmlFiles, String description) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/ProbabilitySwitchConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/ProbabilitySwitchConverterTest.java index 8585a6e..0e0b185 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/ProbabilitySwitchConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/ProbabilitySwitchConverterTest.java
@@ -16,8 +16,8 @@ import static org.junit.Assert.assertTrue; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.eclipse.app4mc.amalthea.converters080.impl.RootElementConverter; @@ -37,10 +37,10 @@ @Parameterized.Parameters(name = "{index}: Test data ID: {0}. Description : {3}") public static Collection<Object[]> getTestData() { - final String[] inputFilesModeLabels = new String[] { "/probabilitySwitch/probabilitySwitch.amxmi" }; + final String[] inputFilesModeLabels = { "/probabilitySwitch/probabilitySwitch.amxmi" }; - return Arrays.asList(new Object[][] { { "Models with ProbabilitySwitch", true, inputFilesModeLabels, - "Migration of Amalthea models containing probabil(t)itySwitch " } }); + return Collections.singleton( + data("Models with ProbabilitySwitch", true, inputFilesModeLabels, "Migration of Models containing probabilitySwitch")); } public ProbabilitySwitchConverterTest(String testDataID, boolean canExecuteTestCase, String[] xmlFiles, String description) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/PropertyConstraintsConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/PropertyConstraintsConverterTest.java index f1b88f1..1325dea 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/PropertyConstraintsConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/PropertyConstraintsConverterTest.java
@@ -16,8 +16,8 @@ import static org.junit.Assert.assertEquals; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; @@ -41,10 +41,10 @@ @Parameterized.Parameters(name = "{index}: Test data ID: {0}. Description : {3}") public static Collection<Object[]> getTestData() { - String[] inputFiles = new String[] { "/propertyConstraints/propertyConstraints.amxmi" }; + String[] inputFiles = { "/propertyConstraints/propertyConstraints.amxmi" }; - return Arrays.asList(new Object[][] { { "Models with PropertyConstraints", true, inputFiles, - "Migration of Amalthea models containing PropertyConstraints " } }); + return Collections.singletonList( + data("Models with PropertyConstraints", true, inputFiles, "Migration of Models containing PropertyConstraints")); } public PropertyConstraintsConverterTest(String testDataID, boolean canExecuteTestCase, String[] xmlFiles, String description) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/RootElementConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/RootElementConverterTest.java index f4fc0e8..eb61bb0 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/RootElementConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/RootElementConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters080.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.eclipse.app4mc.amalthea.converters080.impl.RootElementConverter; @@ -31,7 +31,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/rootElementConverter/commonElements.amxmi", true } }); + + return Collections.singletonList( + data("/rootElementConverter/commonElements.amxmi", true)); } public RootElementConverterTest(String xmlFileRelativeLocation, boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/SignedTimeConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/SignedTimeConverterTest.java index a801cf9..37db46d 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/SignedTimeConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/SignedTimeConverterTest.java
@@ -16,8 +16,8 @@ import static org.junit.Assert.assertTrue; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.eclipse.app4mc.amalthea.converters080.impl.RootElementConverter; @@ -37,10 +37,10 @@ @Parameterized.Parameters(name = "{index}: Test data ID: {0}. Description : {3}") public static Collection<Object[]> getTestData() { - String[] inputFilesModeLabels = new String[] { "/signedTime/signedTime.amxmi" }; + String[] inputFilesModeLabels = { "/signedTime/signedTime.amxmi" }; - return Arrays.asList(new Object[][] { { "ModeLabel", true, inputFilesModeLabels, - "Migration of Amalthea models containing ModeLabels (both simple and cross references)" } }); + return Collections.singletonList( + data("ModeLabel", true, inputFilesModeLabels, "Migration of Models containing SignedTime")); } public SignedTimeConverterTest(String testDataID, boolean canExecuteTestCase, String[] xmlFiles, String description) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/SwConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/SwConverterTest.java index 704a5fb..68e5b02 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/SwConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.080.tests/src/org/eclipse/app4mc/amalthea/converters080/tests/SwConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters080.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.eclipse.app4mc.amalthea.converters080.impl.RootElementConverter; @@ -34,10 +34,10 @@ @Parameterized.Parameters(name = "{index}: Test data ID: {0}. Description : {3}") public static Collection<Object[]> getTestData() { - String[] inputFilesModeLabels = new String[] { "/sw/amt_mode.amxmi", "/sw/sw_modelabels.amxmi" }; + String[] inputFilesModeLabels = { "/sw/amt_mode.amxmi", "/sw/sw_modelabels.amxmi" }; - return Arrays.asList(new Object[][] { { "ModeLabel", true, inputFilesModeLabels, - "Migration of Amalthea models containing ModeLabels (both simple and cross references)" } }); + return Collections.singletonList( + data("ModeLabel", true, inputFilesModeLabels, "Migration of Models containing SW Model")); } public SwConverterTest(String testDataID, boolean canExecuteTestCase, String[] xmlFiles, String description) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/ConstraintsConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/ConstraintsConverterTest.java index 924ac71..40204b8 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/ConstraintsConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/ConstraintsConverterTest.java
@@ -20,6 +20,7 @@ import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.base.ICache; @@ -52,16 +53,17 @@ @Parameterized.Parameters(name = "{index}: Test data ID: {0}. Description : {3}") public static Collection<Object[]> getTestData() { - final String[] inputFiles = new String[] { "/eventChain/default.amxmi", "/eventChain/eventChain.amxmi", + final String[] inputFiles = { + "/eventChain/default.amxmi", + "/eventChain/eventChain.amxmi", "/eventChain/democar.amxmi" }; - return Arrays.asList(new Object[][] { { "Models with Constraint Model", true, inputFiles, - "Migration of Amalthea models containing Constraints Model " } }); + return Collections.singletonList( + data("Models with Constraint Model", true, inputFiles, "Migration of Models containing Constraints Model")); } public ConstraintsConverterTest(final String testDataID, final boolean canExecuteTestCase, final String[] xmlFiles, final String description) { - super(canExecuteTestCase, xmlFiles); }
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/HwConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/HwConverterTest.java index 159117e..3700196 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/HwConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/HwConverterTest.java
@@ -43,14 +43,13 @@ @Parameterized.Parameters(name = "{index}: Test data ID: {0}. Description : {3}") public static Collection<Object[]> getTestData() { - final String[] inputFiles = new String[] { "/hw/hw.amxmi" }; + final String[] inputFiles = { "/hw/hw.amxmi" }; - final String[] inputFilesQuartz = new String[] { "/hw_quartz/hw_quartz.amxmi" }; + final String[] inputFilesQuartz = strings("/hw_quartz/hw_quartz.amxmi"); - - return Arrays.asList(new Object[][] { - { "Models with HW Model", true, inputFiles, "Migration of Amalthea models containing HW Model " } , - { "Models with HW Model (containing Quartz)", true, inputFilesQuartz, "Migration of Amalthea models containing Quartz in HW Model " } }); + return Arrays.asList( + data("Models with HW Model", true, inputFiles, "Migration of Models containing HW Model"), + data("Models with HW Model (containing Quartz)", true, inputFilesQuartz, "Migration of Models containing Quartz in HW Model")); } public HwConverterTest(String testDataID, boolean canExecuteTestCase, String[] xmlFiles, String description) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/OS_MappingConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/OS_MappingConverterTest.java index 6860791..64d7ef8 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/OS_MappingConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/OS_MappingConverterTest.java
@@ -16,8 +16,8 @@ import static org.junit.Assert.assertTrue; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; @@ -44,11 +44,10 @@ @Parameterized.Parameters(name = "{index}: Test data ID: {0}. Description : {3}") public static Collection<Object[]> getTestData() { - final String[] inputFiles = new String[] { "/os_mapping/modeling_example_client_server_1.amxmi" }; + final String[] inputFiles = { "/os_mapping/modeling_example_client_server_1.amxmi" }; - return Arrays.asList(new Object[][] { - { "AMXMI with OS and Mapping Models", true, inputFiles, "Migration of Amalthea models containing SW Model " }, - }); + return Collections.singletonList( + data("AMXMI with OS and Mapping Models", true, inputFiles, "Migration of Models containing OS and Mapping Models")); } public OS_MappingConverterTest(String testDataID, boolean canExecuteTestCase, String[] xmlFiles, String description) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/OS_SchedulingConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/OS_SchedulingConverterTest.java index 513d462..87f87e4 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/OS_SchedulingConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/OS_SchedulingConverterTest.java
@@ -16,8 +16,8 @@ import static org.junit.Assert.assertEquals; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; @@ -44,11 +44,10 @@ @Parameterized.Parameters(name = "{index}: Test data ID: {0}. Description : {3}") public static Collection<Object[]> getTestData() { - String[] inputFiles = new String[] { "/os_scheduler/os_Scheduler.amxmi" }; + String[] inputFiles = { "/os_scheduler/os_Scheduler.amxmi" }; - return Arrays.asList(new Object[][] { - { "AMXMI with OS (Schedulers) Models", true, inputFiles, "Migration of Amalthea models containing OS Model " } , - }); + return Collections.singletonList( + data("AMXMI with OS (Schedulers) Models", true, inputFiles, "Migration of Models containing OS Model")); } public OS_SchedulingConverterTest(String testDataID, boolean canExecuteTestCase, String[] xmlFiles, String description) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/StimuliConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/StimuliConverterTest.java index 0b6ea93..440b174 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/StimuliConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/StimuliConverterTest.java
@@ -45,17 +45,17 @@ @Parameterized.Parameters(name = "{index}: Test data ID: {0}. Description : {3}") public static Collection<Object[]> getTestData() { - final String[] inputFiles = new String[] { "/stimuli/stimuli.amxmi" }; + final String[] inputFiles = { "/stimuli/stimuli.amxmi" }; - final String[] inputFilesStimuli = new String[] { "/stimuli_event/eventModel.amxmi", + final String[] inputFilesStimuli = { + "/stimuli_event/eventModel.amxmi", "/stimuli_event/eventStimulus.amxmi" }; - return Arrays.asList(new Object[][] { { "Models with Stimuli Model (Containing ModeValueListEntry elements)", - true, inputFiles, - "Migration of Amalthea models containing Stimuli model(Containing ModeValueListEntry elements) " }, - - { "Models with Stimuli Model (Containing EventStimulus elements)", true, inputFilesStimuli, - "Migration of Amalthea models containing Stimulus model(Containing EventStimulus elements) " } }); + return Arrays.asList( + data("Models with Stimuli Model (Containing ModeValueListEntry elements)", true, inputFiles, + "Migration of Amalthea models containing Stimuli model(Containing ModeValueListEntry elements)"), + data("Models with Stimuli Model (Containing EventStimulus elements)", true, inputFilesStimuli, + "Migration of Amalthea models containing Stimulus model(Containing EventStimulus elements)")); } public StimuliConverterTest(String testDataID, boolean canExecuteTestCase, String[] xmlFiles, String description) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/SwConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/SwConverterTest.java index e8f6821..09a054d 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/SwConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.081.tests/src/org/eclipse/app4mc/amalthea/converters081/tests/SwConverterTest.java
@@ -43,18 +43,22 @@ @Parameterized.Parameters(name = "{index}: Test data ID: {0}. Description : {3}") public static Collection<Object[]> getTestData() { - final String[] inputFiles = new String[] { "/sw/sw.amxmi", "/sw/sw2.amxmi" }; - final String[] inputFilesPriority = new String[] { "/sw_priority/sw_priority.amxmi" }; - final String[] inputFilesActivations = new String[] { "/activations/events.amxmi", + final String[] inputFiles = { "/sw/sw.amxmi", "/sw/sw2.amxmi" }; + final String[] inputFilesPriority = { "/sw_priority/sw_priority.amxmi" }; + final String[] inputFilesActivations = { + "/activations/events.amxmi", "/activations/sw_activations.amxmi" }; - return Arrays.asList(new Object[][] { - { "Models with SW Model", true, inputFiles, "Migration of Amalthea models containing SW Model " }, - { "Models with SW Model - having sub-classes of AbstractProcess (e.g: Task, ISR, ProcessPrototyes)", - true, inputFilesPriority, - "Migration of Amalthea models containing SW Model (with AbstractProcess elements)" }, - { "Models with Activations & Triggers", true, inputFilesActivations, - "Migration of Amalthea models containing PeriodicActivation's & EventActivation's " } }); + return Arrays.asList( + data("Models with SW Model", + true, inputFiles, + "Migration of Amalthea models containing SW Model "), + data("Models with SW Model - having sub-classes of AbstractProcess (e.g: Task, ISR, ProcessPrototyes)", + true, inputFilesPriority, + "Migration of Amalthea models containing SW Model (with AbstractProcess elements)"), + data("Models with Activations & Triggers", + true, inputFilesActivations, + "Migration of Amalthea models containing PeriodicActivation's & EventActivation's")); } public SwConverterTest(String testDataID, boolean canExecuteTestCase, String[] xmlFiles, String description) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.082.tests/src/org/eclipse/app4mc/amalthea/converters082/tests/NamespaceConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.082.tests/src/org/eclipse/app4mc/amalthea/converters082/tests/NamespaceConverterTest.java index b430e67..2493acc 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.082.tests/src/org/eclipse/app4mc/amalthea/converters082/tests/NamespaceConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.082.tests/src/org/eclipse/app4mc/amalthea/converters082/tests/NamespaceConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters082.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.eclipse.app4mc.amalthea.converters.common.tests.AbstractConverterTest; @@ -32,7 +32,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/namespace/hw.amxmi", true } }); + + return Collections.singletonList( + data("/namespace/hw.amxmi", true)); } public NamespaceConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.083.tests/src/org/eclipse/app4mc/amalthea/converters083/tests/ComponentsModelConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.083.tests/src/org/eclipse/app4mc/amalthea/converters083/tests/ComponentsModelConverterTest.java index 7387715..17e1cbb 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.083.tests/src/org/eclipse/app4mc/amalthea/converters083/tests/ComponentsModelConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.083.tests/src/org/eclipse/app4mc/amalthea/converters083/tests/ComponentsModelConverterTest.java
@@ -16,8 +16,8 @@ import static org.junit.Assert.assertTrue; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.eclipse.app4mc.amalthea.converters083.impl.ComponentModelConverter; @@ -36,7 +36,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/componentModel/model.amxmi", true } }); + + return Collections.singletonList( + data("/componentModel/model.amxmi", true)); } public ComponentsModelConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.083.tests/src/org/eclipse/app4mc/amalthea/converters083/tests/NamespaceConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.083.tests/src/org/eclipse/app4mc/amalthea/converters083/tests/NamespaceConverterTest.java index cd51ed2..fe47ce2 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.083.tests/src/org/eclipse/app4mc/amalthea/converters083/tests/NamespaceConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.083.tests/src/org/eclipse/app4mc/amalthea/converters083/tests/NamespaceConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters083.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.junit.FixMethodOrder; @@ -30,7 +30,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/namespace/hw.amxmi", true } }); + + return Collections.singletonList( + data("/namespace/hw.amxmi", true)); } public NamespaceConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.083.tests/src/org/eclipse/app4mc/amalthea/converters083/tests/StimuliConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.083.tests/src/org/eclipse/app4mc/amalthea/converters083/tests/StimuliConverterTest.java index d11af23..d249b7d 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.083.tests/src/org/eclipse/app4mc/amalthea/converters083/tests/StimuliConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.083.tests/src/org/eclipse/app4mc/amalthea/converters083/tests/StimuliConverterTest.java
@@ -17,8 +17,8 @@ import static org.junit.Assert.assertTrue; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.base.ICache; @@ -42,7 +42,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/stimuli/model.amxmi", true } }); + + return Collections.singletonList( + data("/stimuli/model.amxmi", true)); } public StimuliConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.083.tests/src/org/eclipse/app4mc/amalthea/converters083/tests/SwConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.083.tests/src/org/eclipse/app4mc/amalthea/converters083/tests/SwConverterTest.java index b998dbe..dfb3bbb 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.083.tests/src/org/eclipse/app4mc/amalthea/converters083/tests/SwConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.083.tests/src/org/eclipse/app4mc/amalthea/converters083/tests/SwConverterTest.java
@@ -41,7 +41,10 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/sw/model.amxmi", true }, {"/sw/model_ports.amxmi", true } }); + + return Arrays.asList( + data("/sw/model.amxmi", true), + data("/sw/model_ports.amxmi", true)); } public SwConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.090.tests/src/org/eclipse/app4mc/amalthea/converters090/tests/HWConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.090.tests/src/org/eclipse/app4mc/amalthea/converters090/tests/HWConverterTest.java index bbdfa86..c822fe1 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.090.tests/src/org/eclipse/app4mc/amalthea/converters090/tests/HWConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.090.tests/src/org/eclipse/app4mc/amalthea/converters090/tests/HWConverterTest.java
@@ -15,8 +15,8 @@ package org.eclipse.app4mc.amalthea.converters090.tests; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.base.ICache; @@ -38,7 +38,8 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/hw/hwMigrationExample.amxmi", true } }); + return Collections.singletonList( + data("/hw/hwMigrationExample.amxmi", true)); } public HWConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.090.tests/src/org/eclipse/app4mc/amalthea/converters090/tests/HWReferencesConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.090.tests/src/org/eclipse/app4mc/amalthea/converters090/tests/HWReferencesConverterTest.java index a6c0ec7..089d36f 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.090.tests/src/org/eclipse/app4mc/amalthea/converters090/tests/HWReferencesConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.090.tests/src/org/eclipse/app4mc/amalthea/converters090/tests/HWReferencesConverterTest.java
@@ -16,8 +16,8 @@ import java.lang.reflect.Field; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.base.ICache; @@ -43,7 +43,8 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] {{ "/hw_references/refsModel.amxmi", true }}); + return Collections.singletonList( + data("/hw_references/refsModel.amxmi", true)); } public HWReferencesConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.090.tests/src/org/eclipse/app4mc/amalthea/converters090/tests/NamespaceConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.090.tests/src/org/eclipse/app4mc/amalthea/converters090/tests/NamespaceConverterTest.java index cc4b424..0ab5a03 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.090.tests/src/org/eclipse/app4mc/amalthea/converters090/tests/NamespaceConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.090.tests/src/org/eclipse/app4mc/amalthea/converters090/tests/NamespaceConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters090.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.junit.FixMethodOrder; @@ -30,7 +30,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/namespace/model.amxmi", true } }); + + return Collections.singletonList( + data("/namespace/model.amxmi", true)); } public NamespaceConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.091.tests/src/org/eclipse/app4mc/amalthea/converters091/tests/CustomPropertiesConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.091.tests/src/org/eclipse/app4mc/amalthea/converters091/tests/CustomPropertiesConverterTest.java index 2922e45..5db2948 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.091.tests/src/org/eclipse/app4mc/amalthea/converters091/tests/CustomPropertiesConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.091.tests/src/org/eclipse/app4mc/amalthea/converters091/tests/CustomPropertiesConverterTest.java
@@ -16,8 +16,8 @@ import static org.junit.Assert.assertTrue; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; @@ -39,7 +39,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/customproperties/model.amxmi", true } }); + + return Collections.singletonList( + data("/customproperties/model.amxmi", true)); } public CustomPropertiesConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.091.tests/src/org/eclipse/app4mc/amalthea/converters091/tests/NamespaceConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.091.tests/src/org/eclipse/app4mc/amalthea/converters091/tests/NamespaceConverterTest.java index 0570b82..15a1a86 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.091.tests/src/org/eclipse/app4mc/amalthea/converters091/tests/NamespaceConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.091.tests/src/org/eclipse/app4mc/amalthea/converters091/tests/NamespaceConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters091.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.eclipse.app4mc.amalthea.converters.common.tests.AbstractConverterTest; @@ -32,7 +32,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/namespace/model.amxmi", true } }); + + return Collections.singletonList( + data("/namespace/model.amxmi", true)); } public NamespaceConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.092.tests/src/org/eclipse/app4mc/amalthea/converters092/tests/NamespaceConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.092.tests/src/org/eclipse/app4mc/amalthea/converters092/tests/NamespaceConverterTest.java index 5990327..d6c126a 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.092.tests/src/org/eclipse/app4mc/amalthea/converters092/tests/NamespaceConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.092.tests/src/org/eclipse/app4mc/amalthea/converters092/tests/NamespaceConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters092.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.eclipse.app4mc.amalthea.converters.common.tests.AbstractConverterTest; @@ -32,7 +32,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/namespace/model.amxmi", true } }); + + return Collections.singletonList( + data("/namespace/model.amxmi", true)); } public NamespaceConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/ActivationConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/ActivationConverterTest.java index 5f209ef..1b3f00a 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/ActivationConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/ActivationConverterTest.java
@@ -15,8 +15,8 @@ package org.eclipse.app4mc.amalthea.converters093.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.base.ICache; @@ -36,7 +36,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/activations/default.amxmi", true } }); + + return Collections.singletonList( + data("/activations/default.amxmi", true)); } public ActivationConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/ExecutionNeed_DeviationConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/ExecutionNeed_DeviationConverterTest.java index 2717957..17a43ff 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/ExecutionNeed_DeviationConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/ExecutionNeed_DeviationConverterTest.java
@@ -16,8 +16,8 @@ package org.eclipse.app4mc.amalthea.converters093.tests; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.base.ICache; @@ -37,7 +37,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/executionNeed_deviation/executionNeed_deviation.amxmi", true } }); + + return Collections.singletonList( + data("/executionNeed_deviation/executionNeed_deviation.amxmi", true)); } public ExecutionNeed_DeviationConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/HwConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/HwConverterTest.java index 5ba2d78..e3291cc 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/HwConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/HwConverterTest.java
@@ -16,8 +16,8 @@ package org.eclipse.app4mc.amalthea.converters093.tests; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.base.ICache; @@ -38,7 +38,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/hwLatency/hw.amxmi", true } }); + + return Collections.singletonList( + data("/hwLatency/hw.amxmi", true)); } public HwConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/MeasurementConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/MeasurementConverterTest.java index 1a3fe6d..fa9d03e 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/MeasurementConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/MeasurementConverterTest.java
@@ -16,8 +16,8 @@ package org.eclipse.app4mc.amalthea.converters093.tests; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.base.ICache; @@ -38,7 +38,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/measurement/measurement.amxmi", true } }); + + return Collections.singletonList( + data("/measurement/measurement.amxmi", true)); } public MeasurementConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/NamespaceConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/NamespaceConverterTest.java index e9e543c..044f6bc 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/NamespaceConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/NamespaceConverterTest.java
@@ -15,8 +15,8 @@ package org.eclipse.app4mc.amalthea.converters093.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.junit.FixMethodOrder; @@ -32,7 +32,8 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/namespace/model.amxmi", true } }); + return Collections.singletonList( + data("/namespace/model.amxmi", true)); } public NamespaceConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/OsConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/OsConverterTest.java index 05b8906..86091e7 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/OsConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/OsConverterTest.java
@@ -16,8 +16,8 @@ package org.eclipse.app4mc.amalthea.converters093.tests; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.base.ICache; @@ -37,7 +37,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/os_instructions/instructionsExample.amxmi", true } }); + + return Collections.singletonList( + data("/os_instructions/instructionsExample.amxmi", true)); } public OsConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/StimuliConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/StimuliConverterTest.java index 5dd816c..9ecc9a9 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/StimuliConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/StimuliConverterTest.java
@@ -38,7 +38,10 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/stimuli/default.amxmi", true } , { "/stimuli/stimulus.amxmi", true } }); + + return Arrays.asList( + data("/stimuli/default.amxmi", true), + data("/stimuli/stimulus.amxmi", true)); } public StimuliConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/TransmissionPolicyConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/TransmissionPolicyConverterTest.java index f710ab9..847e6eb 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/TransmissionPolicyConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.093.tests/src/org/eclipse/app4mc/amalthea/converters093/tests/TransmissionPolicyConverterTest.java
@@ -18,8 +18,8 @@ import static org.junit.Assert.assertEquals; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.base.ICache; @@ -44,7 +44,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/transmissionPolicy/default.amxmi", true } }); + + return Collections.singletonList( + data("/transmissionPolicy/default.amxmi", true)); } public TransmissionPolicyConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/DatatypeConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/DatatypeConverterTest.java index eccaf93..cc2bc7d 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/DatatypeConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/DatatypeConverterTest.java
@@ -15,8 +15,8 @@ package org.eclipse.app4mc.amalthea.converters094.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.eclipse.app4mc.amalthea.converters094.impl.SwConverter; @@ -32,7 +32,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/swModel/datatype-mapping/mapping.amxmi", true } }); + + return Collections.singletonList( + data("/swModel/datatype-mapping/mapping.amxmi", true)); } public DatatypeConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/HwConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/HwConverterTest.java index da46874..77e4861 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/HwConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/HwConverterTest.java
@@ -15,8 +15,8 @@ package org.eclipse.app4mc.amalthea.converters094.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.eclipse.app4mc.amalthea.converters094.impl.HwConverter; @@ -32,7 +32,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/hwModel/hw.amxmi", true } }); + + return Collections.singletonList( + data("/hwModel/hw.amxmi", true)); } public HwConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/ModeAndModeLabelConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/ModeAndModeLabelConverterTest.java index 5a58762..b88ab06 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/ModeAndModeLabelConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/ModeAndModeLabelConverterTest.java
@@ -32,11 +32,11 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { - { "/swModel/mode-labels/mode-labels.amxmi", true }, - { "/swModel/mode-labels/mode-labels2.amxmi", true }, - { "/swModel/mode-labels/modes.amxmi", true } - }); + + return Arrays.asList( + data("/swModel/mode-labels/mode-labels.amxmi", true), + data("/swModel/mode-labels/mode-labels2.amxmi", true), + data("/swModel/mode-labels/modes.amxmi", true)); } public ModeAndModeLabelConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/ModeConditionConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/ModeConditionConverterTest.java index a5faa72..33a421a 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/ModeConditionConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/ModeConditionConverterTest.java
@@ -32,10 +32,10 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { - { "/swModel/mode-conditions/conditions.amxmi", true }, - { "/swModel/mode-conditions/modes2.amxmi", true } - }); + + return Arrays.asList( + data("/swModel/mode-conditions/conditions.amxmi", true), + data("/swModel/mode-conditions/modes2.amxmi", true)); } public ModeConditionConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/NamespaceConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/NamespaceConverterTest.java index 106ef32..8f7d9c8 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/NamespaceConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/NamespaceConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters094.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.junit.FixMethodOrder; @@ -30,7 +30,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/namespace/model.amxmi", true } }); + + return Collections.singletonList( + data("/namespace/model.amxmi", true)); } public NamespaceConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/RunnableConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/RunnableConverterTest.java index 0d51096..7eb83b6 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/RunnableConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.094.tests/src/org/eclipse/app4mc/amalthea/converters094/tests/RunnableConverterTest.java
@@ -32,10 +32,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { - { "/swModel/runnable-deadline/runnable.amxmi", true }, - { "/swModel/runnable-deadline/runnable2.amxmi", true } - }); + return Arrays.asList( + data("/swModel/runnable-deadline/runnable.amxmi", true), + data("/swModel/runnable-deadline/runnable2.amxmi", true)); } public RunnableConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.095.tests/src/org/eclipse/app4mc/amalthea/converters095/tests/NamespaceConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.095.tests/src/org/eclipse/app4mc/amalthea/converters095/tests/NamespaceConverterTest.java index d6bf81a..4240932 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.095.tests/src/org/eclipse/app4mc/amalthea/converters095/tests/NamespaceConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.095.tests/src/org/eclipse/app4mc/amalthea/converters095/tests/NamespaceConverterTest.java
@@ -15,8 +15,8 @@ package org.eclipse.app4mc.amalthea.converters095.tests; import java.io.File; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.eclipse.app4mc.amalthea.converters.common.utils.AmaltheaNamespaceRegistry; @@ -42,7 +42,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { OUTPUT_FOLDER_PREFIX + "model.amxmi", true } }); + + return Collections.singletonList( + data(OUTPUT_FOLDER_PREFIX + "model.amxmi", true)); } public NamespaceConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.095.tests/src/org/eclipse/app4mc/amalthea/converters095/tests/StimuliConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.095.tests/src/org/eclipse/app4mc/amalthea/converters095/tests/StimuliConverterTest.java index 6980f08..aedb4b7 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.095.tests/src/org/eclipse/app4mc/amalthea/converters095/tests/StimuliConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.095.tests/src/org/eclipse/app4mc/amalthea/converters095/tests/StimuliConverterTest.java
@@ -44,10 +44,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { - { OUTPUT_FOLDER_PREFIX + "democar.amxmi", true }, - { "/stimuli/model.amxmi", true } - }); + return Arrays.asList( + data(OUTPUT_FOLDER_PREFIX + "democar.amxmi", true), + data("/stimuli/model.amxmi", true)); } public StimuliConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.095.tests/src/org/eclipse/app4mc/amalthea/converters095/tests/SwConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.095.tests/src/org/eclipse/app4mc/amalthea/converters095/tests/SwConverterTest.java index aa02c3d..9e23842 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.095.tests/src/org/eclipse/app4mc/amalthea/converters095/tests/SwConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.095.tests/src/org/eclipse/app4mc/amalthea/converters095/tests/SwConverterTest.java
@@ -16,8 +16,8 @@ package org.eclipse.app4mc.amalthea.converters095.tests; import java.io.File; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.eclipse.app4mc.amalthea.converters095.impl.SwConverter; @@ -43,13 +43,11 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { - { OUTPUT_FOLDER_PREFIX + "democar.amxmi", true } - }); + return Collections.singletonList( + data(OUTPUT_FOLDER_PREFIX + "democar.amxmi", true)); } public SwConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) { - super(canExecuteTestCase, xmlFileRelativeLocation); }
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.096.tests/src/org/eclipse/app4mc/amalthea/converters096/tests/ConstraintsConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.096.tests/src/org/eclipse/app4mc/amalthea/converters096/tests/ConstraintsConverterTest.java index 9a5f26f..584bef0 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.096.tests/src/org/eclipse/app4mc/amalthea/converters096/tests/ConstraintsConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.096.tests/src/org/eclipse/app4mc/amalthea/converters096/tests/ConstraintsConverterTest.java
@@ -15,8 +15,8 @@ package org.eclipse.app4mc.amalthea.converters096.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.eclipse.app4mc.amalthea.converters096.impl.ConstraintsConverter; @@ -34,9 +34,8 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { - { "/eventchain/democar.amxmi", true } - }); + return Collections.singletonList( + data("/eventchain/democar.amxmi", true)); } public ConstraintsConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.096.tests/src/org/eclipse/app4mc/amalthea/converters096/tests/NamespaceConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.096.tests/src/org/eclipse/app4mc/amalthea/converters096/tests/NamespaceConverterTest.java index 923588a..5433fd3 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.096.tests/src/org/eclipse/app4mc/amalthea/converters096/tests/NamespaceConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.096.tests/src/org/eclipse/app4mc/amalthea/converters096/tests/NamespaceConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters096.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.junit.FixMethodOrder; @@ -31,7 +31,8 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/namespace2/model.amxmi", true } }); + return Collections.singletonList( + data("/namespace2/model.amxmi", true)); } public NamespaceConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.096.tests/src/org/eclipse/app4mc/amalthea/converters096/tests/SwConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.096.tests/src/org/eclipse/app4mc/amalthea/converters096/tests/SwConverterTest.java index 106d3a9..c37d574 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.096.tests/src/org/eclipse/app4mc/amalthea/converters096/tests/SwConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.096.tests/src/org/eclipse/app4mc/amalthea/converters096/tests/SwConverterTest.java
@@ -33,10 +33,9 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { - { "/democar/democar.amxmi", true }, - {"/modecondition/modecondition.amxmi", true} - }); + return Arrays.asList( + data("/democar/democar.amxmi", true), + data("/modecondition/modecondition.amxmi", true)); } public SwConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.097.tests/src/org/eclipse/app4mc/amalthea/converters097/tests/AmltModelReferencePostProcessorTest.java b/tests/org.eclipse.app4mc.amalthea.converters.097.tests/src/org/eclipse/app4mc/amalthea/converters097/tests/AmltModelReferencePostProcessorTest.java index f058c5b..2d4f990 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.097.tests/src/org/eclipse/app4mc/amalthea/converters097/tests/AmltModelReferencePostProcessorTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.097.tests/src/org/eclipse/app4mc/amalthea/converters097/tests/AmltModelReferencePostProcessorTest.java
@@ -20,8 +20,8 @@ import java.lang.reflect.Field; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.base.ICache; @@ -49,7 +49,8 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/modelreference/model.amxmi", true } }); + return Collections.singletonList( + data("/modelreference/model.amxmi", true)); } public AmltModelReferencePostProcessorTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.097.tests/src/org/eclipse/app4mc/amalthea/converters097/tests/ComponentsModelConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.097.tests/src/org/eclipse/app4mc/amalthea/converters097/tests/ComponentsModelConverterTest.java index e674905..7ba0b89 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.097.tests/src/org/eclipse/app4mc/amalthea/converters097/tests/ComponentsModelConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.097.tests/src/org/eclipse/app4mc/amalthea/converters097/tests/ComponentsModelConverterTest.java
@@ -20,8 +20,8 @@ import java.lang.reflect.Field; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -51,7 +51,8 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/component/model.amxmi", true } }); + return Collections.singletonList( + data("/component/model.amxmi", true)); } public ComponentsModelConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.097.tests/src/org/eclipse/app4mc/amalthea/converters097/tests/ComponentsModelConverterTest2.java b/tests/org.eclipse.app4mc.amalthea.converters.097.tests/src/org/eclipse/app4mc/amalthea/converters097/tests/ComponentsModelConverterTest2.java index e360f10..ad67779 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.097.tests/src/org/eclipse/app4mc/amalthea/converters097/tests/ComponentsModelConverterTest2.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.097.tests/src/org/eclipse/app4mc/amalthea/converters097/tests/ComponentsModelConverterTest2.java
@@ -19,8 +19,8 @@ import java.lang.reflect.Field; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -48,7 +48,7 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - String[] inputFiles = { + String[] inputFiles = { "/component2/democar-common.amxmi", "/component2/democar-hw.amxmi", "/component2/democar-os.amxmi", @@ -56,7 +56,8 @@ "/component2/democar-stimuli.amxmi", "/component2/democar-sw.amxmi"}; - return Arrays.asList(new Object[][] { { inputFiles, true } }); + return Collections.singletonList( + data(inputFiles, true)); } public ComponentsModelConverterTest2(final String[] xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.097.tests/src/org/eclipse/app4mc/amalthea/converters097/tests/NamespaceConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.097.tests/src/org/eclipse/app4mc/amalthea/converters097/tests/NamespaceConverterTest.java index 3aba740..d38d5d2 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.097.tests/src/org/eclipse/app4mc/amalthea/converters097/tests/NamespaceConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.097.tests/src/org/eclipse/app4mc/amalthea/converters097/tests/NamespaceConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters097.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.junit.FixMethodOrder; @@ -31,7 +31,8 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/namespace/model.amxmi", true } }); + return Collections.singletonList( + data("/namespace/model.amxmi", true)); } public NamespaceConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.100.tests/src/org/eclipse/app4mc/amalthea/converters100/tests/EventModelConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.100.tests/src/org/eclipse/app4mc/amalthea/converters100/tests/EventModelConverterTest.java index e8bc0c7..7772693 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.100.tests/src/org/eclipse/app4mc/amalthea/converters100/tests/EventModelConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.100.tests/src/org/eclipse/app4mc/amalthea/converters100/tests/EventModelConverterTest.java
@@ -17,8 +17,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; @@ -40,7 +40,8 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/events/model.amxmi", true } }); + return Collections.singletonList( + data("/events/model.amxmi", true)); } public EventModelConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.100.tests/src/org/eclipse/app4mc/amalthea/converters100/tests/MeasurementModelConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.100.tests/src/org/eclipse/app4mc/amalthea/converters100/tests/MeasurementModelConverterTest.java index 2b0a3bc..4a5058e 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.100.tests/src/org/eclipse/app4mc/amalthea/converters100/tests/MeasurementModelConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.100.tests/src/org/eclipse/app4mc/amalthea/converters100/tests/MeasurementModelConverterTest.java
@@ -16,8 +16,8 @@ import static org.junit.Assert.assertTrue; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; @@ -39,7 +39,8 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/measurements/model.amxmi", true } }); + return Collections.singletonList( + data("/measurements/model.amxmi", true)); } public MeasurementModelConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.100.tests/src/org/eclipse/app4mc/amalthea/converters100/tests/NamespaceConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.100.tests/src/org/eclipse/app4mc/amalthea/converters100/tests/NamespaceConverterTest.java index 398d85f..051b94c 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.100.tests/src/org/eclipse/app4mc/amalthea/converters100/tests/NamespaceConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.100.tests/src/org/eclipse/app4mc/amalthea/converters100/tests/NamespaceConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters100.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.junit.FixMethodOrder; @@ -31,7 +31,8 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/namespace/model.amxmi", true } }); + return Collections.singletonList( + data("/namespace/model.amxmi", true)); } public NamespaceConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.200.tests/src/org/eclipse/app4mc/amalthea/converters200/tests/ConditionConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.200.tests/src/org/eclipse/app4mc/amalthea/converters200/tests/ConditionConverterTest.java index 9f8c063..b400edd 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.200.tests/src/org/eclipse/app4mc/amalthea/converters200/tests/ConditionConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.200.tests/src/org/eclipse/app4mc/amalthea/converters200/tests/ConditionConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters200.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.eclipse.app4mc.amalthea.converters200.impl.ConditionConverter; @@ -32,7 +32,8 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/conditions/conditions.amxmi", true } }); + return Collections.singletonList( + data("/conditions/conditions.amxmi", true)); } public ConditionConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.200.tests/src/org/eclipse/app4mc/amalthea/converters200/tests/NamespaceConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.200.tests/src/org/eclipse/app4mc/amalthea/converters200/tests/NamespaceConverterTest.java index 300da49..49ce47d 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.200.tests/src/org/eclipse/app4mc/amalthea/converters200/tests/NamespaceConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.200.tests/src/org/eclipse/app4mc/amalthea/converters200/tests/NamespaceConverterTest.java
@@ -14,8 +14,8 @@ package org.eclipse.app4mc.amalthea.converters200.tests; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import org.eclipse.app4mc.amalthea.converters.common.converter.NamespaceConverter; import org.junit.FixMethodOrder; @@ -31,7 +31,8 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { { "/namespace/model.amxmi", true } }); + return Collections.singletonList( + data("/namespace/model.amxmi", true)); } public NamespaceConverterTest(final String xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.200.tests/src/org/eclipse/app4mc/amalthea/converters200/tests/SchedulerConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.200.tests/src/org/eclipse/app4mc/amalthea/converters200/tests/SchedulerConverterTest.java index becb24c..a215a7c 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.200.tests/src/org/eclipse/app4mc/amalthea/converters200/tests/SchedulerConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.200.tests/src/org/eclipse/app4mc/amalthea/converters200/tests/SchedulerConverterTest.java
@@ -35,12 +35,11 @@ @Parameterized.Parameters(name = "{index}: Test file: {0}") public static Collection<Object[]> getTestData() { - return Arrays.asList(new Object[][] { - { new String[] {"/schedulers/model1.amxmi", "/schedulers/model2.amxmi", "/schedulers/model3.amxmi"}, true }, - { new String[] {"/schedulers/hierarchical/hierarchicalExample.amxmi"}, true }, - { new String[] {"/schedulers/partitioned_fpp/partitioned_fpp.amxmi"}, true }, - { new String[] {"/schedulers/reservation_based_server/rbs.amxmi"}, true } - }); + return Arrays.asList( + data(strings("/schedulers/model1.amxmi", "/schedulers/model2.amxmi", "/schedulers/model3.amxmi"), true), + data(strings("/schedulers/hierarchical/hierarchicalExample.amxmi"), true), + data(strings("/schedulers/partitioned_fpp/partitioned_fpp.amxmi"), true), + data(strings("/schedulers/reservation_based_server/rbs.amxmi"), true)); } public SchedulerConverterTest(final String[] xmlFileRelativeLocation, final boolean canExecuteTestCase) {
diff --git a/tests/org.eclipse.app4mc.amalthea.converters.common.tests/src/org/eclipse/app4mc/amalthea/converters/common/tests/AbstractConverterTest.java b/tests/org.eclipse.app4mc.amalthea.converters.common.tests/src/org/eclipse/app4mc/amalthea/converters/common/tests/AbstractConverterTest.java index 6e98ec6..5f59d8e 100644 --- a/tests/org.eclipse.app4mc.amalthea.converters.common.tests/src/org/eclipse/app4mc/amalthea/converters/common/tests/AbstractConverterTest.java +++ b/tests/org.eclipse.app4mc.amalthea.converters.common.tests/src/org/eclipse/app4mc/amalthea/converters/common/tests/AbstractConverterTest.java
@@ -59,6 +59,14 @@ public static final String GLOBAL_TEST_INPUT_DIRECTORY = "./TestModels/input"; public static final String GLOBAL_TEST_OUTPUT_DIRECTORY = "./TestModels/output"; + public static Object[] data(Object... args) { + return args; + } + + public static String[] strings(String... args) { + return args; + } + protected final HashMap<File, Document> fileDocumentMapping = new HashMap<>(); protected final HashMap<String, String> filenameInputOutputMapping = new HashMap<>();