Skip to content

Commit 597630c

Browse files
seidewitzseidewitz
committed
Checked expected results for FunctionExecutionTestCase.
1 parent 02d31fc commit 597630c

13 files changed

Lines changed: 10785 additions & 2800 deletions

‎org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/FUMLTest.java‎

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,16 @@
1515
import org.apache.commons.logging.Log;
1616
import org.apache.commons.logging.LogFactory;
1717

18+
import fUML.Semantics.Classes.Kernel.BooleanValue;
1819
import fUML.Semantics.Classes.Kernel.IntegerValue;
20+
import fUML.Semantics.Classes.Kernel.RealValue;
21+
import fUML.Semantics.Classes.Kernel.StringValue;
22+
import fUML.Semantics.Classes.Kernel.UnlimitedNaturalValue;
1923
import fUML.Semantics.Classes.Kernel.Value;
2024
import fUML.Semantics.Classes.Kernel.ValueList;
2125
import fUML.Semantics.CommonBehaviors.BasicBehaviors.ParameterValue;
26+
import fUML.Semantics.CommonBehaviors.BasicBehaviors.ParameterValueList;
27+
import fUML.Syntax.Classes.Kernel.Parameter;
2228

2329
/**
2430
*/
@@ -79,17 +85,43 @@ public static String getServerHost() {
7985
String hostName = System.getProperty("jbosstest.host.name", "localhost");
8086
return hostName;
8187
}
88+
89+
public static void assertEqualValues(String label, ParameterValueList parameterValues, String parameterName, Object...expectedValues) throws Exception {
90+
for (ParameterValue parameterValue: parameterValues) {
91+
Parameter parameter = parameterValue.parameter;
92+
if (parameter != null && parameterName.equals(parameter.name)) {
93+
assertEqualValues(label, parameterValue, expectedValues);
94+
return;
95+
}
96+
}
97+
fail(label + ": No such parameter.");
98+
}
8299

83-
public static void assertIntegerValues(String label, ParameterValue parameterValue, int... expectedValues) throws Exception {
84-
assertIntegerValues(label, parameterValue.values, expectedValues);
100+
public static void assertEqualValues(String label, ParameterValue parameterValue, Object... expectedValues) throws Exception {
101+
assertEqualValues(label, parameterValue.values, expectedValues);
85102
}
86103

87-
public static void assertIntegerValues(String label, ValueList values, int... expectedValues) throws Exception {
104+
public static void assertEqualValues(String label, ValueList values, Object... expectedValues) throws Exception {
88105
assertEquals(label + ": values.size()", expectedValues.length, values.size());
89106
for (int i = 0; i < values.size(); i++) {
90107
Value value = values.get(i);
91-
assertTrue(label + ": value[" + i + "] instanceof IntegerValue", value instanceof IntegerValue);
92-
assertEquals(label + ": value[" + i + "]", expectedValues[i], ((IntegerValue)value).value);
108+
assertEquals(label + ": value[" + i + "]", expectedValues[i], valueOf(value));
109+
}
110+
}
111+
112+
public static Object valueOf(Value value) {
113+
if (value instanceof BooleanValue) {
114+
return ((BooleanValue)value).value;
115+
} else if (value instanceof IntegerValue) {
116+
return ((IntegerValue)value).value;
117+
} else if (value instanceof RealValue) {
118+
return ((RealValue)value).value;
119+
} else if (value instanceof UnlimitedNaturalValue) {
120+
return ((UnlimitedNaturalValue)value).value.naturalValue;
121+
} else if (value instanceof StringValue) {
122+
return ((StringValue)value).value;
123+
} else {
124+
return null;
93125
}
94126
}
95127

‎org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/builtin/CentralBufferTestCase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public void testCentralBuffer() throws Exception {
2424

2525
assertNotNull(output);
2626
assertEquals("output.size()", 1, output.size());
27-
assertIntegerValues("testCentralBuffer.output", output.get(0), 0, 0);
27+
assertEqualValues("testCentralBuffer.output", output.get(0), 0, 0);
2828
}
2929

3030
}

‎org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/builtin/ConditionalNodeTestCase.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ public void testConditionalNode() throws Exception {
2727

2828
assertNotNull(output);
2929
assertEquals("output.size()", 3, output.size());
30-
assertIntegerValues("ConditionalNodeTester_1.output", output.get(0), 0);
31-
assertIntegerValues("ConditionalNodeTester_2.output", output.get(1), 1);
32-
assertIntegerValues("ConditionalNodeTester_3.output", output.get(2), 2);
30+
assertEqualValues("ConditionalNodeTester_1.output", output.get(0), 0);
31+
assertEqualValues("ConditionalNodeTester_2.output", output.get(1), 1);
32+
assertEqualValues("ConditionalNodeTester_3.output", output.get(2), 2);
3333
}
3434

3535
}

‎org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/builtin/DataStoreTestCase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public void testDataStore() throws Exception {
2424

2525
assertNotNull(output);
2626
assertEquals("output.size()", 1, output.size());
27-
assertIntegerValues("testDataStore.output", output.get(0), 1, 2);
27+
assertEqualValues("testDataStore.output", output.get(0), 1, 2);
2828
}
2929

3030
}

