Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2013-05-29 10:07:55 +0000
committercletavernie2013-05-29 10:07:55 +0000
commit0241a016a75edee3b0fc6ac94f291dad2b080d0e (patch)
tree47f540984d3b8a85c6cd4bf9e6ae7220626290ed
parent005ef8b2c4bff322a790ace9377d08359e42d5c6 (diff)
downloadorg.eclipse.papyrus-0241a016a75edee3b0fc6ac94f291dad2b080d0e.tar.gz
org.eclipse.papyrus-0241a016a75edee3b0fc6ac94f291dad2b080d0e.tar.xz
org.eclipse.papyrus-0241a016a75edee3b0fc6ac94f291dad2b080d0e.zip
[Trivial] Minor test fixes
-rw-r--r--tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java2
-rw-r--r--tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java8
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/.project6
3 files changed, 5 insertions, 11 deletions
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java
index 2d5b138d50d..a8905fb8abf 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundleTestsUtils.java
@@ -91,7 +91,7 @@ public class BundleTestsUtils {
for(IFeatureModel iFeatureModel : models2) {
final IFeature feature = iFeatureModel.getFeature();
final String id = feature.getId();
- if(id.contains("papyrus")) { //$NON-NLS-1$
+ if(id.startsWith(PAPYRUS_PREFIX)) { //$NON-NLS-1$
features.add((Feature)feature);
}
}
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
index 6b7bf2d3c6c..82fa1dc1979 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
@@ -133,7 +133,7 @@ public class BundlesTests {
message += localMessage + "\n"; //$NON-NLS-1$
}
}
- Assert.assertNull(nb + " problems! " + message, message); //$NON-NLS-1$
+ Assert.assertNull(nb + " problems!", message); //$NON-NLS-1$
}
/**
@@ -171,7 +171,7 @@ public class BundlesTests {
nb++;
}
}
- Assert.assertNull(nb + " problems! " + message, message); //$NON-NLS-1$
+ Assert.assertNull(nb + " problems!", message); //$NON-NLS-1$
}
/**
@@ -205,7 +205,7 @@ public class BundlesTests {
nb++;
}
}
- Assert.assertNull(nb + " problems! " + message, message); //$NON-NLS-1$
+ Assert.assertNull(nb + " problems!", message); //$NON-NLS-1$
}
/**
@@ -244,7 +244,7 @@ public class BundlesTests {
message += localMessage + "\n"; //$NON-NLS-1$
}
}
- Assert.assertNull(nb + " problems! " + message, message); //$NON-NLS-1$
+ Assert.assertNull(nb + " problems!", message); //$NON-NLS-1$
}
/**
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/.project b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/.project
index 7c6ab34c616..60a32182fe3 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/.project
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/.project
@@ -20,15 +20,9 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>

Back to the top