diff options
| author | ytanguy | 2009-12-06 15:58:55 +0000 |
|---|---|---|
| committer | ytanguy | 2009-12-06 15:58:55 +0000 |
| commit | 83ae76540144acd6d6d523e54a90c38300f88cb6 (patch) | |
| tree | bb942576786c3481618591ad49e91f51c67edc0e /tests | |
| parent | 8dc1aa71cb70d9be381e0afd559725cda0c72b5e (diff) | |
| download | org.eclipse.papyrus-83ae76540144acd6d6d523e54a90c38300f88cb6.tar.gz org.eclipse.papyrus-83ae76540144acd6d6d523e54a90c38300f88cb6.tar.xz org.eclipse.papyrus-83ae76540144acd6d6d523e54a90c38300f88cb6.zip | |
NEW - bug 296327: [SysML] SysML static profile implementation
https://bugs.eclipse.org/bugs/show_bug.cgi?id=296327
Standard and SysML migrated for profile based diagram generation
Diffstat (limited to 'tests')
49 files changed, 429 insertions, 368 deletions
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ActivitiesTests.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ActivitiesTests.java index ef316f1ce41..ac508ff493c 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ActivitiesTests.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ActivitiesTests.java @@ -41,6 +41,14 @@ public class ActivitiesTests extends TestSuite { */
public static Test suite() {
TestSuite suite = new ActivitiesTests("activities Tests");
+ suite.addTestSuite(OptionnalTest.class);
+ suite.addTestSuite(RateTest.class);
+ suite.addTestSuite(ProbabilityTest.class);
+ suite.addTestSuite(ContinuousTest.class);
+ suite.addTestSuite(DiscreteTest.class);
+ suite.addTestSuite(ControlOperatorTest.class);
+ suite.addTestSuite(NoBufferTest.class);
+ suite.addTestSuite(OverwriteTest.class);
return suite;
}
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ContinuousTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ContinuousTest.java index f59a9645cae..fd92081ae11 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ContinuousTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ContinuousTest.java @@ -36,7 +36,8 @@ public class ContinuousTest extends RateTest { }
/**
- * Constructs a new Continuous test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Continuous test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -53,7 +54,7 @@ public class ContinuousTest extends RateTest { */
@Override
protected Continuous getFixture() {
- return (Continuous) fixture;
+ return (Continuous)fixture;
}
/**
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ControlOperatorTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ControlOperatorTest.java index 427105d237f..e5c8672db16 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ControlOperatorTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ControlOperatorTest.java @@ -45,7 +45,8 @@ public class ControlOperatorTest extends TestCase { protected ControlOperator fixture = null;
/**
- * Constructs a new Control Operator test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Control Operator test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -55,7 +56,8 @@ public class ControlOperatorTest extends TestCase { }
/**
- * Returns the fixture for this Control Operator test case. <!-- begin-user-doc --> <!--
+ * Returns the fixture for this Control Operator test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -65,7 +67,8 @@ public class ControlOperatorTest extends TestCase { }
/**
- * Sets the fixture for this Control Operator test case. <!-- begin-user-doc --> <!--
+ * Sets the fixture for this Control Operator test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/DiscreteTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/DiscreteTest.java index 08f2dc944c3..44c75211d52 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/DiscreteTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/DiscreteTest.java @@ -36,7 +36,8 @@ public class DiscreteTest extends RateTest { }
/**
- * Constructs a new Discrete test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Discrete test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -53,7 +54,7 @@ public class DiscreteTest extends RateTest { */
@Override
protected Discrete getFixture() {
- return (Discrete) fixture;
+ return (Discrete)fixture;
}
/**
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/NoBufferTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/NoBufferTest.java index f379e371838..1c99239b95c 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/NoBufferTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/NoBufferTest.java @@ -37,14 +37,16 @@ public class NoBufferTest extends TestCase { }
/**
- * The fixture for this No Buffer test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The fixture for this No Buffer test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
protected NoBuffer fixture = null;
/**
- * Constructs a new No Buffer test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new No Buffer test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -64,7 +66,8 @@ public class NoBufferTest extends TestCase { }
/**
- * Sets the fixture for this No Buffer test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this No Buffer test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/OptionnalTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/OptionnalTest.java index aa4e106a325..b1d9bfe5355 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/OptionnalTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/OptionnalTest.java @@ -37,14 +37,16 @@ public class OptionnalTest extends TestCase { }
/**
- * The fixture for this Optionnal test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The fixture for this Optionnal test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
protected Optionnal fixture = null;
/**
- * Constructs a new Optionnal test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Optionnal test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -64,7 +66,8 @@ public class OptionnalTest extends TestCase { }
/**
- * Sets the fixture for this Optionnal test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this Optionnal test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/OverwriteTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/OverwriteTest.java index 55a5f09c564..a427943b6d1 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/OverwriteTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/OverwriteTest.java @@ -37,14 +37,16 @@ public class OverwriteTest extends TestCase { }
/**
- * The fixture for this Overwrite test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The fixture for this Overwrite test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
protected Overwrite fixture = null;
/**
- * Constructs a new Overwrite test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Overwrite test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -64,7 +66,8 @@ public class OverwriteTest extends TestCase { }
/**
- * Sets the fixture for this Overwrite test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this Overwrite test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ProbabilityTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ProbabilityTest.java index 14b2370f071..dfaee358a08 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ProbabilityTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ProbabilityTest.java @@ -37,14 +37,16 @@ public class ProbabilityTest extends TestCase { }
/**
- * The fixture for this Probability test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The fixture for this Probability test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
protected Probability fixture = null;
/**
- * Constructs a new Probability test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Probability test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/RateTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/RateTest.java index a2f334e8936..5c29be85228 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/RateTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/RateTest.java @@ -37,14 +37,16 @@ public class RateTest extends TestCase { }
/**
- * The fixture for this Rate test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The fixture for this Rate test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
protected Rate fixture = null;
/**
- * Constructs a new Rate test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Rate test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -54,7 +56,8 @@ public class RateTest extends TestCase { }
/**
- * Returns the fixture for this Rate test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the fixture for this Rate test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@@ -63,7 +66,8 @@ public class RateTest extends TestCase { }
/**
- * Sets the fixture for this Rate test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this Rate test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocateActivityPartitionTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocateActivityPartitionTest.java index 618f8066bb5..b33f450c2f5 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocateActivityPartitionTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocateActivityPartitionTest.java @@ -20,8 +20,7 @@ import org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition; import org.eclipse.papyrus.sysml.allocations.AllocationsFactory;
/**
- * <!-- begin-user-doc --> A test case for the model object '
- * <em><b>Allocate Activity Partition</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A test case for the model object ' <em><b>Allocate Activity Partition</b></em>'. <!-- end-user-doc -->
*
* @generated
*/
@@ -37,7 +36,8 @@ public class AllocateActivityPartitionTest extends TestCase { }
/**
- * The fixture for this Allocate Activity Partition test case. <!-- begin-user-doc --> <!--
+ * The fixture for this Allocate Activity Partition test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -55,7 +55,8 @@ public class AllocateActivityPartitionTest extends TestCase { }
/**
- * Returns the fixture for this Allocate Activity Partition test case. <!-- begin-user-doc -->
+ * Returns the fixture for this Allocate Activity Partition test case.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @generated
@@ -65,7 +66,8 @@ public class AllocateActivityPartitionTest extends TestCase { }
/**
- * Sets the fixture for this Allocate Activity Partition test case. <!-- begin-user-doc --> <!--
+ * Sets the fixture for this Allocate Activity Partition test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocateTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocateTest.java index 435f1b2bd8f..05bb1a77dcc 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocateTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocateTest.java @@ -37,14 +37,16 @@ public class AllocateTest extends TestCase { }
/**
- * The fixture for this Allocate test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The fixture for this Allocate test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
protected Allocate fixture = null;
/**
- * Constructs a new Allocate test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Allocate test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -64,7 +66,8 @@ public class AllocateTest extends TestCase { }
/**
- * Sets the fixture for this Allocate test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this Allocate test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocatedTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocatedTest.java index 131bf7b2f69..e08debf4edc 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocatedTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocatedTest.java @@ -31,10 +31,8 @@ import org.eclipse.uml2.uml.UMLFactory; * <p>
* The following features are tested:
* <ul>
- * <li>{@link org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedFrom() <em>Allocated From
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedTo() <em>Allocated To
- * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedFrom() <em>Allocated From</em>}</li>
+ * <li>{@link org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedTo() <em>Allocated To</em>}</li>
* </ul>
* </p>
*
@@ -85,7 +83,8 @@ public class AllocatedTest extends TestCase { protected Model model = null;
/**
- * Constructs a new Allocated test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Allocated test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -105,7 +104,8 @@ public class AllocatedTest extends TestCase { }
/**
- * Sets the fixture for this Allocated test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this Allocated test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@@ -125,11 +125,11 @@ public class AllocatedTest extends TestCase { // Prepare test
model = SysMLTestResources.createSysMLModel();
- if (model == null) {
+ if(model == null) {
fail();
}
- if (model.getAppliedProfiles().isEmpty()) {
+ if(model.getAppliedProfiles().isEmpty()) {
fail();
}
@@ -141,11 +141,11 @@ public class AllocatedTest extends TestCase { c4 = model.createOwnedClass("C4", false);
// Add Allocated stereotype
- ac0 = (Allocated) c0.applyStereotype(c0.getApplicableStereotype(ALLOCATED_ID));
- ac1 = (Allocated) c1.applyStereotype(c1.getApplicableStereotype(ALLOCATED_ID));
- ac2 = (Allocated) c2.applyStereotype(c2.getApplicableStereotype(ALLOCATED_ID));
- ac3 = (Allocated) c3.applyStereotype(c3.getApplicableStereotype(ALLOCATED_ID));
- ac4 = (Allocated) c4.applyStereotype(c4.getApplicableStereotype(ALLOCATED_ID));
+ ac0 = (Allocated)c0.applyStereotype(c0.getApplicableStereotype(ALLOCATED_ID));
+ ac1 = (Allocated)c1.applyStereotype(c1.getApplicableStereotype(ALLOCATED_ID));
+ ac2 = (Allocated)c2.applyStereotype(c2.getApplicableStereotype(ALLOCATED_ID));
+ ac3 = (Allocated)c3.applyStereotype(c3.getApplicableStereotype(ALLOCATED_ID));
+ ac4 = (Allocated)c4.applyStereotype(c4.getApplicableStereotype(ALLOCATED_ID));
// Add Abstractions with allocate stereotype
// c1 -> c2, c3
@@ -155,21 +155,21 @@ public class AllocatedTest extends TestCase { c1_c2.getSuppliers().add(c2);
model.getPackagedElements().add(c1_c2);
@SuppressWarnings("unused")
- Allocate a_c1_c2 = (Allocate) c1_c2.applyStereotype(c1_c2.getApplicableStereotype(ALLOCATE_ID));
+ Allocate a_c1_c2 = (Allocate)c1_c2.applyStereotype(c1_c2.getApplicableStereotype(ALLOCATE_ID));
Abstraction c1_c3 = UMLFactory.eINSTANCE.createAbstraction();
model.getPackagedElements().add(c1_c3);
c1_c3.getClients().add(c1);
c1_c3.getSuppliers().add(c3);
@SuppressWarnings("unused")
- Allocate a_c1_c3 = (Allocate) c1_c3.applyStereotype(c1_c3.getApplicableStereotype(ALLOCATE_ID));
+ Allocate a_c1_c3 = (Allocate)c1_c3.applyStereotype(c1_c3.getApplicableStereotype(ALLOCATE_ID));
Abstraction c4_c3 = UMLFactory.eINSTANCE.createAbstraction();
model.getPackagedElements().add(c4_c3);
c4_c3.getClients().add(c4);
c4_c3.getSuppliers().add(c3);
@SuppressWarnings("unused")
- Allocate a_c4_c3 = (Allocate) c4_c3.applyStereotype(c4_c3.getApplicableStereotype(ALLOCATE_ID));
+ Allocate a_c4_c3 = (Allocate)c4_c3.applyStereotype(c4_c3.getApplicableStereotype(ALLOCATE_ID));
}
@@ -194,17 +194,17 @@ public class AllocatedTest extends TestCase { public void testGetAllocatedFrom() {
// Verifies : ac0.getAllocatedFrom = []
- if (!ac0.getAllocatedFrom().isEmpty()) {
+ if(!ac0.getAllocatedFrom().isEmpty()) {
fail();
}
// Verifies : ac2.getAllocatedFrom = [c1]
- if (!ac2.getAllocatedFrom().contains(c1)) {
+ if(!ac2.getAllocatedFrom().contains(c1)) {
fail();
}
// Verifies : ac3.getAllocatedFrom = [c1, c4]
- if (!(ac3.getAllocatedFrom().contains(c1) && ac3.getAllocatedFrom().contains(c4))) {
+ if(!(ac3.getAllocatedFrom().contains(c1) && ac3.getAllocatedFrom().contains(c4))) {
fail();
}
}
@@ -219,17 +219,17 @@ public class AllocatedTest extends TestCase { public void testGetAllocatedTo() {
// Verifies : ac0.getAllocatedTo = []
- if (!ac0.getAllocatedTo().isEmpty()) {
+ if(!ac0.getAllocatedTo().isEmpty()) {
fail();
}
// Verifies : ac0.getAllocatedTo = [c2, c3]
- if (!(ac1.getAllocatedTo().contains(c2) && ac1.getAllocatedTo().contains(c3))) {
+ if(!(ac1.getAllocatedTo().contains(c2) && ac1.getAllocatedTo().contains(c3))) {
fail();
}
// Verifies : ac4.getAllocatedTo = [c3]
- if (!ac4.getAllocatedTo().contains(c3)) {
+ if(!ac4.getAllocatedTo().contains(c3)) {
fail();
}
}
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocationsTests.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocationsTests.java index 938682e8d6d..09633837457 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocationsTests.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocationsTests.java @@ -37,7 +37,7 @@ public class AllocationsTests extends TestSuite { /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
- * @generated
+ * @generated NOT
*/
public static Test suite() {
TestSuite suite = new AllocationsTests("allocations Tests");
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BindingConnectorTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BindingConnectorTest.java index ddb88222354..d324e25bd04 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BindingConnectorTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BindingConnectorTest.java @@ -45,7 +45,8 @@ public class BindingConnectorTest extends TestCase { protected BindingConnector fixture = null;
/**
- * Constructs a new Binding Connector test case with the given name. <!-- begin-user-doc -->
+ * Constructs a new Binding Connector test case with the given name.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @generated
@@ -55,7 +56,8 @@ public class BindingConnectorTest extends TestCase { }
/**
- * Returns the fixture for this Binding Connector test case. <!-- begin-user-doc --> <!--
+ * Returns the fixture for this Binding Connector test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -65,7 +67,8 @@ public class BindingConnectorTest extends TestCase { }
/**
- * Sets the fixture for this Binding Connector test case. <!-- begin-user-doc --> <!--
+ * Sets the fixture for this Binding Connector test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BlockTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BlockTest.java index f73e5d60495..eae9da8180d 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BlockTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BlockTest.java @@ -37,14 +37,16 @@ public class BlockTest extends TestCase { }
/**
- * The fixture for this Block test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The fixture for this Block test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
protected Block fixture = null;
/**
- * Constructs a new Block test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Block test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -54,7 +56,8 @@ public class BlockTest extends TestCase { }
/**
- * Returns the fixture for this Block test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the fixture for this Block test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@@ -63,7 +66,8 @@ public class BlockTest extends TestCase { }
/**
- * Sets the fixture for this Block test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this Block test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BlocksTests.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BlocksTests.java index 5302e261b72..8903fae1ab5 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BlocksTests.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BlocksTests.java @@ -41,6 +41,16 @@ public class BlocksTests extends TestSuite { */
public static Test suite() {
TestSuite suite = new BlocksTests("blocks Tests");
+ suite.addTestSuite(BlockTest.class);
+ suite.addTestSuite(DistributedPropertyTest.class);
+ suite.addTestSuite(DimensionTest.class);
+ suite.addTestSuite(UnitTest.class);
+ suite.addTestSuite(ValueTypeTest.class);
+ suite.addTestSuite(NestedConnectorEndTest.class);
+ suite.addTestSuite(ParticipantPropertyTest.class);
+ suite.addTestSuite(ConnectorPropertyTest.class);
+ suite.addTestSuite(BindingConnectorTest.class);
+ suite.addTestSuite(PropertySpecificTypeTest.class);
return suite;
}
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ConnectorPropertyTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ConnectorPropertyTest.java index fba96b42302..0be8adf1f47 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ConnectorPropertyTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ConnectorPropertyTest.java @@ -45,7 +45,8 @@ public class ConnectorPropertyTest extends TestCase { protected ConnectorProperty fixture = null;
/**
- * Constructs a new Connector Property test case with the given name. <!-- begin-user-doc -->
+ * Constructs a new Connector Property test case with the given name.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @generated
@@ -55,7 +56,8 @@ public class ConnectorPropertyTest extends TestCase { }
/**
- * Returns the fixture for this Connector Property test case. <!-- begin-user-doc --> <!--
+ * Returns the fixture for this Connector Property test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -65,7 +67,8 @@ public class ConnectorPropertyTest extends TestCase { }
/**
- * Sets the fixture for this Connector Property test case. <!-- begin-user-doc --> <!--
+ * Sets the fixture for this Connector Property test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/DimensionTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/DimensionTest.java index 77cb131b9d4..e26bf0c78b9 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/DimensionTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/DimensionTest.java @@ -37,14 +37,16 @@ public class DimensionTest extends TestCase { }
/**
- * The fixture for this Dimension test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The fixture for this Dimension test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
protected Dimension fixture = null;
/**
- * Constructs a new Dimension test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Dimension test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -64,7 +66,8 @@ public class DimensionTest extends TestCase { }
/**
- * Sets the fixture for this Dimension test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this Dimension test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/DistributedPropertyTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/DistributedPropertyTest.java index 83886883b34..a5c7e3980ea 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/DistributedPropertyTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/DistributedPropertyTest.java @@ -37,7 +37,8 @@ public class DistributedPropertyTest extends TestCase { }
/**
- * The fixture for this Distributed Property test case. <!-- begin-user-doc --> <!--
+ * The fixture for this Distributed Property test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -45,7 +46,8 @@ public class DistributedPropertyTest extends TestCase { protected DistributedProperty fixture = null;
/**
- * Constructs a new Distributed Property test case with the given name. <!-- begin-user-doc -->
+ * Constructs a new Distributed Property test case with the given name.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @generated
@@ -55,7 +57,8 @@ public class DistributedPropertyTest extends TestCase { }
/**
- * Returns the fixture for this Distributed Property test case. <!-- begin-user-doc --> <!--
+ * Returns the fixture for this Distributed Property test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -65,7 +68,8 @@ public class DistributedPropertyTest extends TestCase { }
/**
- * Sets the fixture for this Distributed Property test case. <!-- begin-user-doc --> <!--
+ * Sets the fixture for this Distributed Property test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/NestedConnectorEndTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/NestedConnectorEndTest.java index 815ecd1218d..9359f0614c3 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/NestedConnectorEndTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/NestedConnectorEndTest.java @@ -37,7 +37,8 @@ public class NestedConnectorEndTest extends TestCase { }
/**
- * The fixture for this Nested Connector End test case. <!-- begin-user-doc --> <!--
+ * The fixture for this Nested Connector End test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -45,7 +46,8 @@ public class NestedConnectorEndTest extends TestCase { protected NestedConnectorEnd fixture = null;
/**
- * Constructs a new Nested Connector End test case with the given name. <!-- begin-user-doc -->
+ * Constructs a new Nested Connector End test case with the given name.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @generated
@@ -55,7 +57,8 @@ public class NestedConnectorEndTest extends TestCase { }
/**
- * Returns the fixture for this Nested Connector End test case. <!-- begin-user-doc --> <!--
+ * Returns the fixture for this Nested Connector End test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -65,7 +68,8 @@ public class NestedConnectorEndTest extends TestCase { }
/**
- * Sets the fixture for this Nested Connector End test case. <!-- begin-user-doc --> <!--
+ * Sets the fixture for this Nested Connector End test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ParticipantPropertyTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ParticipantPropertyTest.java index cdcacb5fd86..8a0dfb4d99e 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ParticipantPropertyTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ParticipantPropertyTest.java @@ -37,7 +37,8 @@ public class ParticipantPropertyTest extends TestCase { }
/**
- * The fixture for this Participant Property test case. <!-- begin-user-doc --> <!--
+ * The fixture for this Participant Property test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -45,7 +46,8 @@ public class ParticipantPropertyTest extends TestCase { protected ParticipantProperty fixture = null;
/**
- * Constructs a new Participant Property test case with the given name. <!-- begin-user-doc -->
+ * Constructs a new Participant Property test case with the given name.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @generated
@@ -55,7 +57,8 @@ public class ParticipantPropertyTest extends TestCase { }
/**
- * Returns the fixture for this Participant Property test case. <!-- begin-user-doc --> <!--
+ * Returns the fixture for this Participant Property test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -65,7 +68,8 @@ public class ParticipantPropertyTest extends TestCase { }
/**
- * Sets the fixture for this Participant Property test case. <!-- begin-user-doc --> <!--
+ * Sets the fixture for this Participant Property test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/PropertySpecificTypeTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/PropertySpecificTypeTest.java index 4fa145bdff9..99d5af5f35e 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/PropertySpecificTypeTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/PropertySpecificTypeTest.java @@ -20,8 +20,7 @@ import org.eclipse.papyrus.sysml.blocks.BlocksFactory; import org.eclipse.papyrus.sysml.blocks.PropertySpecificType;
/**
- * <!-- begin-user-doc --> A test case for the model object '<em><b>Property Specific Type</b></em>
- * '. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> A test case for the model object '<em><b>Property Specific Type</b></em> '. <!-- end-user-doc -->
*
* @generated
*/
@@ -37,7 +36,8 @@ public class PropertySpecificTypeTest extends TestCase { }
/**
- * The fixture for this Property Specific Type test case. <!-- begin-user-doc --> <!--
+ * The fixture for this Property Specific Type test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -45,7 +45,8 @@ public class PropertySpecificTypeTest extends TestCase { protected PropertySpecificType fixture = null;
/**
- * Constructs a new Property Specific Type test case with the given name. <!-- begin-user-doc
+ * Constructs a new Property Specific Type test case with the given name.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
*
* @generated
@@ -55,7 +56,8 @@ public class PropertySpecificTypeTest extends TestCase { }
/**
- * Returns the fixture for this Property Specific Type test case. <!-- begin-user-doc --> <!--
+ * Returns the fixture for this Property Specific Type test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -65,7 +67,8 @@ public class PropertySpecificTypeTest extends TestCase { }
/**
- * Sets the fixture for this Property Specific Type test case. <!-- begin-user-doc --> <!--
+ * Sets the fixture for this Property Specific Type test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/UnitTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/UnitTest.java index 4b9cc0d4656..699f437bcab 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/UnitTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/UnitTest.java @@ -37,14 +37,16 @@ public class UnitTest extends TestCase { }
/**
- * The fixture for this Unit test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The fixture for this Unit test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
protected Unit fixture = null;
/**
- * Constructs a new Unit test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Unit test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -54,7 +56,8 @@ public class UnitTest extends TestCase { }
/**
- * Returns the fixture for this Unit test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the fixture for this Unit test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@@ -63,7 +66,8 @@ public class UnitTest extends TestCase { }
/**
- * Sets the fixture for this Unit test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this Unit test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ValueTypeTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ValueTypeTest.java index 783af5f3159..27b26b17878 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ValueTypeTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ValueTypeTest.java @@ -37,14 +37,16 @@ public class ValueTypeTest extends TestCase { }
/**
- * The fixture for this Value Type test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The fixture for this Value Type test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
protected ValueType fixture = null;
/**
- * Constructs a new Value Type test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Value Type test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -64,7 +66,8 @@ public class ValueTypeTest extends TestCase { }
/**
- * Sets the fixture for this Value Type test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this Value Type test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintBlockTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintBlockTest.java index fcff2241d9d..7fcb6e940e8 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintBlockTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintBlockTest.java @@ -37,7 +37,8 @@ public class ConstraintBlockTest extends BlockTest { }
/**
- * Constructs a new Constraint Block test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Constraint Block test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -47,14 +48,15 @@ public class ConstraintBlockTest extends BlockTest { }
/**
- * Returns the fixture for this Constraint Block test case. <!-- begin-user-doc --> <!--
+ * Returns the fixture for this Constraint Block test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
*/
@Override
protected ConstraintBlock getFixture() {
- return (ConstraintBlock) fixture;
+ return (ConstraintBlock)fixture;
}
/**
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintPropertyTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintPropertyTest.java index 2888d348d69..eb648ebb3a4 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintPropertyTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintPropertyTest.java @@ -45,7 +45,8 @@ public class ConstraintPropertyTest extends TestCase { protected ConstraintProperty fixture = null;
/**
- * Constructs a new Constraint Property test case with the given name. <!-- begin-user-doc -->
+ * Constructs a new Constraint Property test case with the given name.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @generated
@@ -55,7 +56,8 @@ public class ConstraintPropertyTest extends TestCase { }
/**
- * Returns the fixture for this Constraint Property test case. <!-- begin-user-doc --> <!--
+ * Returns the fixture for this Constraint Property test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -65,7 +67,8 @@ public class ConstraintPropertyTest extends TestCase { }
/**
- * Sets the fixture for this Constraint Property test case. <!-- begin-user-doc --> <!--
+ * Sets the fixture for this Constraint Property test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintsTests.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintsTests.java index a3a149d8331..593cb32c05b 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintsTests.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintsTests.java @@ -41,6 +41,8 @@ public class ConstraintsTests extends TestSuite { */
public static Test suite() {
TestSuite suite = new ConstraintsTests("constraints Tests");
+ suite.addTestSuite(ConstraintBlockTest.class);
+ suite.addTestSuite(ConstraintPropertyTest.class);
return suite;
}
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ConformTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ConformTest.java index 038059e6add..62db0626395 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ConformTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ConformTest.java @@ -37,14 +37,16 @@ public class ConformTest extends TestCase { }
/**
- * The fixture for this Conform test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The fixture for this Conform test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
protected Conform fixture = null;
/**
- * Constructs a new Conform test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Conform test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -54,7 +56,8 @@ public class ConformTest extends TestCase { }
/**
- * Returns the fixture for this Conform test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the fixture for this Conform test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@@ -63,7 +66,8 @@ public class ConformTest extends TestCase { }
/**
- * Sets the fixture for this Conform test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this Conform test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ModelelementsTests.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ModelelementsTests.java index 2c71f64cd60..1fa1b74945a 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ModelelementsTests.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ModelelementsTests.java @@ -37,7 +37,7 @@ public class ModelelementsTests extends TestSuite { /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
- * @generated
+ * @generated NOT
*/
public static Test suite() {
TestSuite suite = new ModelelementsTests("modelelements Tests");
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ProblemTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ProblemTest.java index b82ca3d112e..a5dfc2f3c4b 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ProblemTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ProblemTest.java @@ -37,14 +37,16 @@ public class ProblemTest extends TestCase { }
/**
- * The fixture for this Problem test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The fixture for this Problem test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
protected Problem fixture = null;
/**
- * Constructs a new Problem test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Problem test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -54,7 +56,8 @@ public class ProblemTest extends TestCase { }
/**
- * Returns the fixture for this Problem test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the fixture for this Problem test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@@ -63,7 +66,8 @@ public class ProblemTest extends TestCase { }
/**
- * Sets the fixture for this Problem test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this Problem test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/RationaleTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/RationaleTest.java index 8bc9337502f..520718d671b 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/RationaleTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/RationaleTest.java @@ -37,14 +37,16 @@ public class RationaleTest extends TestCase { }
/**
- * The fixture for this Rationale test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The fixture for this Rationale test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
protected Rationale fixture = null;
/**
- * Constructs a new Rationale test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Rationale test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -64,7 +66,8 @@ public class RationaleTest extends TestCase { }
/**
- * Sets the fixture for this Rationale test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this Rationale test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/SysmlAllTests.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/SysmlAllTests.java deleted file mode 100644 index 69ca34bc51c..00000000000 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/SysmlAllTests.java +++ /dev/null @@ -1,63 +0,0 @@ -/*****************************************************************************
- * Copyright (c) 2009 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelelements.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.papyrus.sysml.allocations.tests.AllocationsTests;
-import org.eclipse.papyrus.sysml.portandflows.tests.PortandflowsTests;
-import org.eclipse.papyrus.sysml.requirements.tests.RequirementsTests;
-
-/**
- * <!-- begin-user-doc --> A test suite for the '<em><b>Sysml</b></em>' model. <!-- end-user-doc -->
- *
- * @generated
- */
-public class SysmlAllTests extends TestSuite {
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(suite());
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public static Test suite() {
- TestSuite suite = new SysmlAllTests("Sysml Tests");
- suite.addTest(ModelelementsTests.suite());
- suite.addTest(PortandflowsTests.suite());
- suite.addTest(AllocationsTests.suite());
- suite.addTest(RequirementsTests.suite());
- return suite;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public SysmlAllTests(String name) {
- super(name);
- }
-
-} // SysmlAllTests
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewPointTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewPointTest.java index d333ca9a067..3e9b9de97e1 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewPointTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewPointTest.java @@ -37,14 +37,16 @@ public class ViewPointTest extends TestCase { }
/**
- * The fixture for this View Point test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The fixture for this View Point test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
protected ViewPoint fixture = null;
/**
- * Constructs a new View Point test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new View Point test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -64,7 +66,8 @@ public class ViewPointTest extends TestCase { }
/**
- * Sets the fixture for this View Point test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this View Point test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewTest.java index 8ee2b6eb5ed..450b5fabf00 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewTest.java @@ -78,7 +78,8 @@ public class ViewTest extends TestCase { protected Model model = null;
/**
- * Constructs a new View test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new View test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -88,7 +89,8 @@ public class ViewTest extends TestCase { }
/**
- * Returns the fixture for this View test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the fixture for this View test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@@ -97,7 +99,8 @@ public class ViewTest extends TestCase { }
/**
- * Sets the fixture for this View test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this View test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@@ -117,11 +120,11 @@ public class ViewTest extends TestCase { // Prepare test
model = SysMLTestResources.createSysMLModel();
- if (model == null) {
+ if(model == null) {
fail();
}
- if (model.getAppliedProfiles().isEmpty()) {
+ if(model.getAppliedProfiles().isEmpty()) {
fail();
}
@@ -133,11 +136,11 @@ public class ViewTest extends TestCase { c1 = model.createOwnedClass("c1", false);
// Add View stereotype
- v0 = (View) p0.applyStereotype(p0.getApplicableStereotype(VIEW_ID));
- v1 = (View) p1.applyStereotype(p1.getApplicableStereotype(VIEW_ID));
+ v0 = (View)p0.applyStereotype(p0.getApplicableStereotype(VIEW_ID));
+ v1 = (View)p1.applyStereotype(p1.getApplicableStereotype(VIEW_ID));
// Add ViewPoint stereotype
- vp1 = (ViewPoint) c1.applyStereotype(c1.getApplicableStereotype(VIEWPOINT_ID));
+ vp1 = (ViewPoint)c1.applyStereotype(c1.getApplicableStereotype(VIEWPOINT_ID));
// Add Abstractions with allocate stereotype
// v1 (p1) -> vp1 (c1)
@@ -146,7 +149,7 @@ public class ViewTest extends TestCase { v1_vp1.getSuppliers().add(c1);
model.getPackagedElements().add(v1_vp1);
@SuppressWarnings("unused")
- Conform c_v1_vp1 = (Conform) v1_vp1.applyStereotype(v1_vp1.getApplicableStereotype(CONFORM_ID));
+ Conform c_v1_vp1 = (Conform)v1_vp1.applyStereotype(v1_vp1.getApplicableStereotype(CONFORM_ID));
}
@@ -171,12 +174,12 @@ public class ViewTest extends TestCase { public void testGetViewPoint() {
// Verifies : v0.getViewPoint = []
- if (v0.getViewPoint() != null) {
+ if(v0.getViewPoint() != null) {
fail();
}
// Verifies : v1.getViewPoint = vp1
- if (!v1.getViewPoint().equals(vp1)) {
+ if(!v1.getViewPoint().equals(vp1)) {
fail();
}
}
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPortTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPortTest.java index 5f661c0b01e..c675639dd61 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPortTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPortTest.java @@ -90,7 +90,8 @@ public class FlowPortTest extends TestCase { protected Model model = null;
/**
- * Constructs a new Flow Port test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Flow Port test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -110,7 +111,8 @@ public class FlowPortTest extends TestCase { }
/**
- * Sets the fixture for this Flow Port test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this Flow Port test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@@ -130,11 +132,11 @@ public class FlowPortTest extends TestCase { // Prepare test
model = SysMLTestResources.createSysMLModel();
- if (model == null) {
+ if(model == null) {
fail();
}
- if (model.getAppliedProfiles().isEmpty()) {
+ if(model.getAppliedProfiles().isEmpty()) {
fail();
}
@@ -151,15 +153,15 @@ public class FlowPortTest extends TestCase { p2 = c0.createOwnedPort("p2", i2);
// Add FlowPort stereotypes
- fp0 = (FlowPort) p0.applyStereotype(p0.getApplicableStereotype(FLOWPORT_ID));
- fp1 = (FlowPort) p1.applyStereotype(p1.getApplicableStereotype(FLOWPORT_ID));
+ fp0 = (FlowPort)p0.applyStereotype(p0.getApplicableStereotype(FLOWPORT_ID));
+ fp1 = (FlowPort)p1.applyStereotype(p1.getApplicableStereotype(FLOWPORT_ID));
fp1.setDirection(FlowDirection.OUT);
- fp2 = (FlowPort) p2.applyStereotype(p2.getApplicableStereotype(FLOWPORT_ID));
+ fp2 = (FlowPort)p2.applyStereotype(p2.getApplicableStereotype(FLOWPORT_ID));
fp2.setDirection(FlowDirection.IN);
fp2.setIsConjugated(true);
// Add FlowSpecification
- fsp2 = (FlowSpecification) i2.applyStereotype(i2.getApplicableStereotype(FLOWSPECIFICATION_ID));
+ fsp2 = (FlowSpecification)i2.applyStereotype(i2.getApplicableStereotype(FLOWSPECIFICATION_ID));
}
/**
@@ -197,15 +199,15 @@ public class FlowPortTest extends TestCase { // Image i7 = s.getIcons().get(7); // NA_NC_OUT
// Image i8 = s.getIcons().get(8); // NA_NC_INOUT
- if (!fp0.getIcon().equals(i2)) {
+ if(!fp0.getIcon().equals(i2)) {
fail();
}
- if (!fp1.getIcon().equals(i1)) {
+ if(!fp1.getIcon().equals(i1)) {
fail();
}
- if (!fp2.getIcon().equals(i3)) {
+ if(!fp2.getIcon().equals(i3)) {
fail();
}
}
@@ -220,17 +222,17 @@ public class FlowPortTest extends TestCase { public void testIsIsAtomic() {
// FlowPort without type is Atomic
- if (!fp0.isIsAtomic()) {
+ if(!fp0.isIsAtomic()) {
fail();
}
// FlowPort type is not a FlowSpecification
- if (!fp1.isIsAtomic()) {
+ if(!fp1.isIsAtomic()) {
fail();
}
// FlowPort type is a FlowSpecification
- if (fp2.isIsAtomic()) {
+ if(fp2.isIsAtomic()) {
fail();
}
}
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPropertyTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPropertyTest.java index 88dc10334d0..dddab2754f6 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPropertyTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPropertyTest.java @@ -69,7 +69,8 @@ public class FlowPropertyTest extends TestCase { protected Model model = null;
/**
- * Constructs a new Flow Property test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Flow Property test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -79,7 +80,8 @@ public class FlowPropertyTest extends TestCase { }
/**
- * Returns the fixture for this Flow Property test case. <!-- begin-user-doc --> <!--
+ * Returns the fixture for this Flow Property test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -110,11 +112,11 @@ public class FlowPropertyTest extends TestCase { // Prepare test
model = SysMLTestResources.createSysMLModel();
- if (model == null) {
+ if(model == null) {
fail();
}
- if (model.getAppliedProfiles().isEmpty()) {
+ if(model.getAppliedProfiles().isEmpty()) {
fail();
}
@@ -127,13 +129,13 @@ public class FlowPropertyTest extends TestCase { Property p2 = i.createOwnedAttribute("p2", null);
// Add FlowPort stereotypes
- fp0 = (FlowProperty) p0.applyStereotype(p0.getApplicableStereotype(FLOWPROPERTY_ID));
+ fp0 = (FlowProperty)p0.applyStereotype(p0.getApplicableStereotype(FLOWPROPERTY_ID));
fp0.setDirection(FlowDirection.IN);
- fp1 = (FlowProperty) p1.applyStereotype(p1.getApplicableStereotype(FLOWPROPERTY_ID));
+ fp1 = (FlowProperty)p1.applyStereotype(p1.getApplicableStereotype(FLOWPROPERTY_ID));
fp1.setDirection(FlowDirection.OUT);
- fp2 = (FlowProperty) p2.applyStereotype(p2.getApplicableStereotype(FLOWPROPERTY_ID));
+ fp2 = (FlowProperty)p2.applyStereotype(p2.getApplicableStereotype(FLOWPROPERTY_ID));
fp2.setDirection(FlowDirection.INOUT);
}
@@ -166,15 +168,15 @@ public class FlowPropertyTest extends TestCase { Image i1 = s.getIcons().get(1); // OUT
Image i2 = s.getIcons().get(2); // INOUT
- if (!fp0.getIcon().equals(i0)) {
+ if(!fp0.getIcon().equals(i0)) {
fail();
}
- if (!fp1.getIcon().equals(i1)) {
+ if(!fp1.getIcon().equals(i1)) {
fail();
}
- if (!fp2.getIcon().equals(i2)) {
+ if(!fp2.getIcon().equals(i2)) {
fail();
}
}
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowSpecificationTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowSpecificationTest.java index 55ade2fba58..c8cb711671f 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowSpecificationTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowSpecificationTest.java @@ -45,7 +45,8 @@ public class FlowSpecificationTest extends TestCase { protected FlowSpecification fixture = null;
/**
- * Constructs a new Flow Specification test case with the given name. <!-- begin-user-doc -->
+ * Constructs a new Flow Specification test case with the given name.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @generated
@@ -55,7 +56,8 @@ public class FlowSpecificationTest extends TestCase { }
/**
- * Returns the fixture for this Flow Specification test case. <!-- begin-user-doc --> <!--
+ * Returns the fixture for this Flow Specification test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -65,7 +67,8 @@ public class FlowSpecificationTest extends TestCase { }
/**
- * Sets the fixture for this Flow Specification test case. <!-- begin-user-doc --> <!--
+ * Sets the fixture for this Flow Specification test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/ItemFlowTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/ItemFlowTest.java index 6627f34e1b9..4c9ff06889b 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/ItemFlowTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/ItemFlowTest.java @@ -37,14 +37,16 @@ public class ItemFlowTest extends TestCase { }
/**
- * The fixture for this Item Flow test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The fixture for this Item Flow test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
protected ItemFlow fixture = null;
/**
- * Constructs a new Item Flow test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Item Flow test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -64,7 +66,8 @@ public class ItemFlowTest extends TestCase { }
/**
- * Sets the fixture for this Item Flow test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this Item Flow test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/PortandflowsTests.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/PortandflowsTests.java index ad046594185..11e391d55f2 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/PortandflowsTests.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/PortandflowsTests.java @@ -37,7 +37,7 @@ public class PortandflowsTests extends TestSuite { /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
- * @generated
+ * @generated NOT
*/
public static Test suite() {
TestSuite suite = new PortandflowsTests("portandflows Tests");
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/CopyTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/CopyTest.java index 805f0df76f4..1e57ae51c8d 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/CopyTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/CopyTest.java @@ -37,14 +37,16 @@ public class CopyTest extends TestCase { }
/**
- * The fixture for this Copy test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The fixture for this Copy test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
protected Copy fixture = null;
/**
- * Constructs a new Copy test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Copy test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -54,7 +56,8 @@ public class CopyTest extends TestCase { }
/**
- * Returns the fixture for this Copy test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the fixture for this Copy test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@@ -63,7 +66,8 @@ public class CopyTest extends TestCase { }
/**
- * Sets the fixture for this Copy test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this Copy test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/DeriveReqtTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/DeriveReqtTest.java index dbe30f02873..d00b46c5f6a 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/DeriveReqtTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/DeriveReqtTest.java @@ -37,14 +37,16 @@ public class DeriveReqtTest extends TestCase { }
/**
- * The fixture for this Derive Reqt test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The fixture for this Derive Reqt test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
protected DeriveReqt fixture = null;
/**
- * Constructs a new Derive Reqt test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Derive Reqt test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementRelatedTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementRelatedTest.java index 2db8ee40684..723e1847d66 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementRelatedTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementRelatedTest.java @@ -37,14 +37,10 @@ import org.eclipse.uml2.uml.UMLFactory; * <p>
* The following features are tested:
* <ul>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getTracedFrom() <em>Traced
- * From</em>}</li>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getSatisfies() <em>Satisfies
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getRefines() <em>Refines
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getVerifies() <em>Verifies
- * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getTracedFrom() <em>Traced From</em>}</li>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getSatisfies() <em>Satisfies</em>}</li>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getRefines() <em>Refines</em>}</li>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getVerifies() <em>Verifies</em>}</li>
* </ul>
* </p>
*
@@ -117,7 +113,8 @@ public class RequirementRelatedTest extends TestCase { // ////////////////////////////////////////////////////////////////////
/**
- * Constructs a new Requirement Related test case with the given name. <!-- begin-user-doc -->
+ * Constructs a new Requirement Related test case with the given name.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @generated
@@ -127,7 +124,8 @@ public class RequirementRelatedTest extends TestCase { }
/**
- * Returns the fixture for this Requirement Related test case. <!-- begin-user-doc --> <!--
+ * Returns the fixture for this Requirement Related test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -137,7 +135,8 @@ public class RequirementRelatedTest extends TestCase { }
/**
- * Sets the fixture for this Requirement Related test case. <!-- begin-user-doc --> <!--
+ * Sets the fixture for this Requirement Related test case.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -158,11 +157,11 @@ public class RequirementRelatedTest extends TestCase { // Prepare test
model = SysMLTestResources.createSysMLModel();
- if (model == null) {
+ if(model == null) {
fail();
}
- if (model.getAppliedProfiles().isEmpty()) {
+ if(model.getAppliedProfiles().isEmpty()) {
fail();
}
@@ -170,7 +169,7 @@ public class RequirementRelatedTest extends TestCase { Class defaultClass = model.createOwnedClass("defaultClass", false);
// Add Requirement stereotypes
- default_reqR = (RequirementRelated) defaultClass.applyStereotype(defaultClass
+ default_reqR = (RequirementRelated)defaultClass.applyStereotype(defaultClass
.getApplicableStereotype(REQUIREMENT_RELATED_ID));
// ////////////////////////////////////////////////////////////////////
@@ -178,13 +177,13 @@ public class RequirementRelatedTest extends TestCase { // ////////////////////////////////////////////////////////////////////
Class traced = model.createOwnedClass("traced", false);
- traced_reqR = (RequirementRelated) traced.applyStereotype(traced
+ traced_reqR = (RequirementRelated)traced.applyStereotype(traced
.getApplicableStereotype(REQUIREMENT_RELATED_ID));
Class trace1 = model.createOwnedClass("trace1", false);
- trace1_req = (Requirement) trace1.applyStereotype(trace1.getApplicableStereotype(REQUIREMENT_ID));
+ trace1_req = (Requirement)trace1.applyStereotype(trace1.getApplicableStereotype(REQUIREMENT_ID));
Class trace2 = model.createOwnedClass("trace2", false);
- trace2_req = (Requirement) trace2.applyStereotype(trace2.getApplicableStereotype(REQUIREMENT_ID));
+ trace2_req = (Requirement)trace2.applyStereotype(trace2.getApplicableStereotype(REQUIREMENT_ID));
// Add "Trace" (Abstraction)
// trace1, trace2 -> traced
@@ -193,14 +192,14 @@ public class RequirementRelatedTest extends TestCase { t11.getSuppliers().add(traced);
model.getPackagedElements().add(t11);
@SuppressWarnings("unused")
- Trace t_t11 = (Trace) t11.applyStereotype(t11.getApplicableStereotype(StdResource.TRACE_ID));
+ Trace t_t11 = (Trace)t11.applyStereotype(t11.getApplicableStereotype(StdResource.TRACE_ID));
Abstraction t12 = UMLFactory.eINSTANCE.createAbstraction();
t12.getClients().add(trace2);
t12.getSuppliers().add(traced);
model.getPackagedElements().add(t12);
@SuppressWarnings("unused")
- Trace t_t12 = (Trace) t12.applyStereotype(t12.getApplicableStereotype(StdResource.TRACE_ID));
+ Trace t_t12 = (Trace)t12.applyStereotype(t12.getApplicableStereotype(StdResource.TRACE_ID));
// ////////////////////////////////////////////////////////////////////
@@ -209,13 +208,13 @@ public class RequirementRelatedTest extends TestCase { // ////////////////////////////////////////////////////////////////////
Class satisfying = model.createOwnedClass("satisfying", false);
- satisfying_reqR = (RequirementRelated) satisfying.applyStereotype(satisfying
+ satisfying_reqR = (RequirementRelated)satisfying.applyStereotype(satisfying
.getApplicableStereotype(REQUIREMENT_RELATED_ID));
Class satisfied1 = model.createOwnedClass("satisfied1", false);
- satisfied1_req = (Requirement) satisfied1.applyStereotype(satisfied1.getApplicableStereotype(REQUIREMENT_ID));
+ satisfied1_req = (Requirement)satisfied1.applyStereotype(satisfied1.getApplicableStereotype(REQUIREMENT_ID));
Class satisfied2 = model.createOwnedClass("satisfied2", false);
- satisfied2_req = (Requirement) satisfied2.applyStereotype(satisfied2.getApplicableStereotype(REQUIREMENT_ID));
+ satisfied2_req = (Requirement)satisfied2.applyStereotype(satisfied2.getApplicableStereotype(REQUIREMENT_ID));
// Add "Satisfy" (Realization)
// satisfying_reqR -> satisfied1_req, satisfied2_req
@@ -224,14 +223,14 @@ public class RequirementRelatedTest extends TestCase { s1.getSuppliers().add(satisfied1);
model.getPackagedElements().add(s1);
@SuppressWarnings("unused")
- Satisfy s_s1 = (Satisfy) s1.applyStereotype(s1.getApplicableStereotype(SATISFY_ID));
+ Satisfy s_s1 = (Satisfy)s1.applyStereotype(s1.getApplicableStereotype(SATISFY_ID));
Realization s2 = UMLFactory.eINSTANCE.createRealization();
s2.getClients().add(satisfying);
s2.getSuppliers().add(satisfied2);
model.getPackagedElements().add(s2);
@SuppressWarnings("unused")
- Satisfy s_s2 = (Satisfy) s2.applyStereotype(s2.getApplicableStereotype(SATISFY_ID));
+ Satisfy s_s2 = (Satisfy)s2.applyStereotype(s2.getApplicableStereotype(SATISFY_ID));
// ////////////////////////////////////////////////////////////////////
@@ -240,13 +239,13 @@ public class RequirementRelatedTest extends TestCase { // ////////////////////////////////////////////////////////////////////
Class verifying = model.createOwnedClass("verifying", false);
- verifying_reqR = (RequirementRelated) verifying.applyStereotype(verifying
+ verifying_reqR = (RequirementRelated)verifying.applyStereotype(verifying
.getApplicableStereotype(REQUIREMENT_RELATED_ID));
Class verified1 = model.createOwnedClass("verified1", false);
- verified1_req = (Requirement) verified1.applyStereotype(verified1.getApplicableStereotype(REQUIREMENT_ID));
+ verified1_req = (Requirement)verified1.applyStereotype(verified1.getApplicableStereotype(REQUIREMENT_ID));
Class verified2 = model.createOwnedClass("verified2", false);
- verified2_req = (Requirement) verified2.applyStereotype(verified2.getApplicableStereotype(REQUIREMENT_ID));
+ verified2_req = (Requirement)verified2.applyStereotype(verified2.getApplicableStereotype(REQUIREMENT_ID));
// Add "Verify" (Realization)
// verifying_reqR -> verified1_req, verified2_req
@@ -255,14 +254,14 @@ public class RequirementRelatedTest extends TestCase { v1.getSuppliers().add(verified1);
model.getPackagedElements().add(v1);
@SuppressWarnings("unused")
- Verify v_v1 = (Verify) v1.applyStereotype(v1.getApplicableStereotype(VERIFY_ID));
+ Verify v_v1 = (Verify)v1.applyStereotype(v1.getApplicableStereotype(VERIFY_ID));
Realization v2 = UMLFactory.eINSTANCE.createRealization();
v2.getClients().add(verifying);
v2.getSuppliers().add(verified2);
model.getPackagedElements().add(v2);
@SuppressWarnings("unused")
- Verify v_v2 = (Verify) v2.applyStereotype(v2.getApplicableStereotype(VERIFY_ID));
+ Verify v_v2 = (Verify)v2.applyStereotype(v2.getApplicableStereotype(VERIFY_ID));
// ////////////////////////////////////////////////////////////////////
@@ -271,13 +270,13 @@ public class RequirementRelatedTest extends TestCase { // ////////////////////////////////////////////////////////////////////
Class refining = model.createOwnedClass("refining", false);
- refining_reqR = (RequirementRelated) refining.applyStereotype(refining
+ refining_reqR = (RequirementRelated)refining.applyStereotype(refining
.getApplicableStereotype(REQUIREMENT_RELATED_ID));
Class refined1 = model.createOwnedClass("refined1", false);
- refined1_req = (Requirement) refined1.applyStereotype(refined1.getApplicableStereotype(REQUIREMENT_ID));
+ refined1_req = (Requirement)refined1.applyStereotype(refined1.getApplicableStereotype(REQUIREMENT_ID));
Class refined2 = model.createOwnedClass("refined2", false);
- refined2_req = (Requirement) refined2.applyStereotype(refined2.getApplicableStereotype(REQUIREMENT_ID));
+ refined2_req = (Requirement)refined2.applyStereotype(refined2.getApplicableStereotype(REQUIREMENT_ID));
// Add "Refine" (Abstraction)
// refining_reqR -> refined1_req, refined2_req
@@ -286,14 +285,14 @@ public class RequirementRelatedTest extends TestCase { r1.getSuppliers().add(refined1);
model.getPackagedElements().add(r1);
@SuppressWarnings("unused")
- Refine r_r1 = (Refine) r1.applyStereotype(r1.getApplicableStereotype(StdResource.REFINE_ID));
+ Refine r_r1 = (Refine)r1.applyStereotype(r1.getApplicableStereotype(StdResource.REFINE_ID));
Abstraction r2 = UMLFactory.eINSTANCE.createAbstraction();
r2.getClients().add(refining);
r2.getSuppliers().add(refined2);
model.getPackagedElements().add(r2);
@SuppressWarnings("unused")
- Refine r_r2 = (Refine) r2.applyStereotype(r2.getApplicableStereotype(StdResource.REFINE_ID));
+ Refine r_r2 = (Refine)r2.applyStereotype(r2.getApplicableStereotype(StdResource.REFINE_ID));
// ////////////////////////////////////////////////////////////////////
}
@@ -319,15 +318,15 @@ public class RequirementRelatedTest extends TestCase { public void testGetRefines() {
// Isolated RequirementRelated
- if (!default_reqR.getRefines().isEmpty()) {
+ if(!default_reqR.getRefines().isEmpty()) {
fail();
}
// refining_reqR.getRefines() = [refined1_req, refined2_req]
- if (!refining_reqR.getRefines().contains(refined1_req)) {
+ if(!refining_reqR.getRefines().contains(refined1_req)) {
fail();
}
- if (!refining_reqR.getRefines().contains(refined2_req)) {
+ if(!refining_reqR.getRefines().contains(refined2_req)) {
fail();
}
}
@@ -342,15 +341,15 @@ public class RequirementRelatedTest extends TestCase { public void testGetSatisfies() {
// Isolated RequirementRelated
- if (!default_reqR.getSatisfies().isEmpty()) {
+ if(!default_reqR.getSatisfies().isEmpty()) {
fail();
}
// satisfying_reqR.getSatisfies() = [satisfied1_req, satisfied2_req]
- if (!satisfying_reqR.getSatisfies().contains(satisfied1_req)) {
+ if(!satisfying_reqR.getSatisfies().contains(satisfied1_req)) {
fail();
}
- if (!satisfying_reqR.getSatisfies().contains(satisfied2_req)) {
+ if(!satisfying_reqR.getSatisfies().contains(satisfied2_req)) {
fail();
}
}
@@ -365,15 +364,15 @@ public class RequirementRelatedTest extends TestCase { public void testGetTracedFrom() {
// Isolated RequirementRelated
- if (!default_reqR.getTracedFrom().isEmpty()) {
+ if(!default_reqR.getTracedFrom().isEmpty()) {
fail();
}
// traced_reqR.getTraceFrom() = [trace1_Req, trace2_req]
- if (!traced_reqR.getTracedFrom().contains(trace1_req)) {
+ if(!traced_reqR.getTracedFrom().contains(trace1_req)) {
fail();
}
- if (!traced_reqR.getTracedFrom().contains(trace2_req)) {
+ if(!traced_reqR.getTracedFrom().contains(trace2_req)) {
fail();
}
}
@@ -388,15 +387,15 @@ public class RequirementRelatedTest extends TestCase { public void testGetVerifies() {
// Isolated RequirementRelated
- if (!default_reqR.getVerifies().isEmpty()) {
+ if(!default_reqR.getVerifies().isEmpty()) {
fail();
}
// verifying_reqR.getVerifies() = [verified1_req, verified2_req]
- if (!verifying_reqR.getVerifies().contains(verified1_req)) {
+ if(!verifying_reqR.getVerifies().contains(verified1_req)) {
fail();
}
- if (!verifying_reqR.getVerifies().contains(verified2_req)) {
+ if(!verifying_reqR.getVerifies().contains(verified2_req)) {
fail();
}
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementTest.java index 50094690a77..096a9702fe9 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementTest.java @@ -40,15 +40,11 @@ import org.eclipse.uml2.uml.UMLFactory; * The following features are tested:
* <ul>
* <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getDerived() <em>Derived</em>}</li>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getDerivedFrom() <em>Derived From
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getSatisfiedBy() <em>Satisfied By
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getRefinedBy() <em>Refined By</em>}
- * </li>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getDerivedFrom() <em>Derived From</em>}</li>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getSatisfiedBy() <em>Satisfied By</em>}</li>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getRefinedBy() <em>Refined By</em>}</li>
* <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getTracedTo() <em>Traced To</em>}</li>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getVerifiedBy() <em>Verified By
- * </em>}</li>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getVerifiedBy() <em>Verified By</em>}</li>
* <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getMaster() <em>Master</em>}</li>
* </ul>
* </p>
@@ -171,7 +167,8 @@ public class RequirementTest extends TestCase { protected Model model = null;
/**
- * Constructs a new Requirement test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Requirement test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -212,11 +209,11 @@ public class RequirementTest extends TestCase { // Prepare test
model = SysMLTestResources.createSysMLModel();
- if (model == null) {
+ if(model == null) {
fail();
}
- if (model.getAppliedProfiles().isEmpty()) {
+ if(model.getAppliedProfiles().isEmpty()) {
fail();
}
@@ -224,16 +221,16 @@ public class RequirementTest extends TestCase { defaultClass = model.createOwnedClass("defaultClass", false);
// Add Requirement stereotypes
- default_req = (Requirement) defaultClass.applyStereotype(defaultClass.getApplicableStereotype(REQUIREMENT_ID));
+ default_req = (Requirement)defaultClass.applyStereotype(defaultClass.getApplicableStereotype(REQUIREMENT_ID));
// ////////////////////////////////////////////////////////////////////
// Prepare getMaster test elements
// ////////////////////////////////////////////////////////////////////
master = model.createOwnedClass("master", false);
- master_req = (Requirement) master.applyStereotype(master.getApplicableStereotype(REQUIREMENT_ID));
+ master_req = (Requirement)master.applyStereotype(master.getApplicableStereotype(REQUIREMENT_ID));
copy = model.createOwnedClass("copy", false);
- copy_req = (Requirement) copy.applyStereotype(copy.getApplicableStereotype(REQUIREMENT_ID));
+ copy_req = (Requirement)copy.applyStereotype(copy.getApplicableStereotype(REQUIREMENT_ID));
// Add "copy" (Abstraction) between master and copy
// copy -> master
@@ -242,7 +239,7 @@ public class RequirementTest extends TestCase { c_m.getSuppliers().add(master);
model.getPackagedElements().add(c_m);
@SuppressWarnings("unused")
- Copy copy_c_m = (Copy) c_m.applyStereotype(c_m.getApplicableStereotype(COPY_ID));
+ Copy copy_c_m = (Copy)c_m.applyStereotype(c_m.getApplicableStereotype(COPY_ID));
// ////////////////////////////////////////////////////////////////////
@@ -251,16 +248,16 @@ public class RequirementTest extends TestCase { // ////////////////////////////////////////////////////////////////////
derive1 = model.createOwnedClass("d1", false);
- derive1_req = (Requirement) derive1.applyStereotype(derive1.getApplicableStereotype(REQUIREMENT_ID));
+ derive1_req = (Requirement)derive1.applyStereotype(derive1.getApplicableStereotype(REQUIREMENT_ID));
derive2 = model.createOwnedClass("d2", false);
- derive2_req = (Requirement) derive2.applyStereotype(derive2.getApplicableStereotype(REQUIREMENT_ID));
+ derive2_req = (Requirement)derive2.applyStereotype(derive2.getApplicableStereotype(REQUIREMENT_ID));
derived1 = model.createOwnedClass("dd1", false);
- derived1_req = (Requirement) derived1.applyStereotype(derived1.getApplicableStereotype(REQUIREMENT_ID));
+ derived1_req = (Requirement)derived1.applyStereotype(derived1.getApplicableStereotype(REQUIREMENT_ID));
derived2 = model.createOwnedClass("dd2", false);
- derived2_req = (Requirement) derived2.applyStereotype(derived2.getApplicableStereotype(REQUIREMENT_ID));
+ derived2_req = (Requirement)derived2.applyStereotype(derived2.getApplicableStereotype(REQUIREMENT_ID));
// Add "DeriveReqt" (Abstraction) between derive and derived
// derived1 -> derive1, derive2
@@ -270,21 +267,21 @@ public class RequirementTest extends TestCase { d11.getSuppliers().add(derive1);
model.getPackagedElements().add(d11);
@SuppressWarnings("unused")
- DeriveReqt dreqt_d11 = (DeriveReqt) d11.applyStereotype(d11.getApplicableStereotype(DERIVEREQT_ID));
+ DeriveReqt dreqt_d11 = (DeriveReqt)d11.applyStereotype(d11.getApplicableStereotype(DERIVEREQT_ID));
Abstraction d12 = UMLFactory.eINSTANCE.createAbstraction();
d12.getClients().add(derived1);
d12.getSuppliers().add(derive2);
model.getPackagedElements().add(d12);
@SuppressWarnings("unused")
- DeriveReqt dreqt_d12 = (DeriveReqt) d12.applyStereotype(d12.getApplicableStereotype(DERIVEREQT_ID));
+ DeriveReqt dreqt_d12 = (DeriveReqt)d12.applyStereotype(d12.getApplicableStereotype(DERIVEREQT_ID));
Abstraction d22 = UMLFactory.eINSTANCE.createAbstraction();
d22.getClients().add(derived2);
d22.getSuppliers().add(derive2);
model.getPackagedElements().add(d22);
@SuppressWarnings("unused")
- DeriveReqt dreqt_d22 = (DeriveReqt) d22.applyStereotype(d22.getApplicableStereotype(DERIVEREQT_ID));
+ DeriveReqt dreqt_d22 = (DeriveReqt)d22.applyStereotype(d22.getApplicableStereotype(DERIVEREQT_ID));
// ////////////////////////////////////////////////////////////////////
@@ -293,7 +290,7 @@ public class RequirementTest extends TestCase { // ////////////////////////////////////////////////////////////////////
satisfied = model.createOwnedClass("satisfied", false);
- satisfied_req = (Requirement) satisfied.applyStereotype(satisfied.getApplicableStereotype(REQUIREMENT_ID));
+ satisfied_req = (Requirement)satisfied.applyStereotype(satisfied.getApplicableStereotype(REQUIREMENT_ID));
satisfyingNE1 = model.createOwnedClass("sNE1", false);
satisfyingNE2 = model.createOwnedClass("sNE2", false);
@@ -306,14 +303,14 @@ public class RequirementTest extends TestCase { ne1_s1.getSuppliers().add(satisfied);
model.getPackagedElements().add(ne1_s1);
@SuppressWarnings("unused")
- Satisfy s_ne1_s1 = (Satisfy) ne1_s1.applyStereotype(ne1_s1.getApplicableStereotype(SATISFY_ID));
+ Satisfy s_ne1_s1 = (Satisfy)ne1_s1.applyStereotype(ne1_s1.getApplicableStereotype(SATISFY_ID));
Realization ne2_s1 = UMLFactory.eINSTANCE.createRealization();
ne2_s1.getClients().add(satisfyingNE2);
ne2_s1.getSuppliers().add(satisfied);
model.getPackagedElements().add(ne2_s1);
@SuppressWarnings("unused")
- Satisfy s_ne2_s1 = (Satisfy) ne2_s1.applyStereotype(ne2_s1.getApplicableStereotype(SATISFY_ID));
+ Satisfy s_ne2_s1 = (Satisfy)ne2_s1.applyStereotype(ne2_s1.getApplicableStereotype(SATISFY_ID));
// ////////////////////////////////////////////////////////////////////
@@ -322,7 +319,7 @@ public class RequirementTest extends TestCase { // ////////////////////////////////////////////////////////////////////
refined = model.createOwnedClass("refined", false);
- refined_req = (Requirement) refined.applyStereotype(refined.getApplicableStereotype(REQUIREMENT_ID));
+ refined_req = (Requirement)refined.applyStereotype(refined.getApplicableStereotype(REQUIREMENT_ID));
refiningNE1 = model.createOwnedClass("rNE1", false);
refiningNE2 = model.createOwnedClass("rNE2", false);
@@ -335,14 +332,14 @@ public class RequirementTest extends TestCase { rne1_s1.getSuppliers().add(refined);
model.getPackagedElements().add(rne1_s1);
@SuppressWarnings("unused")
- Refine s_rne1_s1 = (Refine) rne1_s1.applyStereotype(rne1_s1.getApplicableStereotype(StdResource.REFINE_ID));
+ Refine s_rne1_s1 = (Refine)rne1_s1.applyStereotype(rne1_s1.getApplicableStereotype(StdResource.REFINE_ID));
Abstraction rne2_s1 = UMLFactory.eINSTANCE.createAbstraction();
rne2_s1.getClients().add(refiningNE2);
rne2_s1.getSuppliers().add(refined);
model.getPackagedElements().add(rne2_s1);
@SuppressWarnings("unused")
- Refine s_rne2_s1 = (Refine) rne2_s1.applyStereotype(rne2_s1.getApplicableStereotype(StdResource.REFINE_ID));
+ Refine s_rne2_s1 = (Refine)rne2_s1.applyStereotype(rne2_s1.getApplicableStereotype(StdResource.REFINE_ID));
// ////////////////////////////////////////////////////////////////////
@@ -351,13 +348,13 @@ public class RequirementTest extends TestCase { // ////////////////////////////////////////////////////////////////////
traced1 = model.createOwnedClass("traced1", false);
- traced1_req = (Requirement) traced1.applyStereotype(traced1.getApplicableStereotype(REQUIREMENT_ID));
+ traced1_req = (Requirement)traced1.applyStereotype(traced1.getApplicableStereotype(REQUIREMENT_ID));
traced2 = model.createOwnedClass("traced2", false);
- traced2_req = (Requirement) traced2.applyStereotype(traced2.getApplicableStereotype(REQUIREMENT_ID));
+ traced2_req = (Requirement)traced2.applyStereotype(traced2.getApplicableStereotype(REQUIREMENT_ID));
trace = model.createOwnedClass("trace", false);
- trace_req = (Requirement) trace.applyStereotype(trace.getApplicableStereotype(REQUIREMENT_ID));
+ trace_req = (Requirement)trace.applyStereotype(trace.getApplicableStereotype(REQUIREMENT_ID));
// Add "Trace" (Abstraction)
// [traced1, traced2] -> trace
@@ -366,14 +363,14 @@ public class RequirementTest extends TestCase { t11.getSuppliers().add(trace);
model.getPackagedElements().add(t11);
@SuppressWarnings("unused")
- Trace t_t11 = (Trace) t11.applyStereotype(t11.getApplicableStereotype(StdResource.TRACE_ID));
+ Trace t_t11 = (Trace)t11.applyStereotype(t11.getApplicableStereotype(StdResource.TRACE_ID));
Abstraction t12 = UMLFactory.eINSTANCE.createAbstraction();
t12.getClients().add(traced2);
t12.getSuppliers().add(trace);
model.getPackagedElements().add(t12);
@SuppressWarnings("unused")
- Trace t_t12 = (Trace) t12.applyStereotype(t12.getApplicableStereotype(StdResource.TRACE_ID));
+ Trace t_t12 = (Trace)t12.applyStereotype(t12.getApplicableStereotype(StdResource.TRACE_ID));
// ////////////////////////////////////////////////////////////////////
@@ -382,15 +379,15 @@ public class RequirementTest extends TestCase { // ////////////////////////////////////////////////////////////////////
Class verified = model.createOwnedClass("verified", false);
- verified_req = (Requirement) verified.applyStereotype(verified.getApplicableStereotype(REQUIREMENT_ID));
+ verified_req = (Requirement)verified.applyStereotype(verified.getApplicableStereotype(REQUIREMENT_ID));
Class testClass = model.createOwnedClass("testClass", false);
Operation op1 = testClass.createOwnedOperation("op1", null, null, null);
Operation op2 = testClass.createOwnedOperation("op2", null, null, null);
- testCase1 = (org.eclipse.papyrus.sysml.requirements.TestCase) op1.applyStereotype(op1
+ testCase1 = (org.eclipse.papyrus.sysml.requirements.TestCase)op1.applyStereotype(op1
.getApplicableStereotype(TESTCASE_ID));
- testCase2 = (org.eclipse.papyrus.sysml.requirements.TestCase) op2.applyStereotype(op2
+ testCase2 = (org.eclipse.papyrus.sysml.requirements.TestCase)op2.applyStereotype(op2
.getApplicableStereotype(TESTCASE_ID));
// Add "Verify" (Abstraction)
@@ -400,14 +397,14 @@ public class RequirementTest extends TestCase { t1_v.getSuppliers().add(verified);
model.getPackagedElements().add(t1_v);
@SuppressWarnings("unused")
- Verify v_t1_v = (Verify) t1_v.applyStereotype(t1_v.getApplicableStereotype(VERIFY_ID));
+ Verify v_t1_v = (Verify)t1_v.applyStereotype(t1_v.getApplicableStereotype(VERIFY_ID));
Abstraction t2_v = UMLFactory.eINSTANCE.createAbstraction();
t2_v.getClients().add(op2);
t2_v.getSuppliers().add(verified);
model.getPackagedElements().add(t2_v);
@SuppressWarnings("unused")
- Verify v_t2_v = (Verify) t2_v.applyStereotype(t2_v.getApplicableStereotype(VERIFY_ID));
+ Verify v_t2_v = (Verify)t2_v.applyStereotype(t2_v.getApplicableStereotype(VERIFY_ID));
// ////////////////////////////////////////////////////////////////////
}
@@ -433,21 +430,21 @@ public class RequirementTest extends TestCase { public void testGetDerived() {
// Isolated requirement : default_req.getDerived() = []
- if (!default_req.getDerived().isEmpty()) {
+ if(!default_req.getDerived().isEmpty()) {
fail();
}
// Verifies : derive1_req.getDerived() = [derived1_req]
- if (!derive1_req.getDerived().contains(derived1_req)) {
+ if(!derive1_req.getDerived().contains(derived1_req)) {
fail();
}
// Verifies : derive2_req.getDerived() = [derived1_req, derived2_req]
- if (!derive2_req.getDerived().contains(derived1_req)) {
+ if(!derive2_req.getDerived().contains(derived1_req)) {
fail();
}
- if (!derive2_req.getDerived().contains(derived2_req)) {
+ if(!derive2_req.getDerived().contains(derived2_req)) {
fail();
}
}
@@ -462,20 +459,20 @@ public class RequirementTest extends TestCase { public void testGetDerivedFrom() {
// Isolated requirement : default_req.getDerivedFrom() = []
- if (!default_req.getDerivedFrom().isEmpty()) {
+ if(!default_req.getDerivedFrom().isEmpty()) {
fail();
}
// Verifies : derived2_req.getDerivedFrom() = [derive2_req]
- if (!derived2_req.getDerivedFrom().contains(derive2_req)) {
+ if(!derived2_req.getDerivedFrom().contains(derive2_req)) {
fail();
}
// Verifies : derived1_req.getDerivedFrom() = [derive1_req, derive2_req]
- if (!derived1_req.getDerivedFrom().contains(derive1_req)) {
+ if(!derived1_req.getDerivedFrom().contains(derive1_req)) {
fail();
}
- if (!derived1_req.getDerivedFrom().contains(derive2_req)) {
+ if(!derived1_req.getDerivedFrom().contains(derive2_req)) {
fail();
}
}
@@ -490,12 +487,12 @@ public class RequirementTest extends TestCase { public void testGetMaster() {
// Isolated requirement : default_req.getMaster() = null
- if (default_req.getMaster() != null) {
+ if(default_req.getMaster() != null) {
fail();
}
// Try retrieving Master from Copy requirement
- if (!master_req.equals(copy_req.getMaster())) {
+ if(!master_req.equals(copy_req.getMaster())) {
fail();
}
}
@@ -510,15 +507,15 @@ public class RequirementTest extends TestCase { public void testGetRefinedBy() {
// Isolated requirement : default_req.getRefinedBy() = []
- if (!default_req.getRefinedBy().isEmpty()) {
+ if(!default_req.getRefinedBy().isEmpty()) {
fail();
}
// Verifies : refined_req.getRefinedBy() = [refiningNE1, refiningNE2]
- if (!refined_req.getRefinedBy().contains(refiningNE1)) {
+ if(!refined_req.getRefinedBy().contains(refiningNE1)) {
fail();
}
- if (!refined_req.getRefinedBy().contains(refiningNE2)) {
+ if(!refined_req.getRefinedBy().contains(refiningNE2)) {
fail();
}
}
@@ -533,15 +530,15 @@ public class RequirementTest extends TestCase { public void testGetSatisfiedBy() {
// Isolated requirement : default_req.getSatisfiedBy() = []
- if (!default_req.getSatisfiedBy().isEmpty()) {
+ if(!default_req.getSatisfiedBy().isEmpty()) {
fail();
}
// Verifies : satisfied_req.getSatisfiedBy() = [satisfyingNE1, satisfyingNE2]
- if (!satisfied_req.getSatisfiedBy().contains(satisfyingNE1)) {
+ if(!satisfied_req.getSatisfiedBy().contains(satisfyingNE1)) {
fail();
}
- if (!satisfied_req.getSatisfiedBy().contains(satisfyingNE2)) {
+ if(!satisfied_req.getSatisfiedBy().contains(satisfyingNE2)) {
fail();
}
}
@@ -556,26 +553,26 @@ public class RequirementTest extends TestCase { public void testGetTracedTo() {
// Isolated requirement : default_req.getTracedTo = []
- if (!default_req.getTracedTo().isEmpty()) {
+ if(!default_req.getTracedTo().isEmpty()) {
fail();
}
// DeriveReqt / Verify / Copy inherits from Trace
// Test getter through Copy
- if (!master_req.getTracedTo().contains(copy)) {
+ if(!master_req.getTracedTo().contains(copy)) {
fail();
}
// Test getter through DeriveReqt (tracedTo = Clients)
// derived1 -> [derive1_req, derive2_req]
// derived2 -> [derive2_req]
- if (!derive1_req.getTracedTo().contains(derived1)) {
+ if(!derive1_req.getTracedTo().contains(derived1)) {
fail();
}
- if (!derive2_req.getTracedTo().contains(derived1)) {
+ if(!derive2_req.getTracedTo().contains(derived1)) {
fail();
}
- if (!derive2_req.getTracedTo().contains(derived2)) {
+ if(!derive2_req.getTracedTo().contains(derived2)) {
fail();
}
@@ -583,10 +580,10 @@ public class RequirementTest extends TestCase { // Should not happen...
// Direct test
- if (!trace_req.getTracedTo().contains(traced1)) {
+ if(!trace_req.getTracedTo().contains(traced1)) {
fail();
}
- if (!trace_req.getTracedTo().contains(traced2)) {
+ if(!trace_req.getTracedTo().contains(traced2)) {
fail();
}
@@ -602,16 +599,16 @@ public class RequirementTest extends TestCase { public void testGetVerifiedBy() {
// Isolated requirement : default_req.getVerifiedBy() = []
- if (!default_req.getVerifiedBy().isEmpty()) {
+ if(!default_req.getVerifiedBy().isEmpty()) {
fail();
}
// Test getVerifiedBy getter for
// [testCase1, testCase2] -> verified_req
- if (!verified_req.getVerifiedBy().contains(testCase1)) {
+ if(!verified_req.getVerifiedBy().contains(testCase1)) {
fail();
}
- if (!verified_req.getVerifiedBy().contains(testCase2)) {
+ if(!verified_req.getVerifiedBy().contains(testCase2)) {
fail();
}
}
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementsTests.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementsTests.java index d89eae47e83..1329f58fd7b 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementsTests.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementsTests.java @@ -37,7 +37,7 @@ public class RequirementsTests extends TestSuite { /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
- * @generated
+ * @generated NOT
*/
public static Test suite() {
TestSuite suite = new RequirementsTests("requirements Tests");
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/SatisfyTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/SatisfyTest.java index 8e51381cdeb..37ad40c8a11 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/SatisfyTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/SatisfyTest.java @@ -37,14 +37,16 @@ public class SatisfyTest extends TestCase { }
/**
- * The fixture for this Satisfy test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The fixture for this Satisfy test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
protected Satisfy fixture = null;
/**
- * Constructs a new Satisfy test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Satisfy test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -54,7 +56,8 @@ public class SatisfyTest extends TestCase { }
/**
- * Returns the fixture for this Satisfy test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the fixture for this Satisfy test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@@ -63,7 +66,8 @@ public class SatisfyTest extends TestCase { }
/**
- * Sets the fixture for this Satisfy test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this Satisfy test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/TestCaseTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/TestCaseTest.java index 5132f535de8..c89e1802f33 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/TestCaseTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/TestCaseTest.java @@ -78,7 +78,8 @@ public class TestCaseTest extends TestCase { // ////////////////////////////////////////////////////////////////////
/**
- * Constructs a new Test Case test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Test Case test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -98,7 +99,8 @@ public class TestCaseTest extends TestCase { }
/**
- * Sets the fixture for this Test Case test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this Test Case test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@@ -118,11 +120,11 @@ public class TestCaseTest extends TestCase { // Prepare test
model = SysMLTestResources.createSysMLModel();
- if (model == null) {
+ if(model == null) {
fail();
}
- if (model.getAppliedProfiles().isEmpty()) {
+ if(model.getAppliedProfiles().isEmpty()) {
fail();
}
@@ -131,21 +133,21 @@ public class TestCaseTest extends TestCase { // ////////////////////////////////////////////////////////////////////
Class verified1 = model.createOwnedClass("verified1", false);
- verified1_req = (Requirement) verified1.applyStereotype(verified1.getApplicableStereotype(REQUIREMENT_ID));
+ verified1_req = (Requirement)verified1.applyStereotype(verified1.getApplicableStereotype(REQUIREMENT_ID));
Class verified2 = model.createOwnedClass("verified2", false);
- verified2_req = (Requirement) verified2.applyStereotype(verified2.getApplicableStereotype(REQUIREMENT_ID));
+ verified2_req = (Requirement)verified2.applyStereotype(verified2.getApplicableStereotype(REQUIREMENT_ID));
Class testClass = model.createOwnedClass("testClass", false);
Operation op0 = testClass.createOwnedOperation("op0", null, null, null);
Operation op1 = testClass.createOwnedOperation("op1", null, null, null);
Operation op2 = testClass.createOwnedOperation("op2", null, null, null);
- testCase0 = (org.eclipse.papyrus.sysml.requirements.TestCase) op0.applyStereotype(op0
+ testCase0 = (org.eclipse.papyrus.sysml.requirements.TestCase)op0.applyStereotype(op0
.getApplicableStereotype(TESTCASE_ID));
- testCase1 = (org.eclipse.papyrus.sysml.requirements.TestCase) op1.applyStereotype(op1
+ testCase1 = (org.eclipse.papyrus.sysml.requirements.TestCase)op1.applyStereotype(op1
.getApplicableStereotype(TESTCASE_ID));
- testCase2 = (org.eclipse.papyrus.sysml.requirements.TestCase) op2.applyStereotype(op2
+ testCase2 = (org.eclipse.papyrus.sysml.requirements.TestCase)op2.applyStereotype(op2
.getApplicableStereotype(TESTCASE_ID));
// Add "Verify" (Abstraction)
@@ -156,21 +158,21 @@ public class TestCaseTest extends TestCase { t1_v1.getSuppliers().add(verified1);
model.getPackagedElements().add(t1_v1);
@SuppressWarnings("unused")
- Verify v_t1_v1 = (Verify) t1_v1.applyStereotype(t1_v1.getApplicableStereotype(VERIFY_ID));
+ Verify v_t1_v1 = (Verify)t1_v1.applyStereotype(t1_v1.getApplicableStereotype(VERIFY_ID));
Abstraction t1_v2 = UMLFactory.eINSTANCE.createAbstraction();
t1_v2.getClients().add(op1);
t1_v2.getSuppliers().add(verified2);
model.getPackagedElements().add(t1_v2);
@SuppressWarnings("unused")
- Verify v_t1_v2 = (Verify) t1_v2.applyStereotype(t1_v2.getApplicableStereotype(VERIFY_ID));
+ Verify v_t1_v2 = (Verify)t1_v2.applyStereotype(t1_v2.getApplicableStereotype(VERIFY_ID));
Abstraction t2_v2 = UMLFactory.eINSTANCE.createAbstraction();
t2_v2.getClients().add(op2);
t2_v2.getSuppliers().add(verified2);
model.getPackagedElements().add(t2_v2);
@SuppressWarnings("unused")
- Verify v_t2_v2 = (Verify) t2_v2.applyStereotype(t2_v2.getApplicableStereotype(VERIFY_ID));
+ Verify v_t2_v2 = (Verify)t2_v2.applyStereotype(t2_v2.getApplicableStereotype(VERIFY_ID));
// ////////////////////////////////////////////////////////////////////
}
@@ -196,20 +198,20 @@ public class TestCaseTest extends TestCase { public void testGetVerifies() {
// testCase0 -> []
- if (!testCase0.getVerifies().isEmpty()) {
+ if(!testCase0.getVerifies().isEmpty()) {
fail();
}
// testCase1 -> [verified1_req, verified2_req]
- if (!testCase1.getVerifies().contains(verified1_req)) {
+ if(!testCase1.getVerifies().contains(verified1_req)) {
fail();
}
- if (!testCase1.getVerifies().contains(verified2_req)) {
+ if(!testCase1.getVerifies().contains(verified2_req)) {
fail();
}
// testCase2 -> [verified2_req]
- if (!testCase2.getVerifies().contains(verified2_req)) {
+ if(!testCase2.getVerifies().contains(verified2_req)) {
fail();
}
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/VerifyTest.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/VerifyTest.java index 6ea1539de76..86b0e2339fe 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/VerifyTest.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/VerifyTest.java @@ -37,14 +37,16 @@ public class VerifyTest extends TestCase { }
/**
- * The fixture for this Verify test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The fixture for this Verify test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
protected Verify fixture = null;
/**
- * Constructs a new Verify test case with the given name. <!-- begin-user-doc --> <!--
+ * Constructs a new Verify test case with the given name.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
*
* @generated
@@ -54,7 +56,8 @@ public class VerifyTest extends TestCase { }
/**
- * Returns the fixture for this Verify test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the fixture for this Verify test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@@ -63,7 +66,8 @@ public class VerifyTest extends TestCase { }
/**
- * Sets the fixture for this Verify test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Sets the fixture for this Verify test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/tests/SysmlAllTests.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/tests/SysmlAllTests.java index 4a7b9baafee..0e6acfc79b5 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/tests/SysmlAllTests.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/tests/SysmlAllTests.java @@ -41,7 +41,7 @@ public class SysmlAllTests extends TestSuite { /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
- * @generated
+ * @generated NOT
*/
public static Test suite() {
TestSuite suite = new SysmlAllTests("Sysml Tests");
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/utils/SysMLTestResources.java b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/utils/SysMLTestResources.java index d390a8987f4..c197907fd50 100644 --- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/utils/SysMLTestResources.java +++ b/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/utils/SysMLTestResources.java @@ -61,20 +61,20 @@ public class SysMLTestResources { // Apply UML Standard profile
// Retrieve standard profile
- Profile umlStdProfile = (Profile) load(URI.createURI(UMLResource.STANDARD_PROFILE_URI));
+ Profile umlStdProfile = (Profile)load(URI.createURI(UMLResource.STANDARD_PROFILE_URI));
// Apply to new model
model.applyProfile(umlStdProfile);
// Retrieve SysML profile
- Profile sysml = (Profile) load(URI.createURI(SYSML_PROFILE_URI));
+ Profile sysml = (Profile)load(URI.createURI(SYSML_PROFILE_URI));
// Apply SysML profile and its nested profiles to new model
- if (sysml != null) {
+ if(sysml != null) {
model.applyProfile(sysml);
Iterator<Profile> profiles = PackageUtil.getSubProfiles(sysml).iterator();
- while (profiles.hasNext()) {
+ while(profiles.hasNext()) {
Profile current = profiles.next();
model.applyProfile(current);
}
@@ -93,7 +93,7 @@ public class SysMLTestResources { Resource resource = RESOURCE_SET.getResource(uri, true);
- package_ = (org.eclipse.uml2.uml.Package) EcoreUtil.getObjectByType(resource.getContents(),
+ package_ = (org.eclipse.uml2.uml.Package)EcoreUtil.getObjectByType(resource.getContents(),
UMLPackage.Literals.PACKAGE);
} catch (WrappedException we) {
@@ -126,12 +126,12 @@ public class SysMLTestResources { contents.add(package_);
- for (Iterator<?> allContents = UMLUtil.getAllContents(package_, true, false); allContents.hasNext();) {
+ for(Iterator<?> allContents = UMLUtil.getAllContents(package_, true, false); allContents.hasNext();) {
- EObject eObject = (EObject) allContents.next();
+ EObject eObject = (EObject)allContents.next();
- if (eObject instanceof Element) {
- contents.addAll(((Element) eObject).getStereotypeApplications());
+ if(eObject instanceof Element) {
+ contents.addAll(((Element)eObject).getStereotypeApplications());
}
}
|