‎org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/builtin/ExpansionRegionTestCase.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ public void testExpansionRegion() throws Exception {
2727

2828
assertNotNull(output);
2929
assertEquals("output.size()", 6, output.size());
30-
assertIntegerValues("ExpansionRegionTester_0.list", output.get(0));
31-
assertIntegerValues("ExpansionRegionTester_0.list*10", output.get(1));
32-
assertIntegerValues("ExpansionRegionTester_1.list", output.get(2), 1);
33-
assertIntegerValues("ExpansionRegionTester_1.list*10", output.get(3), 10);
34-
assertIntegerValues("ExpansionRegionTester_2.list", output.get(4), 1, 2);
35-
assertIntegerValues("ExpansionRegionTester_2.list*10", output.get(5), 10, 20);
30+
assertEqualValues("ExpansionRegionTester_0.list", output.get(0));
31+
assertEqualValues("ExpansionRegionTester_0.list*10", output.get(1));
32+
assertEqualValues("ExpansionRegionTester_1.list", output.get(2), 1);
33+
assertEqualValues("ExpansionRegionTester_1.list*10", output.get(3), 10);
34+
assertEqualValues("ExpansionRegionTester_2.list", output.get(4), 1, 2);
35+
assertEqualValues("ExpansionRegionTester_2.list*10", output.get(5), 10, 20);
3636
}
3737

3838
}

‎org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/builtin/FireAgainTestCase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void testFireAgain() throws Exception {
2727

2828
assertNotNull(output);
2929
assertEquals("output.size()", 1, output.size());
30-
assertIntegerValues("FireAgainTester.output", output.get(0), 1, 2);
30+
assertEqualValues("FireAgainTester.output", output.get(0), 1, 2);
3131
}
3232

3333
}

‎org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/builtin/LoopNodeTestCase.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ public void testLoopNode() throws Exception {
2727

2828
assertNotNull(output);
2929
assertEquals("output.size()", 6, output.size());
30-
assertIntegerValues("LoopNodeTester_0.i", output.get(0), 0);
31-
assertIntegerValues("LoopNodeTester_0.n", output.get(1), 1);
32-
assertIntegerValues("LoopNodeTester_1.i", output.get(2), 0);
33-
assertIntegerValues("LoopNodeTester_1.n", output.get(3), 1);
34-
assertIntegerValues("LoopNodeTester_2.i", output.get(4), 0);
35-
assertIntegerValues("LoopNodeTester_2.n", output.get(5), 2);
30+
assertEqualValues("LoopNodeTester_0.i", output.get(0), 0);
31+
assertEqualValues("LoopNodeTester_0.n", output.get(1), 1);
32+
assertEqualValues("LoopNodeTester_1.i", output.get(2), 0);
33+
assertEqualValues("LoopNodeTester_1.n", output.get(3), 1);
34+
assertEqualValues("LoopNodeTester_2.i", output.get(4), 0);
35+
assertEqualValues("LoopNodeTester_2.n", output.get(5), 2);
3636
}
3737

3838
}

‎org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/builtin/SimpleActivitiesTestCase.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ public void testSimpleActivities() throws Exception {
2727

2828
assertNotNull(output);
2929
assertEquals("output.size()", 9, output.size());
30-
assertIntegerValues("Coper.output", output.get(0), 0);
31-
assertIntegerValues("CoperCaller.output", output.get(1), 0);
32-
assertIntegerValues("SimpleDecision0.output_0", output.get(2), 0);
33-
assertIntegerValues("SimpleDecision0.output_1", output.get(3));
34-
assertIntegerValues("SimpleDecision1.output_0", output.get(4));
35-
assertIntegerValues("SimpleDecision1.output_1", output.get(5), 1);
36-
assertIntegerValues("DecisionJoin.output", output.get(6), 0, 1);
37-
assertIntegerValues("ForkMerge", output.get(7), 0, 0);
38-
assertIntegerValues("ForkMergeData", output.get(8), 0, 0);
30+
assertEqualValues("Coper.output", output.get(0), 0);
31+
assertEqualValues("CoperCaller.output", output.get(1), 0);
32+
assertEqualValues("SimpleDecision0.output_0", output.get(2), 0);
33+
assertEqualValues("SimpleDecision0.output_1", output.get(3));
34+
assertEqualValues("SimpleDecision1.output_0", output.get(4));
35+
assertEqualValues("SimpleDecision1.output_1", output.get(5), 1);
36+
assertEqualValues("DecisionJoin.output", output.get(6), 0, 1);
37+
assertEqualValues("ForkMerge", output.get(7), 0, 0);
38+
assertEqualValues("ForkMergeData", output.get(8), 0, 0);
3939
}
4040

4141
}

‎org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/builtin/StructuredNodeTestCase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void testStructuredNode() throws Exception {
2727

2828
assertNotNull(output);
2929
assertEquals("output.size()", 1, output.size());
30-
assertIntegerValues("StructuredForkMergeInput.output", output.get(0), 0, 0);
30+
assertEqualValues("StructuredForkMergeInput.output", output.get(0), 0, 0);
3131
}
3232

3333
}

‎org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/builtin/WriterReaderTestCase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void testWriterReader() throws Exception {
2929

3030
assertNotNull(output);
3131
assertEquals("output.size()", 1, output.size());
32-
assertIntegerValues("TestClass_x_WriterReader.x", output.get(0), 0);
32+
assertEqualValues("TestClass_x_WriterReader.x", output.get(0), 0);
3333

3434
int x = ((IntegerValue)output.get(0).values.get(0)).value;
3535

@@ -40,7 +40,7 @@ public void testWriterReader() throws Exception {
4040
ExtensionalValue object = extent.get(0);
4141
assertEquals("object.featureValues.size()", 1, object.getFeatureValues().size());
4242
FeatureValue featureValue = object.getFeatureValues().get(0);
43-
assertIntegerValues("object.x", featureValue.values, x);
43+
assertEqualValues("object.x", featureValue.values, x);
4444
}
4545

4646
}

0 commit comments

Comments
 (0)