Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordwagelaar2015-11-25 20:47:55 +0000
committerdwagelaar2015-11-25 20:47:55 +0000
commit3e59bad95fadf45cfd9641dd4dcf87a761f13a55 (patch)
tree7ad8f45ce89f10076104836830d3ac1e047328ac
parentacd7518a802d8f5624b88fcb7d81780f0d2f1ecc (diff)
downloadorg.eclipse.atl-3e59bad95fadf45cfd9641dd4dcf87a761f13a55.tar.gz
org.eclipse.atl-3e59bad95fadf45cfd9641dd4dcf87a761f13a55.tar.xz
org.eclipse.atl-3e59bad95fadf45cfd9641dd4dcf87a761f13a55.zip
Fix NPE against EMF Compare 3.2.0.
-rw-r--r--tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EMFTVMTest.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EMFTVMTest.java b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EMFTVMTest.java
index 2755f365..dcaa1545 100644
--- a/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EMFTVMTest.java
+++ b/tests/org.eclipse.m2m.atl.emftvm.tests/src/org/eclipse/m2m/atl/emftvm/tests/EMFTVMTest.java
@@ -19,6 +19,7 @@ import java.util.logging.Logger;
import junit.framework.TestCase;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.util.BasicMonitor;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
@@ -71,12 +72,13 @@ public abstract class EMFTVMTest extends TestCase {
* the right-hand resource to compare
*/
public static void assertEquals(Resource leftResource, Resource rightResource) {
+ final BasicMonitor monitor = new BasicMonitor();
final DefaultComparisonScope scope = new DefaultComparisonScope(leftResource, rightResource, null);
- final Comparison match = DefaultMatchEngine.create(UseIdentifiers.NEVER).match(scope, null);
+ final Comparison match = DefaultMatchEngine.create(UseIdentifiers.NEVER).match(scope, monitor);
if (!leftResource.getContents().isEmpty()) {
assertFalse("Match model is empty: " + match.getMatches(), match.getMatches().isEmpty());
}
- new DefaultDiffEngine(new DiffBuilder()).diff(match, null);
+ new DefaultDiffEngine(new DiffBuilder()).diff(match, monitor);
for (Diff diff : match.getDifferences()) {
// allow only certain kinds of diff elements
if (diff instanceof ReferenceChange && ((ReferenceChange) diff).getKind() == DifferenceKind.CHANGE) {

Back to the top