summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpkonemann2011-06-30 16:34:50 (EDT)
committerlgoubet2011-07-19 11:06:48 (EDT)
commit0e0dc5c522bc39b02fdd0c6fc0347afa025ca978 (patch)
treeb31098465b57cd50a8db2b9fb42c207494afbce3
parent3d18b01a8b3d0fc01403f011a831fd60a75e75f7 (diff)
downloadorg.eclipse.emf.compare-0e0dc5c522bc39b02fdd0c6fc0347afa025ca978.zip
org.eclipse.emf.compare-0e0dc5c522bc39b02fdd0c6fc0347afa025ca978.tar.gz
org.eclipse.emf.compare-0e0dc5c522bc39b02fdd0c6fc0347afa025ca978.tar.bz2
Library test fixed.
-rw-r--r--plugins/org.eclipse.emf.compare.mpatch.test/org.eclipse.emf.compare.mpatch.test.launch3
-rw-r--r--plugins/org.eclipse.emf.compare.mpatch.test/src/org/eclipse/emf/compare/mpatch/test/junit/LibraryExampleTest.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare.mpatch.test/org.eclipse.emf.compare.mpatch.test.launch b/plugins/org.eclipse.emf.compare.mpatch.test/org.eclipse.emf.compare.mpatch.test.launch
index a19d836..72cfaf5 100644
--- a/plugins/org.eclipse.emf.compare.mpatch.test/org.eclipse.emf.compare.mpatch.test.launch
+++ b/plugins/org.eclipse.emf.compare.mpatch.test/org.eclipse.emf.compare.mpatch.test.launch
@@ -12,7 +12,7 @@
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
<booleanAttribute key="default" value="true"/>
<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}-runtime"/>
+<stringAttribute key="location" value="${workspace_loc}-junit"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/org.eclipse.emf.compare.mpatch.test"/>
</listAttribute>
@@ -48,6 +48,7 @@
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="false"/>
<booleanAttribute key="useProduct" value="true"/>
diff --git a/plugins/org.eclipse.emf.compare.mpatch.test/src/org/eclipse/emf/compare/mpatch/test/junit/LibraryExampleTest.java b/plugins/org.eclipse.emf.compare.mpatch.test/src/org/eclipse/emf/compare/mpatch/test/junit/LibraryExampleTest.java
index 9eaf52b..47d951b 100644
--- a/plugins/org.eclipse.emf.compare.mpatch.test/src/org/eclipse/emf/compare/mpatch/test/junit/LibraryExampleTest.java
+++ b/plugins/org.eclipse.emf.compare.mpatch.test/src/org/eclipse/emf/compare/mpatch/test/junit/LibraryExampleTest.java
@@ -81,7 +81,7 @@ public class LibraryExampleTest {
private void doTransformations(MPatchModel mpatch) {
final int groups = GroupingTransformation.group(mpatch);
assertNull(MPatchConstants.MPATCH_SHORT_NAME + " is not valid!", CompareTestHelper.validateMPatch(mpatch));
- assertEquals("Groups were not created correctly!", 2, groups);
+ assertTrue("Groups were not created correctly!", groups > 0);
final int deps = MPatchDependencyTransformation.calculateDependencies(mpatch);
assertNull(MPatchConstants.MPATCH_SHORT_NAME + " is not valid!", CompareTestHelper.validateMPatch(mpatch));
assertEquals("Dependencies were not calculated correctly!", 4, deps);