Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorytanguy2011-08-31 09:31:40 +0000
committerytanguy2011-08-31 09:31:40 +0000
commit3324d94fa9e6fec843012739f3ff9abadf5ab1fe (patch)
tree98d922b601aa4d2b463030889133ff09d6e0776c /tests
parent88925235dc57cc70a4cae641e759c3368a583cb4 (diff)
downloadorg.eclipse.papyrus-3324d94fa9e6fec843012739f3ff9abadf5ab1fe.tar.gz
org.eclipse.papyrus-3324d94fa9e6fec843012739f3ff9abadf5ab1fe.tar.xz
org.eclipse.papyrus-3324d94fa9e6fec843012739f3ff9abadf5ab1fe.zip
NEW - bug 352836: [SysML] Inappropriate non atomic flowPort icon
https://bugs.eclipse.org/bugs/show_bug.cgi?id=352836
Diffstat (limited to 'tests')
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPortTest.java22
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPropertyTest.java6
2 files changed, 11 insertions, 17 deletions
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPortTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPortTest.java
index f80e6a27e98..a254a3c052c 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPortTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPortTest.java
@@ -180,26 +180,20 @@ public class FlowPortTest extends TestCase {
Port p = fp0.getBase_Port();
Stereotype s = p.getAppliedStereotype(SysmlResource.FLOW_PORT_ID);
- // A = Atomic - NA = Not Atomic - NC = Not conjugated - C = Conjugated
- // Image i0 = s.getIcons().get(0); // A_IN
- Image i1 = s.getIcons().get(1); // A_OUT
- Image i2 = s.getIcons().get(2); // A_INOUT
- Image i3 = s.getIcons().get(3); // NA_C_IN
- // Image i4 = s.getIcons().get(4); // NA_C_OUT
- // Image i5 = s.getIcons().get(5); // NA_C_INOUT
- // Image i6 = s.getIcons().get(6); // NA_NC_IN
- // Image i7 = s.getIcons().get(7); // NA_NC_OUT
- // Image i8 = s.getIcons().get(8); // NA_NC_INOUT
-
- if(!fp0.getIcon().equals(i2)) {
+ //Image i0 = s.getIcons().get(1); // IN
+ Image i1 = s.getIcons().get(2); // OUT
+ Image i2 = s.getIcons().get(3); // INOUT
+ Image i3 = s.getIcons().get(4); // NA
+
+ if(!fp0.getIcon().equals(i2)) { // fp0 is INOUT
fail();
}
- if(!fp1.getIcon().equals(i1)) {
+ if(!fp1.getIcon().equals(i1)) { // fp1 is OUT
fail();
}
- if(!fp2.getIcon().equals(i3)) {
+ if(!fp2.getIcon().equals(i3)) { // fp2 is atomic
fail();
}
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPropertyTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPropertyTest.java
index 4c3727b9f7c..1dc244ecdd2 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPropertyTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPropertyTest.java
@@ -163,9 +163,9 @@ public class FlowPropertyTest extends TestCase {
Property p = fp0.getBase_Property();
Stereotype s = p.getAppliedStereotype(SysmlResource.FLOW_PROPERTY_ID);
- Image i0 = s.getIcons().get(0); // IN
- Image i1 = s.getIcons().get(1); // OUT
- Image i2 = s.getIcons().get(2); // INOUT
+ Image i0 = s.getIcons().get(1); // IN
+ Image i1 = s.getIcons().get(2); // OUT
+ Image i2 = s.getIcons().get(3); // INOUT
if(!fp0.getIcon().equals(i0)) {
fail();

Back to the top