Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-04-24 11:12:19 +0000
committerCamille Letavernier2014-04-24 11:12:19 +0000
commit736db7e86c838a6a162b77b2c69b5a5a6a221029 (patch)
tree185649abbf090221ed8f9411709633ee37d3b3d0
parent15d0f1f0267283ebc7bac9bf0a7f9e1bdb3ec0c3 (diff)
downloadorg.eclipse.papyrus-736db7e86c838a6a162b77b2c69b5a5a6a221029.tar.gz
org.eclipse.papyrus-736db7e86c838a6a162b77b2c69b5a5a6a221029.tar.xz
org.eclipse.papyrus-736db7e86c838a6a162b77b2c69b5a5a6a221029.zip
[Releng] Fix metadata
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF3
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java1
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteBlockTest.java68
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllCopyPasteTests.java2
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllDragDropTests.java1
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllTests.java9
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/META-INF/MANIFEST.MF3
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/AllTests.java1
-rw-r--r--tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/META-INF/MANIFEST.MF3
-rw-r--r--tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/build.properties4
10 files changed, 59 insertions, 36 deletions
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
index 3f78ff05f33..d74ba0b5edc 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
@@ -46,7 +46,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.0",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",
org.eclipse.papyrus.uml.diagram.wizards.tests;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.modelrepair;bundle-version="1.0.0"
+ org.eclipse.papyrus.uml.modelrepair;bundle-version="1.0.0",
+ org.eclipse.papyrus.diagram.profile.tests;bundle-version="1.0.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.0.0.qualifier
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
index 2e6f43abbd6..adf8088bd65 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
@@ -91,6 +91,7 @@ public class AllTests {
suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.timing.tests.AllTests.class));
suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.usecase.tests.AllTests.class));
suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.composite.test.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.diagram.profile.tests.AllTests.class));
//suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.sequence.tests.AllTests.class)); //Disabled. They currently do not run on Hudson
// suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.interactionoverview.tests.AllTests.class)); //Disabled. They currently do not run on Hudson
//
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteBlockTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteBlockTest.java
index e936af4ae53..26349cd3851 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteBlockTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/copypaste/AbstractCopyPasteBlockTest.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2011 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
@@ -8,8 +8,8 @@
*
* Contributors:
* Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *
- *
+ *
+ *
*
*****************************************************************************/
package org.eclipse.papyrus.sysml.modelexplorer.tests.copypaste;
@@ -32,36 +32,54 @@ public abstract class AbstractCopyPasteBlockTest extends AbstractCopyPasteTest {
/**
* {@inheritDoc}
- *
- *
+ *
+ *
*/
@Override
protected void initializeTest(Map<Object, Object> additionalChecks, EObject targetContainer, EObject copiedEObject) {
- super.initializeTest(additionalChecks, targetContainer, copiedEObject);
-
- /* pre-copy initialization */
- List<Property> originalParts = new ArrayList<Property>();
- for(Property p : ((org.eclipse.uml2.uml.Class)copiedEObject).getAllAttributes()) { if(new org.eclipse.papyrus.sysml.service.types.matcher.PartPropertyMatcher().matches(p)) {originalParts.add(p);}} additionalChecks.put("originalParts", originalParts);
- /* END OF pre-copy initialization */
- }
+ super.initializeTest(additionalChecks, targetContainer, copiedEObject);
+
+ /* pre-copy initialization */
+ List<Property> originalParts = new ArrayList<Property>();
+ for(Property p : ((org.eclipse.uml2.uml.Class)copiedEObject).getAllAttributes()) {
+ if(new org.eclipse.papyrus.sysml.service.types.matcher.PartPropertyMatcher().matches(p)) {
+ originalParts.add(p);
+ }
+ }
+ additionalChecks.put("originalParts", originalParts);
+ /* END OF pre-copy initialization */
+ }
/**
* {@inheritDoc}
- *
- *
+ *
+ *
*/
@Override
protected void postCopyAdditionalChecks(Map<?, ?> originalModel, List<EObject> newValues, List<EObject> delta) throws Exception {
- super.postCopyAdditionalChecks(originalModel, newValues, delta);
-
- /* post copy checks */
- FilteredCollectionView<EObject> newClasses = new FilteredCollectionView<EObject>(delta, new IFilter() { /** * {@inheritDoc} */ public boolean isAllowed(Object object) { return object instanceof org.eclipse.uml2.uml.Class && !(object instanceof org.eclipse.uml2.uml.Association); } });
- Assert.assertEquals("New values should contain a Class", 1, newClasses.size()); //$NON-NLS-1$
- org.eclipse.uml2.uml.Class newBlock = newClasses.toArray(new org.eclipse.uml2.uml.Class[]{})[0];
- Assert.assertNotNull("Block stereotype should be applied", ((org.eclipse.uml2.uml.Class) newBlock).getAppliedStereotype("SysML::Blocks::Block")); //$NON-NLS-1$
- List<Property> originalParts = (List<Property>) originalModel .get("originalParts"); List<Property> newParts = new ArrayList<Property>(); for (Property p : ((org.eclipse.uml2.uml.Class) newBlock) .getAllAttributes()) { if (new org.eclipse.papyrus.sysml.service.types.matcher.PartPropertyMatcher().matches(p)) { newParts.add(p); Assert.assertNotNull( "Part should have an associated association.", p.getAssociation()); } }
- Assert.assertEquals( "Both original and new list of attributes should be quivalent for the blocks", originalParts.size(), newParts.size()); //$NON-NLS-1$
- /* END OF post copy checks */
- }
+ super.postCopyAdditionalChecks(originalModel, newValues, delta);
+
+ /* post copy checks */
+ FilteredCollectionView<EObject> newClasses = new FilteredCollectionView<EObject>(delta, new IFilter() {
+
+ /** * {@inheritDoc} */
+ public boolean isAllowed(Object object) {
+ return object instanceof org.eclipse.uml2.uml.Class && !(object instanceof org.eclipse.uml2.uml.Association);
+ }
+ });
+ Assert.assertEquals("New values should contain a Class", 1, newClasses.size()); //$NON-NLS-1$
+ org.eclipse.uml2.uml.Class newBlock = newClasses.toArray(new org.eclipse.uml2.uml.Class[]{})[0];
+ Assert.assertNotNull("Block stereotype should be applied", newBlock.getAppliedStereotype("SysML::Blocks::Block")); //$NON-NLS-1$
+ List<Property> originalParts = (List<Property>)originalModel.get("originalParts");
+ List<Property> newParts = new ArrayList<Property>();
+ for(Property p : newBlock.getAllAttributes()) {
+ if(new org.eclipse.papyrus.sysml.service.types.matcher.PartPropertyMatcher().matches(p)) {
+ newParts.add(p);
+ Assert.assertNotNull("Part should have an associated association.", p.getAssociation());
+ }
+ }
+ Assert.assertEquals("Both original and new list of attributes should be quivalent for the blocks", originalParts.size(), newParts.size()); //$NON-NLS-1$
+ /* END OF post copy checks */
+ }
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllCopyPasteTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllCopyPasteTests.java
index e8a9f2f427e..70cf127a441 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllCopyPasteTests.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllCopyPasteTests.java
@@ -37,5 +37,5 @@ CopyPasteSimplePartTest.class,
})
public class AllCopyPasteTests {
-
+ //Test suite
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllDragDropTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllDragDropTests.java
index 4daa9c130c4..7962b49c5db 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllDragDropTests.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllDragDropTests.java
@@ -27,4 +27,5 @@ import org.junit.runners.Suite.SuiteClasses;
IBDDragDropTest.class,
})
public class AllDragDropTests {
+ //Test suite
}
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllTests.java
index 70bd3cc5823..5a75dabf2fa 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllTests.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/test/org/eclipse/papyrus/sysml/modelexplorer/tests/suites/AllTests.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2011 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
@@ -21,10 +21,7 @@ import org.junit.runners.Suite.SuiteClasses;
* Main test suite class
*/
@RunWith(Suite.class)
-@SuiteClasses({
- AllDragDropTests.class,
- AllCopyPasteTests.class,
-})
+@SuiteClasses({ AllDragDropTests.class, AllCopyPasteTests.class, })
public class AllTests {
-
+ //Test suite
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/META-INF/MANIFEST.MF
index 1a7eecd9484..ab519693fb6 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Profile Tests
+Bundle-Name: Profile Diagram Tests (Incubation)
Bundle-SymbolicName: org.eclipse.papyrus.diagram.profile.tests
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.papyrus.diagram.profile.tests.Activator
@@ -20,3 +20,4 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.papyrus.diagram.profile.tests
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/AllTests.java
index 4acccae20bb..827e2447ad1 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/AllTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.profile.tests/src/org/eclipse/papyrus/diagram/profile/tests/AllTests.java
@@ -19,4 +19,5 @@ import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses({ AllCanonicalTests.class })
public class AllTests {
+ //Test suite
}
diff --git a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/META-INF/MANIFEST.MF b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/META-INF/MANIFEST.MF
index ec87b07512d..f2acbc6618e 100644
--- a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/META-INF/MANIFEST.MF
+++ b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: NewChildTest
+Bundle-Name: NewChildTest (Incubation)
Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.test;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.papyrus.infra.newchild.test.Activator
@@ -9,3 +9,4 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.newchild;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: Eclipse Modeling Project
diff --git a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/build.properties b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/build.properties
index 6f20375d6c7..e0e105b23b5 100644
--- a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/build.properties
+++ b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/build.properties
@@ -2,4 +2,6 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ about.html
+src.includes = about.html

Back to the top