diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests')
39 files changed, 1104 insertions, 1127 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/Node.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/Node.java index 0eac182ec..8b9626a4a 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/Node.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/Node.java @@ -11,7 +11,6 @@ package org.eclipse.emf.compare.tests.nodes; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EObject; /** diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/NodeFeatureMapContainment.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/NodeFeatureMapContainment.java index 9dca7dd78..20e562133 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/NodeFeatureMapContainment.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/NodeFeatureMapContainment.java @@ -11,7 +11,6 @@ package org.eclipse.emf.compare.tests.nodes; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.util.FeatureMap; /** diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/NodeFeatureMapNonContainment.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/NodeFeatureMapNonContainment.java index f625a7e78..68d039507 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/NodeFeatureMapNonContainment.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/NodeFeatureMapNonContainment.java @@ -11,7 +11,6 @@ package org.eclipse.emf.compare.tests.nodes; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.util.FeatureMap; /** diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeFeatureMapContainmentImpl.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeFeatureMapContainmentImpl.java index d38033309..2cc9138c5 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeFeatureMapContainmentImpl.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeFeatureMapContainmentImpl.java @@ -13,16 +13,12 @@ package org.eclipse.emf.compare.tests.nodes.impl; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.compare.tests.nodes.Node; import org.eclipse.emf.compare.tests.nodes.NodeFeatureMapContainment; import org.eclipse.emf.compare.tests.nodes.NodesPackage; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.util.BasicFeatureMap; import org.eclipse.emf.ecore.util.FeatureMap; import org.eclipse.emf.ecore.util.InternalEList; diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeFeatureMapNonContainmentImpl.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeFeatureMapNonContainmentImpl.java index 02151ceea..91f1ddf90 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeFeatureMapNonContainmentImpl.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeFeatureMapNonContainmentImpl.java @@ -13,16 +13,12 @@ package org.eclipse.emf.compare.tests.nodes.impl; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.compare.tests.nodes.Node; import org.eclipse.emf.compare.tests.nodes.NodeFeatureMapNonContainment; import org.eclipse.emf.compare.tests.nodes.NodesPackage; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.util.BasicFeatureMap; import org.eclipse.emf.ecore.util.FeatureMap; import org.eclipse.emf.ecore.util.InternalEList; diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeImpl.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeImpl.java index 97e624413..d89af6dfb 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeImpl.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeImpl.java @@ -14,18 +14,13 @@ import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.compare.tests.nodes.Node; import org.eclipse.emf.compare.tests.nodes.NodesPackage; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.EObjectImpl; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeMultiValueReferenceImpl.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeMultiValueReferenceImpl.java index 61d46eeca..1193f31f3 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeMultiValueReferenceImpl.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeMultiValueReferenceImpl.java @@ -13,13 +13,10 @@ package org.eclipse.emf.compare.tests.nodes.impl; import java.util.Collection; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.compare.tests.nodes.Node; import org.eclipse.emf.compare.tests.nodes.NodeMultiValueReference; import org.eclipse.emf.compare.tests.nodes.NodesPackage; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.util.EObjectResolvingEList; /** diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeMultiValuedAttributeImpl.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeMultiValuedAttributeImpl.java index 74ecbd289..cef4fa91b 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeMultiValuedAttributeImpl.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeMultiValuedAttributeImpl.java @@ -13,12 +13,9 @@ package org.eclipse.emf.compare.tests.nodes.impl; import java.util.Collection; import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.compare.tests.nodes.NodeMultiValuedAttribute; import org.eclipse.emf.compare.tests.nodes.NodesPackage; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.util.EDataTypeUniqueEList; /** diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeMultipleContainmentImpl.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeMultipleContainmentImpl.java index d6d3919f5..1f1c58834 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeMultipleContainmentImpl.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeMultipleContainmentImpl.java @@ -13,16 +13,12 @@ package org.eclipse.emf.compare.tests.nodes.impl; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.compare.tests.nodes.Node; import org.eclipse.emf.compare.tests.nodes.NodeMultipleContainment; import org.eclipse.emf.compare.tests.nodes.NodesPackage; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeOppositeRefManyToManyImpl.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeOppositeRefManyToManyImpl.java index 0ed294028..8069746ea 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeOppositeRefManyToManyImpl.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeOppositeRefManyToManyImpl.java @@ -13,15 +13,11 @@ package org.eclipse.emf.compare.tests.nodes.impl; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.compare.tests.nodes.NodeOppositeRefManyToMany; import org.eclipse.emf.compare.tests.nodes.NodesPackage; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; import org.eclipse.emf.ecore.util.InternalEList; diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeOppositeRefOneToManyImpl.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeOppositeRefOneToManyImpl.java index 57e40a281..a37ca2c14 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeOppositeRefOneToManyImpl.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeOppositeRefOneToManyImpl.java @@ -14,17 +14,12 @@ import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.compare.tests.nodes.NodeOppositeRefOneToMany; import org.eclipse.emf.compare.tests.nodes.NodesPackage; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; import org.eclipse.emf.ecore.util.InternalEList; diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeOppositeRefOneToOneImpl.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeOppositeRefOneToOneImpl.java index 789f6140b..7f906e1a9 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeOppositeRefOneToOneImpl.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeOppositeRefOneToOneImpl.java @@ -12,13 +12,10 @@ package org.eclipse.emf.compare.tests.nodes.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.compare.tests.nodes.NodeOppositeRefOneToOne; import org.eclipse.emf.compare.tests.nodes.NodesPackage; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; /** diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeSingleValueAttributeImpl.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeSingleValueAttributeImpl.java index b5658179f..5deaeab50 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeSingleValueAttributeImpl.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeSingleValueAttributeImpl.java @@ -11,12 +11,9 @@ package org.eclipse.emf.compare.tests.nodes.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.compare.tests.nodes.NodeSingleValueAttribute; import org.eclipse.emf.compare.tests.nodes.NodesPackage; - import org.eclipse.emf.ecore.EClass; - import org.eclipse.emf.ecore.impl.ENotificationImpl; /** diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeSingleValueContainmentImpl.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeSingleValueContainmentImpl.java index 471e34297..a7d8ed3d8 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeSingleValueContainmentImpl.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeSingleValueContainmentImpl.java @@ -12,14 +12,11 @@ package org.eclipse.emf.compare.tests.nodes.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.compare.tests.nodes.Node; import org.eclipse.emf.compare.tests.nodes.NodeSingleValueContainment; import org.eclipse.emf.compare.tests.nodes.NodesPackage; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; /** diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeSingleValueReferenceImpl.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeSingleValueReferenceImpl.java index 78eaf1700..c282695cc 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeSingleValueReferenceImpl.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeSingleValueReferenceImpl.java @@ -11,14 +11,11 @@ package org.eclipse.emf.compare.tests.nodes.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.compare.tests.nodes.Node; import org.eclipse.emf.compare.tests.nodes.NodeSingleValueReference; import org.eclipse.emf.compare.tests.nodes.NodesPackage; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; /** diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodesFactoryImpl.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodesFactoryImpl.java index 1bc0eb362..ae77e52ed 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodesFactoryImpl.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodesFactoryImpl.java @@ -10,14 +10,24 @@ */ package org.eclipse.emf.compare.tests.nodes.impl; -import org.eclipse.emf.compare.tests.nodes.*; - +import org.eclipse.emf.compare.tests.nodes.Node; +import org.eclipse.emf.compare.tests.nodes.NodeFeatureMapContainment; +import org.eclipse.emf.compare.tests.nodes.NodeFeatureMapNonContainment; +import org.eclipse.emf.compare.tests.nodes.NodeMultiValueReference; +import org.eclipse.emf.compare.tests.nodes.NodeMultiValuedAttribute; +import org.eclipse.emf.compare.tests.nodes.NodeMultipleContainment; +import org.eclipse.emf.compare.tests.nodes.NodeOppositeRefManyToMany; +import org.eclipse.emf.compare.tests.nodes.NodeOppositeRefOneToMany; +import org.eclipse.emf.compare.tests.nodes.NodeOppositeRefOneToOne; +import org.eclipse.emf.compare.tests.nodes.NodeSingleValueAttribute; +import org.eclipse.emf.compare.tests.nodes.NodeSingleValueContainment; +import org.eclipse.emf.compare.tests.nodes.NodeSingleValueReference; +import org.eclipse.emf.compare.tests.nodes.NodesFactory; +import org.eclipse.emf.compare.tests.nodes.NodesPackage; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.impl.EFactoryImpl; - import org.eclipse.emf.ecore.plugin.EcorePlugin; /** diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesAdapterFactory.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesAdapterFactory.java index 63e4bc30a..f80695d1e 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesAdapterFactory.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesAdapterFactory.java @@ -12,11 +12,20 @@ package org.eclipse.emf.compare.tests.nodes.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; - import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; - -import org.eclipse.emf.compare.tests.nodes.*; - +import org.eclipse.emf.compare.tests.nodes.Node; +import org.eclipse.emf.compare.tests.nodes.NodeFeatureMapContainment; +import org.eclipse.emf.compare.tests.nodes.NodeFeatureMapNonContainment; +import org.eclipse.emf.compare.tests.nodes.NodeMultiValueReference; +import org.eclipse.emf.compare.tests.nodes.NodeMultiValuedAttribute; +import org.eclipse.emf.compare.tests.nodes.NodeMultipleContainment; +import org.eclipse.emf.compare.tests.nodes.NodeOppositeRefManyToMany; +import org.eclipse.emf.compare.tests.nodes.NodeOppositeRefOneToMany; +import org.eclipse.emf.compare.tests.nodes.NodeOppositeRefOneToOne; +import org.eclipse.emf.compare.tests.nodes.NodeSingleValueAttribute; +import org.eclipse.emf.compare.tests.nodes.NodeSingleValueContainment; +import org.eclipse.emf.compare.tests.nodes.NodeSingleValueReference; +import org.eclipse.emf.compare.tests.nodes.NodesPackage; import org.eclipse.emf.ecore.EObject; /** diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesResourceFactoryImpl.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesResourceFactoryImpl.java index ca52fb024..1a005264f 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesResourceFactoryImpl.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesResourceFactoryImpl.java @@ -11,9 +11,7 @@ package org.eclipse.emf.compare.tests.nodes.util; import org.eclipse.emf.common.util.URI; - import org.eclipse.emf.ecore.resource.Resource; - import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl; /** diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesResourceImpl.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesResourceImpl.java index 0ede9ccda..c70a23237 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesResourceImpl.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesResourceImpl.java @@ -11,7 +11,6 @@ package org.eclipse.emf.compare.tests.nodes.util; import org.eclipse.emf.common.util.URI; - import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; /** diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesSwitch.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesSwitch.java index dd37e5e23..3d445888c 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesSwitch.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesSwitch.java @@ -12,8 +12,19 @@ package org.eclipse.emf.compare.tests.nodes.util; import java.util.List; -import org.eclipse.emf.compare.tests.nodes.*; - +import org.eclipse.emf.compare.tests.nodes.Node; +import org.eclipse.emf.compare.tests.nodes.NodeFeatureMapContainment; +import org.eclipse.emf.compare.tests.nodes.NodeFeatureMapNonContainment; +import org.eclipse.emf.compare.tests.nodes.NodeMultiValueReference; +import org.eclipse.emf.compare.tests.nodes.NodeMultiValuedAttribute; +import org.eclipse.emf.compare.tests.nodes.NodeMultipleContainment; +import org.eclipse.emf.compare.tests.nodes.NodeOppositeRefManyToMany; +import org.eclipse.emf.compare.tests.nodes.NodeOppositeRefOneToMany; +import org.eclipse.emf.compare.tests.nodes.NodeOppositeRefOneToOne; +import org.eclipse.emf.compare.tests.nodes.NodeSingleValueAttribute; +import org.eclipse.emf.compare.tests.nodes.NodeSingleValueContainment; +import org.eclipse.emf.compare.tests.nodes.NodeSingleValueReference; +import org.eclipse.emf.compare.tests.nodes.NodesPackage; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/ConflictDetectionTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/ConflictDetectionTest.java index 5fad59357..97dcce675 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/ConflictDetectionTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/ConflictDetectionTest.java @@ -23,6 +23,7 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.movedInReferenc import static org.eclipse.emf.compare.utils.EMFComparePredicates.removed; import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromAttribute; import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromReference; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; @@ -63,8 +64,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = changedAttribute("root.conflictHolder", "singleValuedAttribute", "origin", "left"); @@ -82,7 +83,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -105,8 +106,8 @@ public class ConflictDetectionTest { * unset, and that same reference has been changed on the left to a new value. The two diffs on the * right are in conflict with the only diff on the left. */ - assertSame(Integer.valueOf(3), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(3, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftReferenceDiffDescription = changedReference("root.conflictHolder", "singleValuedReference", "root.origin", "root.left"); @@ -129,7 +130,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(3), Integer.valueOf(conflictDiff.size())); + assertEquals(3, conflictDiff.size()); assertTrue(conflictDiff.contains(leftReferenceDiff)); assertTrue(conflictDiff.contains(rightReferenceDiff)); assertTrue(conflictDiff.contains(rightDeleteDiff)); @@ -148,8 +149,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = changedAttribute("root.conflictHolder", "singleValuedAttribute", null, "left"); @@ -167,7 +168,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -186,8 +187,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = changedReference("root.conflictHolder", "singleValuedReference", null, "root.left"); @@ -205,7 +206,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -224,8 +225,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = changedAttribute("root.conflictHolder", "singleValuedAttribute", "origin", null); @@ -243,7 +244,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.PSEUDO, conflict.getKind()); @@ -266,8 +267,8 @@ public class ConflictDetectionTest { * unset, and that same reference has been unset on the left. All three diffs are in pseudo-conflict * with each other. */ - assertSame(Integer.valueOf(3), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(3, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftReferenceDiffDescription = changedReference("root.conflictHolder", "singleValuedReference", "root.origin", null); @@ -290,7 +291,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(3), Integer.valueOf(conflictDiff.size())); + assertEquals(3, conflictDiff.size()); assertTrue(conflictDiff.contains(leftReferenceDiff)); assertTrue(conflictDiff.contains(rightReferenceDiff)); assertTrue(conflictDiff.contains(rightDeleteDiff)); @@ -310,8 +311,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = changedAttribute("root.conflictHolder", "singleValuedAttribute", "origin", "left"); @@ -330,7 +331,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -349,8 +350,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = changedReference("root.conflictHolder", "singleValuedReference", "root.origin", "root.left"); @@ -369,7 +370,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -388,8 +389,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = changedAttribute("root.conflictHolder", "singleValuedAttribute", "origin", "left"); @@ -408,7 +409,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -427,8 +428,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = changedReference("root.conflictHolder", "singleValuedReference", "root.origin", "root.left"); @@ -447,7 +448,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -466,8 +467,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = changedAttribute("root.conflictHolder", "singleValuedAttribute", null, "left"); @@ -486,7 +487,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -505,8 +506,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = changedReference("root.conflictHolder", "singleValuedReference", null, "root.left"); @@ -525,7 +526,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -544,8 +545,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = changedAttribute("root.conflictHolder", "singleValuedAttribute", "origin", null); @@ -564,7 +565,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -583,8 +584,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = changedReference("root.conflictHolder", "singleValuedReference", "root.origin", null); @@ -603,7 +604,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -622,8 +623,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = changedAttribute("root.conflictHolder", "singleValuedAttribute", null, "leftAndRight"); @@ -642,7 +643,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.PSEUDO, conflict.getKind()); @@ -661,8 +662,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = changedReference("root.conflictHolder", "singleValuedReference", null, "root.leftAndRight"); @@ -681,7 +682,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.PSEUDO, conflict.getKind()); @@ -700,8 +701,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = changedAttribute("root.conflictHolder", "singleValuedAttribute", "origin", null); @@ -720,7 +721,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.PSEUDO, conflict.getKind()); @@ -739,8 +740,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = changedReference("root.conflictHolder", "singleValuedReference", "root.origin", null); @@ -759,7 +760,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.PSEUDO, conflict.getKind()); @@ -778,8 +779,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = addedToAttribute("root.conflictHolder", "multiValuedAttribute", "left1"); @@ -797,7 +798,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -821,8 +822,8 @@ public class ConflictDetectionTest { * reference on the left side. The addition of a value into the reference conflicts with the removal * of the container from the right. The three other diffs do not conflict. */ - assertSame(Integer.valueOf(5), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(5, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftReferenceDiffDescription = addedToReference("root.conflictHolder", "multiValuedReference", "root.left1"); @@ -855,7 +856,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftReferenceDiff)); assertTrue(conflictDiff.contains(rightDeleteDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -874,8 +875,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = removedFromAttribute("root.conflictHolder", "multiValuedAttribute", "origin1"); @@ -893,7 +894,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.PSEUDO, conflict.getKind()); @@ -918,8 +919,8 @@ public class ConflictDetectionTest { * removal of the container from the right. It is also in pseudo-conflict with the deletion of this * same value on the right. */ - assertSame(Integer.valueOf(5), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(5, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftReferenceDiffDescription = removedFromReference( "root.conflictHolder", "multiValuedReference", "root.origin1"); @@ -952,7 +953,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(3), Integer.valueOf(conflictDiff.size())); + assertEquals(3, conflictDiff.size()); assertTrue(conflictDiff.contains(leftReferenceDiff)); assertTrue(conflictDiff.contains(rightDeleteDiff)); assertTrue(conflictDiff.contains(rightReferenceDiff1)); @@ -972,8 +973,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = addedToAttribute("root.conflictHolder", "multiValuedAttribute", "left1"); @@ -991,7 +992,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -1010,8 +1011,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftReferenceDiffDescription = addedToReference("root.conflictHolder", "multiValuedReference", "root.left1"); @@ -1029,7 +1030,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftReferenceDiff)); assertTrue(conflictDiff.contains(rightDeleteDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -1052,8 +1053,8 @@ public class ConflictDetectionTest { * three values of one of this element's features have been removed. All three diffs on the left are * in conflict with the right diff. */ - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(4, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftAttributeDiff1Description = removedFromAttribute( "root.conflictHolder", "multiValuedAttribute", "origin1"); @@ -1081,7 +1082,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(conflictDiff.size())); + assertEquals(4, conflictDiff.size()); assertTrue(conflictDiff.contains(leftAttributeDiff1)); assertTrue(conflictDiff.contains(leftAttributeDiff2)); assertTrue(conflictDiff.contains(leftAttributeDiff3)); @@ -1106,8 +1107,8 @@ public class ConflictDetectionTest { * element's reference have been removed. On the left, we've also removed all three values of that * same reference. All 7 differences are in pseudo-conflict with each other. */ - assertSame(Integer.valueOf(7), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(7, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> referenceDiff1Description = removedFromReference("root.conflictHolder", "multiValuedReference", "root.origin1"); @@ -1144,7 +1145,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(7), Integer.valueOf(conflictDiff.size())); + assertEquals(7, conflictDiff.size()); assertTrue(conflictDiff.contains(leftReferenceDiff1)); assertTrue(conflictDiff.contains(leftReferenceDiff2)); assertTrue(conflictDiff.contains(leftReferenceDiff3)); @@ -1168,8 +1169,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = movedInAttribute("root.conflictHolder", "multiValuedAttribute", "origin1"); @@ -1187,7 +1188,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -1210,8 +1211,8 @@ public class ConflictDetectionTest { * of its reference have been deleted too. In the left, we've moved one of these values to another * index. The MOVE conflicts with both the container deletion and the value's removal. */ - assertSame(Integer.valueOf(5), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(5, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftReferenceDiffDescription = movedInReference("root.conflictHolder", "multiValuedReference", "root.origin1"); @@ -1244,7 +1245,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(3), Integer.valueOf(conflictDiff.size())); + assertEquals(3, conflictDiff.size()); assertTrue(conflictDiff.contains(leftReferenceDiff)); assertTrue(conflictDiff.contains(rightDeleteDiff)); assertTrue(conflictDiff.contains(rightReferenceDiff1)); @@ -1264,8 +1265,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = removedFromAttribute("root.conflictHolder", "multiValuedAttribute", "origin1"); @@ -1284,7 +1285,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -1303,8 +1304,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = removedFromReference("root.conflictHolder", "multiValuedReference", "root.origin1"); @@ -1323,7 +1324,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -1342,8 +1343,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = movedInAttribute("root.conflictHolder", "multiValuedAttribute", "origin1"); @@ -1362,7 +1363,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -1381,8 +1382,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = movedInReference("root.conflictHolder", "multiValuedReference", "root.origin1"); @@ -1401,7 +1402,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -1420,8 +1421,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = movedInAttribute("root.conflictHolder", "multiValuedAttribute", "origin1"); @@ -1440,7 +1441,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -1459,8 +1460,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = movedInReference("root.conflictHolder", "multiValuedReference", "root.origin1"); @@ -1479,7 +1480,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -1501,8 +1502,8 @@ public class ConflictDetectionTest { * We expect 6 differences here. On both right and left, we've emptied an attribute from its 3 values. * This should give use 3 pseudo-conflict, each removal conflicting with its other side. */ - assertSame(Integer.valueOf(6), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(3), Integer.valueOf(conflicts.size())); + assertEquals(6, differences.size()); + assertEquals(3, conflicts.size()); final Predicate<? super Diff> AttributeDiff1Description = removedFromAttribute("root.conflictHolder", "multiValuedAttribute", "origin1"); @@ -1536,7 +1537,7 @@ public class ConflictDetectionTest { final Conflict conflict1 = conflicts.get(0); final List<Diff> conflictDiffs1 = conflict1.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiffs1.size())); + assertEquals(2, conflictDiffs1.size()); assertTrue(conflictDiffs1.contains(leftAttributeDiff1)); assertTrue(conflictDiffs1.contains(rightAttributeDiff1)); assertSame(ConflictKind.PSEUDO, conflict1.getKind()); @@ -1544,7 +1545,7 @@ public class ConflictDetectionTest { final Conflict conflict2 = conflicts.get(1); final List<Diff> conflictDiffs2 = conflict2.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiffs2.size())); + assertEquals(2, conflictDiffs2.size()); assertTrue(conflictDiffs2.contains(leftAttributeDiff2)); assertTrue(conflictDiffs2.contains(rightAttributeDiff2)); assertSame(ConflictKind.PSEUDO, conflict2.getKind()); @@ -1552,7 +1553,7 @@ public class ConflictDetectionTest { final Conflict conflict3 = conflicts.get(2); final List<Diff> conflictDiffs3 = conflict3.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiffs3.size())); + assertEquals(2, conflictDiffs3.size()); assertTrue(conflictDiffs3.contains(leftAttributeDiff3)); assertTrue(conflictDiffs3.contains(rightAttributeDiff3)); assertSame(ConflictKind.PSEUDO, conflict3.getKind()); @@ -1574,8 +1575,8 @@ public class ConflictDetectionTest { * We expect 6 differences here. On both right and left, we've emptied a reference from its 3 values. * This should give use 3 pseudo-conflict, each removal conflicting with its other side. */ - assertSame(Integer.valueOf(6), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(3), Integer.valueOf(conflicts.size())); + assertEquals(6, differences.size()); + assertEquals(3, conflicts.size()); final Predicate<? super Diff> referenceDiff1Description = removedFromReference("root.conflictHolder", "multiValuedReference", "root.origin1"); @@ -1609,7 +1610,7 @@ public class ConflictDetectionTest { final Conflict conflict1 = conflicts.get(0); final List<Diff> conflictDiffs1 = conflict1.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiffs1.size())); + assertEquals(2, conflictDiffs1.size()); assertTrue(conflictDiffs1.contains(leftReferenceDiff1)); assertTrue(conflictDiffs1.contains(rightReferenceDiff1)); assertSame(ConflictKind.PSEUDO, conflict1.getKind()); @@ -1617,7 +1618,7 @@ public class ConflictDetectionTest { final Conflict conflict2 = conflicts.get(1); final List<Diff> conflictDiffs2 = conflict2.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiffs2.size())); + assertEquals(2, conflictDiffs2.size()); assertTrue(conflictDiffs2.contains(leftReferenceDiff2)); assertTrue(conflictDiffs2.contains(rightReferenceDiff2)); assertSame(ConflictKind.PSEUDO, conflict2.getKind()); @@ -1625,7 +1626,7 @@ public class ConflictDetectionTest { final Conflict conflict3 = conflicts.get(2); final List<Diff> conflictDiffs3 = conflict3.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiffs3.size())); + assertEquals(2, conflictDiffs3.size()); assertTrue(conflictDiffs3.contains(leftReferenceDiff3)); assertTrue(conflictDiffs3.contains(rightReferenceDiff3)); assertSame(ConflictKind.PSEUDO, conflict3.getKind()); @@ -1644,8 +1645,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> diffDescription = removedFromAttribute("root.conflictHolder", "multiValuedAttribute", "origin1"); @@ -1662,7 +1663,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.PSEUDO, conflict.getKind()); @@ -1681,8 +1682,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> diffDescription = removedFromReference("root.conflictHolder", "multiValuedReference", "root.origin1"); @@ -1699,7 +1700,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.PSEUDO, conflict.getKind()); @@ -1718,8 +1719,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> diffDescription = movedInAttribute("root.conflictHolder", "multiValuedAttribute", "origin1"); @@ -1736,7 +1737,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.PSEUDO, conflict.getKind()); @@ -1755,8 +1756,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> diffDescription = movedInReference("root.conflictHolder", "multiValuedReference", "root.origin1"); @@ -1773,7 +1774,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.PSEUDO, conflict.getKind()); @@ -1792,8 +1793,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = changedReference("root.conflictHolder", "singleValuedReference", null, "root.origin"); @@ -1811,7 +1812,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -1830,8 +1831,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = addedToReference("root.conflictHolder", "multiValuedReference", "root.origin"); @@ -1849,7 +1850,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -1868,8 +1869,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = moved("root.conflictHolder.origin", "containmentRef2"); @@ -1888,7 +1889,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -1907,8 +1908,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = moved("root.leftContainer.conflictNode", "containmentRef1"); @@ -1927,7 +1928,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -1946,8 +1947,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = moved("root.left.conflictNode", "singleValueContainment"); @@ -1965,7 +1966,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -1984,8 +1985,8 @@ public class ConflictDetectionTest { final List<Conflict> conflicts = comparison.getConflicts(); // We should have no less and no more than 2 differences, composing a single conflict - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(2, differences.size()); + assertEquals(1, conflicts.size()); final Predicate<? super Diff> leftDiffDescription = moved("root.leftContainer.conflictNode", "containmentRef1"); @@ -2003,7 +2004,7 @@ public class ConflictDetectionTest { final Conflict conflict = conflicts.get(0); final List<Diff> conflictDiff = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiff.size())); + assertEquals(2, conflictDiff.size()); assertTrue(conflictDiff.contains(leftDiff)); assertTrue(conflictDiff.contains(rightDiff)); assertSame(ConflictKind.REAL, conflict.getKind()); @@ -2021,8 +2022,8 @@ public class ConflictDetectionTest { final List<Diff> differences = comparison.getDifferences(); final List<Conflict> conflicts = comparison.getConflicts(); - assertSame(Integer.valueOf(5), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(5, differences.size()); + assertEquals(1, conflicts.size()); Conflict soleConflict = conflicts.get(0); assertSame(ConflictKind.PSEUDO, soleConflict.getKind()); @@ -2040,8 +2041,8 @@ public class ConflictDetectionTest { final List<Diff> differences = comparison.getDifferences(); final List<Conflict> conflicts = comparison.getConflicts(); - assertSame(Integer.valueOf(5), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(conflicts.size())); + assertEquals(5, differences.size()); + assertEquals(1, conflicts.size()); Conflict soleConflict = conflicts.get(0); assertSame(ConflictKind.PSEUDO, soleConflict.getKind()); @@ -2084,8 +2085,8 @@ public class ConflictDetectionTest { // Pseudo conflict : 5 and 12 (Removing the same value on both sides) - assertSame(Integer.valueOf(12), Integer.valueOf(differences.size())); - assertSame(Integer.valueOf(5), Integer.valueOf(conflicts.size())); + assertEquals(12, differences.size()); + assertEquals(5, conflicts.size()); final Predicate<? super Diff> leftDiff1Description = added("Root.Node8"); final Predicate<? super Diff> leftDiff2Description = added("Root.Node9"); @@ -2144,7 +2145,7 @@ public class ConflictDetectionTest { // We know there are 5 conflicts here for (Conflict conflict : conflicts) { final List<Diff> conflictDiffs = conflict.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(conflictDiffs.size())); + assertEquals(2, conflictDiffs.size()); if (conflictDiffs.contains(leftDiff6)) { assertTrue(conflictDiffs.contains(rightDiff8)); assertSame(ConflictKind.REAL, conflict.getKind()); diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/ComparisonUtilTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/ComparisonUtilTest.java index 1ffe48157..b40718cdb 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/ComparisonUtilTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/ComparisonUtilTest.java @@ -11,10 +11,10 @@ package org.eclipse.emf.compare.tests.diff; import static com.google.common.base.Predicates.and; -import static junit.framework.Assert.assertEquals; import static org.eclipse.emf.compare.utils.EMFComparePredicates.fromSide; import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind; import static org.eclipse.emf.compare.utils.EMFComparePredicates.referenceValueMatch; +import static org.junit.Assert.assertEquals; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java index 079847df9..07b7f0bf5 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.emf.compare.tests.diff; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertSame; -import static junit.framework.Assert.fail; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.fail; import com.google.common.collect.Lists; @@ -135,25 +135,25 @@ public class DiffUtilTest { List<Integer> right = Lists.newArrayList(6, 2, 9, 3, 0, 4, 7); int insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(1)); // Inserted just before "0" - assertSame(Integer.valueOf(4), Integer.valueOf(insertionIndex)); + assertEquals(4, insertionIndex); // Merge the move of "9" (assume 9 already removed from right) right = Lists.newArrayList(6, 2, 3, 1, 0, 4, 7); insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(9)); // Inserted just before "2" - assertSame(Integer.valueOf(1), Integer.valueOf(insertionIndex)); + assertEquals(1, insertionIndex); // Merge the move of "0" (assume 0 already removed from right) right = Lists.newArrayList(6, 9, 2, 3, 1, 4, 7); insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(0)); // Inserted just before "4" - assertSame(Integer.valueOf(5), Integer.valueOf(insertionIndex)); + assertEquals(5, insertionIndex); // merge the addition of "8" right = Lists.newArrayList(6, 9, 2, 3, 1, 0, 4, 7); insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(8)); // Inserted just before "9" - assertSame(Integer.valueOf(1), Integer.valueOf(insertionIndex)); + assertEquals(1, insertionIndex); // remove "7"... right = {6, 8, 9, 2, 3, 1, 0, 4} @@ -161,13 +161,13 @@ public class DiffUtilTest { right = Lists.newArrayList(6, 8, 9, 2, 3, 1, 0); insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(4)); // Inserted just after "3" - assertSame(Integer.valueOf(5), Integer.valueOf(insertionIndex)); + assertEquals(5, insertionIndex); // merge the move of "6" (assume already removed from right) right = Lists.newArrayList(8, 9, 2, 3, 4, 1, 0); insertionIndex = DiffUtil.findInsertionIndex(emptyComparison, left, right, Integer.valueOf(6)); // Inserted just after "0" - assertSame(Integer.valueOf(7), Integer.valueOf(insertionIndex)); + assertEquals(7, insertionIndex); } @Test @@ -478,10 +478,12 @@ public class DiffUtilTest { 1d / 2d, 1d / 3d, 1d, 0d, 0d, }; for (int i = 0; i < data.length; i += 2) { assertEquals("Unexpected result of the dice coefficient for str1 = " + data[i] + " and str2 = " - + data[i + 1], similarities[i / 2], DiffUtil.diceCoefficient(data[i], data[i + 1])); + + data[i + 1], similarities[i / 2], DiffUtil.diceCoefficient(data[i], data[i + 1]), + Double.MIN_VALUE); // Make sure that the result is symmetric assertEquals("Dice coefficient was not symmetric for str1 = " + data[i] + " and str2 = " - + data[i + 1], similarities[i / 2], DiffUtil.diceCoefficient(data[i + 1], data[i])); + + data[i + 1], similarities[i / 2], DiffUtil.diceCoefficient(data[i + 1], data[i]), + Double.MIN_VALUE); } } @@ -517,7 +519,7 @@ public class DiffUtilTest { */ private static <T> void assertEqualContents(List<T> list1, List<T> list2) { final int size = list1.size(); - assertSame(Integer.valueOf(size), Integer.valueOf(list2.size())); + assertEquals(size, list2.size()); for (int i = 0; i < size; i++) { assertEquals(list1.get(i), list2.get(i)); diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/equi/EquiComputingTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/equi/EquiComputingTest.java index 993c0a2fe..9addcd8c0 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/equi/EquiComputingTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/equi/EquiComputingTest.java @@ -13,6 +13,7 @@ package org.eclipse.emf.compare.tests.equi; import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToReference; import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedReference; import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromReference; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; @@ -54,7 +55,7 @@ public class EquiComputingTest { List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 6 differences - assertSame(Integer.valueOf(6), Integer.valueOf(differences.size())); + assertEquals(6, differences.size()); Predicate<? super Diff> changeRefA2BDiffDescription = null; Predicate<? super Diff> changeRefB2ADiffDescription = null; @@ -130,7 +131,7 @@ public class EquiComputingTest { List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 8 differences - assertSame(Integer.valueOf(8), Integer.valueOf(differences.size())); + assertEquals(8, differences.size()); Predicate<? super Diff> changeRefC2D1DiffDescription = null; Predicate<? super Diff> changeRefC2D2DiffDescription = null; @@ -230,7 +231,7 @@ public class EquiComputingTest { List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 8 differences - assertSame(Integer.valueOf(8), Integer.valueOf(differences.size())); + assertEquals(8, differences.size()); Predicate<? super Diff> C1toD1DiffDescription = null; Predicate<? super Diff> C1toD2DiffDescription = null; @@ -317,7 +318,7 @@ public class EquiComputingTest { List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 8 differences - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); Predicate<? super Diff> AtoBdestDiffDescription = null; Predicate<? super Diff> AtoBsourceDiffDescription = null; @@ -374,7 +375,7 @@ public class EquiComputingTest { List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 12 differences - assertSame(Integer.valueOf(12), Integer.valueOf(differences.size())); + assertEquals(12, differences.size()); Predicate<? super Diff> changeRefA2BDiffDescription = null; Predicate<? super Diff> changeRefB2ADiffDescription = null; @@ -534,7 +535,7 @@ public class EquiComputingTest { List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 3 differences - assertSame(Integer.valueOf(3), Integer.valueOf(differences.size())); + assertEquals(3, differences.size()); Predicate<? super Diff> changeRefA2BDiffDescription = null; Predicate<? super Diff> changeRefB2ADiffDescription = null; @@ -584,7 +585,7 @@ public class EquiComputingTest { List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 4 differences - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); Predicate<? super Diff> changeRefA2BDiffDescription = null; Predicate<? super Diff> changeRefB2ADiffDescription = null; @@ -639,7 +640,7 @@ public class EquiComputingTest { List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 4 differences - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); Predicate<? super Diff> changeRefA2CDiffDescription = null; Predicate<? super Diff> deleteBDiffDescription = null; @@ -694,7 +695,7 @@ public class EquiComputingTest { List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 5 differences - assertSame(Integer.valueOf(5), Integer.valueOf(differences.size())); + assertEquals(5, differences.size()); Predicate<? super Diff> changeRefA2CDiffDescription = null; Predicate<? super Diff> deleteBDiffDescription = null; @@ -754,7 +755,7 @@ public class EquiComputingTest { List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 16 differences - assertSame(Integer.valueOf(16), Integer.valueOf(differences.size())); + assertEquals(16, differences.size()); Predicate<? super Diff> delBonADiffDescription = null; Predicate<? super Diff> delAonBDiffDescription = null; diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/FragmentationTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/FragmentationTest.java index cb7b7d1e4..e852f4f04 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/FragmentationTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/FragmentationTest.java @@ -71,15 +71,15 @@ public class FragmentationTest { EcoreUtil.resolveAll(originSet); EcoreUtil.resolveAll(rightSet); - assertSame(Integer.valueOf(1), Integer.valueOf(leftSet.getResources().size())); - assertSame(Integer.valueOf(2), Integer.valueOf(originSet.getResources().size())); - assertSame(Integer.valueOf(2), Integer.valueOf(rightSet.getResources().size())); + assertEquals(1, leftSet.getResources().size()); + assertEquals(2, originSet.getResources().size()); + assertEquals(2, rightSet.getResources().size()); final IComparisonScope scope = new DefaultComparisonScope(leftSet, rightSet, originSet); Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final Diff diff = differences.get(0); assertTrue(diff instanceof ResourceAttachmentChange); @@ -112,10 +112,10 @@ public class FragmentationTest { final Diff diff = differences.get(0); mergerRegistry.getHighestRankingMerger(diff).copyLeftToRight(diff, new BasicMonitor()); - assertSame(Integer.valueOf(1), Integer.valueOf(leftSet.getResources().size())); - assertSame(Integer.valueOf(2), Integer.valueOf(originSet.getResources().size())); + assertEquals(1, leftSet.getResources().size()); + assertEquals(2, originSet.getResources().size()); // Still two resources, though one is empty - assertSame(Integer.valueOf(2), Integer.valueOf(rightSet.getResources().size())); + assertEquals(2, rightSet.getResources().size()); for (Resource resource : rightSet.getResources()) { if (resource != right) { @@ -134,12 +134,12 @@ public class FragmentationTest { // there should be no diff between left and right final Comparison lrCompare = EMFCompare.builder().build().compare( new DefaultComparisonScope(leftSet, rightSet, null)); - assertSame(Integer.valueOf(0), Integer.valueOf(lrCompare.getDifferences().size())); + assertEquals(0, lrCompare.getDifferences().size()); // but there should be two diffs (a pseudo conflict resource change) when compared with origin comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getConflicts().size())); + assertEquals(2, comparison.getDifferences().size()); + assertEquals(1, comparison.getConflicts().size()); assertSame(ConflictKind.PSEUDO, comparison.getConflicts().get(0).getKind()); } @@ -167,9 +167,9 @@ public class FragmentationTest { final Diff diff = differences.get(0); mergerRegistry.getHighestRankingMerger(diff).copyRightToLeft(diff, new BasicMonitor()); - assertSame(Integer.valueOf(2), Integer.valueOf(leftSet.getResources().size())); - assertSame(Integer.valueOf(2), Integer.valueOf(originSet.getResources().size())); - assertSame(Integer.valueOf(2), Integer.valueOf(rightSet.getResources().size())); + assertEquals(2, leftSet.getResources().size()); + assertEquals(2, originSet.getResources().size()); + assertEquals(2, rightSet.getResources().size()); final EObject leftFragmentedNode = getNodeNamed(leftSet, "fragmented"); final EObject originFragmentedNode = getNodeNamed(originSet, "fragmented"); @@ -200,7 +200,7 @@ public class FragmentationTest { // At the resource level, we cannot match an object with the 'proxy' root. final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); // There's one addition, and one deletion (the proxy root) final Diff addition; @@ -259,9 +259,9 @@ public class FragmentationTest { final List<EObject> rightRootContent = ((InternalEList<EObject>)getNodeNamed(right, "root") .eContents()).basicList(); - assertSame(Integer.valueOf(1), Integer.valueOf(leftRootContent.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(originRootContent.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(rightRootContent.size())); + assertEquals(1, leftRootContent.size()); + assertEquals(1, originRootContent.size()); + assertEquals(1, rightRootContent.size()); assertTrue(leftRootContent.get(0) == leftFragmentedNode); assertTrue(originRootContent.get(0).eIsProxy()); @@ -270,13 +270,13 @@ public class FragmentationTest { // there should be no diff between left and right final Comparison lrCompare = EMFCompare.builder().build().compare( new DefaultComparisonScope(left, right, null)); - assertSame(Integer.valueOf(0), Integer.valueOf(lrCompare.getDifferences().size())); + assertEquals(0, lrCompare.getDifferences().size()); // but there should be four diffs (conflicting 2-by-2) when compared with origin : // two deletions (the proxies) and two additions (the previously fragmented root) comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getConflicts().size())); + assertEquals(4, comparison.getDifferences().size()); + assertEquals(2, comparison.getConflicts().size()); assertSame(ConflictKind.PSEUDO, comparison.getConflicts().get(0).getKind()); assertSame(ConflictKind.PSEUDO, comparison.getConflicts().get(1).getKind()); } @@ -311,9 +311,9 @@ public class FragmentationTest { final List<EObject> rightRootContent = ((InternalEList<EObject>)getNodeNamed(right, "root") .eContents()).basicList(); - assertSame(Integer.valueOf(1), Integer.valueOf(leftRootContent.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(originRootContent.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(rightRootContent.size())); + assertEquals(1, leftRootContent.size()); + assertEquals(1, originRootContent.size()); + assertEquals(1, rightRootContent.size()); assertTrue(leftRootContent.get(0).eIsProxy()); assertTrue(originRootContent.get(0).eIsProxy()); @@ -322,7 +322,7 @@ public class FragmentationTest { // there should be no diff between left and right final Comparison lrCompare = EMFCompare.builder().build().compare( new DefaultComparisonScope(left, right, null)); - assertSame(Integer.valueOf(0), Integer.valueOf(lrCompare.getDifferences().size())); + assertEquals(0, lrCompare.getDifferences().size()); // And since we've undone the changes, there are no diffs with origin either comparison = EMFCompare.builder().build().compare(scope); @@ -347,15 +347,15 @@ public class FragmentationTest { EcoreUtil.resolveAll(originSet); EcoreUtil.resolveAll(rightSet); - assertSame(Integer.valueOf(2), Integer.valueOf(leftSet.getResources().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(originSet.getResources().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(rightSet.getResources().size())); + assertEquals(2, leftSet.getResources().size()); + assertEquals(1, originSet.getResources().size()); + assertEquals(1, rightSet.getResources().size()); final IComparisonScope scope = new DefaultComparisonScope(leftSet, rightSet, originSet); Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final Diff diff = differences.get(0); assertTrue(diff instanceof ResourceAttachmentChange); @@ -390,9 +390,9 @@ public class FragmentationTest { final Diff diff = differences.get(0); mergerRegistry.getHighestRankingMerger(diff).copyLeftToRight(diff, new BasicMonitor()); - assertSame(Integer.valueOf(2), Integer.valueOf(leftSet.getResources().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(originSet.getResources().size())); - assertSame(Integer.valueOf(2), Integer.valueOf(rightSet.getResources().size())); + assertEquals(2, leftSet.getResources().size()); + assertEquals(1, originSet.getResources().size()); + assertEquals(2, rightSet.getResources().size()); final EObject leftFragmentedNode = getNodeNamed(leftSet, "fragmented"); final EObject originFragmentedNode = getNodeNamed(originSet, "fragmented"); @@ -405,12 +405,12 @@ public class FragmentationTest { // there should be no diff between left and right final Comparison lrCompare = EMFCompare.builder().build().compare( new DefaultComparisonScope(leftSet, rightSet, null)); - assertSame(Integer.valueOf(0), Integer.valueOf(lrCompare.getDifferences().size())); + assertEquals(0, lrCompare.getDifferences().size()); // but there should be two diffs (a pseudo conflict resource change) when compared with origin comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getConflicts().size())); + assertEquals(2, comparison.getDifferences().size()); + assertEquals(1, comparison.getConflicts().size()); assertSame(ConflictKind.PSEUDO, comparison.getConflicts().get(0).getKind()); } @@ -437,9 +437,9 @@ public class FragmentationTest { mergerRegistry.getHighestRankingMerger(diff).copyRightToLeft(diff, new BasicMonitor()); // Note : we still have 2 resources there, though one is empty - assertSame(Integer.valueOf(2), Integer.valueOf(leftSet.getResources().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(originSet.getResources().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(rightSet.getResources().size())); + assertEquals(2, leftSet.getResources().size()); + assertEquals(1, originSet.getResources().size()); + assertEquals(1, rightSet.getResources().size()); for (Resource res : leftSet.getResources()) { if (res != left) { @@ -476,7 +476,7 @@ public class FragmentationTest { // At the resource level, we cannot match an object with the 'proxy' root. final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); // There's one deletion, and one addition (the proxy root) final Diff addition; @@ -535,9 +535,9 @@ public class FragmentationTest { final List<EObject> rightRootContent = ((InternalEList<EObject>)getNodeNamed(right, "root") .eContents()).basicList(); - assertSame(Integer.valueOf(1), Integer.valueOf(leftRootContent.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(originRootContent.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(rightRootContent.size())); + assertEquals(1, leftRootContent.size()); + assertEquals(1, originRootContent.size()); + assertEquals(1, rightRootContent.size()); assertTrue(leftRootContent.get(0).eIsProxy()); assertTrue(originRootContent.get(0) == originFragmentedNode); @@ -546,13 +546,13 @@ public class FragmentationTest { // there should be no diff between left and right final Comparison lrCompare = EMFCompare.builder().build().compare( new DefaultComparisonScope(left, right, null)); - assertSame(Integer.valueOf(0), Integer.valueOf(lrCompare.getDifferences().size())); + assertEquals(0, lrCompare.getDifferences().size()); // but there should be four diffs (conflicting 2-by-2) when compared with origin : // two additions (the proxies) and two deletions (the old root) comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getConflicts().size())); + assertEquals(4, comparison.getDifferences().size()); + assertEquals(2, comparison.getConflicts().size()); assertSame(ConflictKind.PSEUDO, comparison.getConflicts().get(0).getKind()); assertSame(ConflictKind.PSEUDO, comparison.getConflicts().get(1).getKind()); } @@ -587,9 +587,9 @@ public class FragmentationTest { final List<EObject> rightRootContent = ((InternalEList<EObject>)getNodeNamed(right, "root") .eContents()).basicList(); - assertSame(Integer.valueOf(1), Integer.valueOf(leftRootContent.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(originRootContent.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(rightRootContent.size())); + assertEquals(1, leftRootContent.size()); + assertEquals(1, originRootContent.size()); + assertEquals(1, rightRootContent.size()); assertTrue(leftRootContent.get(0) == leftFragmentedNode); assertTrue(originRootContent.get(0) == originFragmentedNode); @@ -598,7 +598,7 @@ public class FragmentationTest { // there should be no diff between left and right final Comparison lrCompare = EMFCompare.builder().build().compare( new DefaultComparisonScope(left, right, null)); - assertSame(Integer.valueOf(0), Integer.valueOf(lrCompare.getDifferences().size())); + assertEquals(0, lrCompare.getDifferences().size()); // And since we've undone the changes, there are no diffs with origin either comparison = EMFCompare.builder().build().compare(scope); @@ -623,15 +623,15 @@ public class FragmentationTest { EcoreUtil.resolveAll(originSet); EcoreUtil.resolveAll(rightSet); - assertSame(Integer.valueOf(2), Integer.valueOf(leftSet.getResources().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(originSet.getResources().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(rightSet.getResources().size())); + assertEquals(2, leftSet.getResources().size()); + assertEquals(1, originSet.getResources().size()); + assertEquals(1, rightSet.getResources().size()); final IComparisonScope scope = new DefaultComparisonScope(leftSet, rightSet, originSet); Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final Diff diff = differences.get(0); assertTrue(diff instanceof ResourceAttachmentChange); @@ -664,9 +664,9 @@ public class FragmentationTest { final Diff diff = differences.get(0); mergerRegistry.getHighestRankingMerger(diff).copyLeftToRight(diff, new BasicMonitor()); - assertSame(Integer.valueOf(2), Integer.valueOf(leftSet.getResources().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(originSet.getResources().size())); - assertSame(Integer.valueOf(2), Integer.valueOf(rightSet.getResources().size())); + assertEquals(2, leftSet.getResources().size()); + assertEquals(1, originSet.getResources().size()); + assertEquals(2, rightSet.getResources().size()); final EObject leftFragmentedNode = getNodeNamed(leftSet, "fragmented"); final EObject originFragmentedNode = getNodeNamed(originSet, "fragmented"); @@ -679,12 +679,12 @@ public class FragmentationTest { // there should be no diff between left and right final Comparison lrCompare = EMFCompare.builder().build().compare( new DefaultComparisonScope(leftSet, rightSet, null)); - assertSame(Integer.valueOf(0), Integer.valueOf(lrCompare.getDifferences().size())); + assertEquals(0, lrCompare.getDifferences().size()); // but there should be two diffs (a pseudo conflict resource change) when compared with origin comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getConflicts().size())); + assertEquals(2, comparison.getDifferences().size()); + assertEquals(1, comparison.getConflicts().size()); assertSame(ConflictKind.PSEUDO, comparison.getConflicts().get(0).getKind()); } @@ -711,9 +711,9 @@ public class FragmentationTest { mergerRegistry.getHighestRankingMerger(diff).copyRightToLeft(diff, new BasicMonitor()); // Note : we still have 2 resources there, though one is empty - assertSame(Integer.valueOf(2), Integer.valueOf(leftSet.getResources().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(originSet.getResources().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(rightSet.getResources().size())); + assertEquals(2, leftSet.getResources().size()); + assertEquals(1, originSet.getResources().size()); + assertEquals(1, rightSet.getResources().size()); for (Resource res : leftSet.getResources()) { if (res != left) { @@ -750,7 +750,7 @@ public class FragmentationTest { // At the resource level, we cannot match an object with the 'proxy' root. final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); // There's one deletion, and one addition (the proxy root) final Diff addition; @@ -809,9 +809,9 @@ public class FragmentationTest { final List<EObject> rightRootContent = ((InternalEList<EObject>)getNodeNamed(right, "root") .eContents()).basicList(); - assertSame(Integer.valueOf(1), Integer.valueOf(leftRootContent.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(originRootContent.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(rightRootContent.size())); + assertEquals(1, leftRootContent.size()); + assertEquals(1, originRootContent.size()); + assertEquals(1, rightRootContent.size()); assertTrue(leftRootContent.get(0).eIsProxy()); assertTrue(originRootContent.get(0) == originFragmentedNode); @@ -820,13 +820,13 @@ public class FragmentationTest { // there should be no diff between left and right final Comparison lrCompare = EMFCompare.builder().build().compare( new DefaultComparisonScope(left, right, null)); - assertSame(Integer.valueOf(0), Integer.valueOf(lrCompare.getDifferences().size())); + assertEquals(0, lrCompare.getDifferences().size()); // but there should be four diffs (conflicting 2-by-2) when compared with origin : // two additions (the proxies) and two deletions (the old root) comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getConflicts().size())); + assertEquals(4, comparison.getDifferences().size()); + assertEquals(2, comparison.getConflicts().size()); assertSame(ConflictKind.PSEUDO, comparison.getConflicts().get(0).getKind()); assertSame(ConflictKind.PSEUDO, comparison.getConflicts().get(1).getKind()); } @@ -861,9 +861,9 @@ public class FragmentationTest { final List<EObject> rightRootContent = ((InternalEList<EObject>)getNodeNamed(right, "root") .eContents()).basicList(); - assertSame(Integer.valueOf(1), Integer.valueOf(leftRootContent.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(originRootContent.size())); - assertSame(Integer.valueOf(1), Integer.valueOf(rightRootContent.size())); + assertEquals(1, leftRootContent.size()); + assertEquals(1, originRootContent.size()); + assertEquals(1, rightRootContent.size()); assertTrue(leftRootContent.get(0) == leftFragmentedNode); assertTrue(originRootContent.get(0) == originFragmentedNode); @@ -872,7 +872,7 @@ public class FragmentationTest { // there should be no diff between left and right final Comparison lrCompare = EMFCompare.builder().build().compare( new DefaultComparisonScope(left, right, null)); - assertSame(Integer.valueOf(0), Integer.valueOf(lrCompare.getDifferences().size())); + assertEquals(0, lrCompare.getDifferences().size()); // And since we've undone the changes, there are no diffs with origin either comparison = EMFCompare.builder().build().compare(scope); @@ -897,15 +897,15 @@ public class FragmentationTest { EcoreUtil.resolveAll(originSet); EcoreUtil.resolveAll(rightSet); - assertSame(Integer.valueOf(1), Integer.valueOf(leftSet.getResources().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(originSet.getResources().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(rightSet.getResources().size())); + assertEquals(1, leftSet.getResources().size()); + assertEquals(1, originSet.getResources().size()); + assertEquals(1, rightSet.getResources().size()); final IComparisonScope scope = new DefaultComparisonScope(leftSet, rightSet, originSet); Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final Diff diff = differences.get(0); assertTrue(diff instanceof ResourceAttachmentChange); @@ -938,19 +938,19 @@ public class FragmentationTest { final Diff diff = differences.get(0); mergerRegistry.getHighestRankingMerger(diff).copyLeftToRight(diff, new BasicMonitor()); - assertSame(Integer.valueOf(1), Integer.valueOf(left.getContents().size())); - assertSame(Integer.valueOf(2), Integer.valueOf(origin.getContents().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(right.getContents().size())); + assertEquals(1, left.getContents().size()); + assertEquals(2, origin.getContents().size()); + assertEquals(1, right.getContents().size()); // there should be no diff between left and right final Comparison lrCompare = EMFCompare.builder().build().compare( new DefaultComparisonScope(leftSet, rightSet, null)); - assertSame(Integer.valueOf(0), Integer.valueOf(lrCompare.getDifferences().size())); + assertEquals(0, lrCompare.getDifferences().size()); // but there should be two diffs (a pseudo conflict deletion) when compared with origin comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getConflicts().size())); + assertEquals(2, comparison.getDifferences().size()); + assertEquals(1, comparison.getConflicts().size()); assertSame(ConflictKind.PSEUDO, comparison.getConflicts().get(0).getKind()); } @@ -976,12 +976,12 @@ public class FragmentationTest { final Diff diff = differences.get(0); mergerRegistry.getHighestRankingMerger(diff).copyRightToLeft(diff, new BasicMonitor()); - assertSame(Integer.valueOf(2), Integer.valueOf(left.getContents().size())); - assertSame(Integer.valueOf(2), Integer.valueOf(origin.getContents().size())); - assertSame(Integer.valueOf(2), Integer.valueOf(right.getContents().size())); + assertEquals(2, left.getContents().size()); + assertEquals(2, origin.getContents().size()); + assertEquals(2, right.getContents().size()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -994,7 +994,7 @@ public class FragmentationTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final Diff diff = differences.get(0); assertTrue(diff instanceof ResourceAttachmentChange); @@ -1019,19 +1019,19 @@ public class FragmentationTest { final Diff diff = differences.get(0); mergerRegistry.getHighestRankingMerger(diff).copyLeftToRight(diff, new BasicMonitor()); - assertSame(Integer.valueOf(1), Integer.valueOf(left.getContents().size())); - assertSame(Integer.valueOf(2), Integer.valueOf(origin.getContents().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(right.getContents().size())); + assertEquals(1, left.getContents().size()); + assertEquals(2, origin.getContents().size()); + assertEquals(1, right.getContents().size()); // there should be no diff between left and right final Comparison lrCompare = EMFCompare.builder().build().compare( new DefaultComparisonScope(left, right, null)); - assertSame(Integer.valueOf(0), Integer.valueOf(lrCompare.getDifferences().size())); + assertEquals(0, lrCompare.getDifferences().size()); // but there should be two diffs (a pseudo conflict deletion) when compared with origin comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getConflicts().size())); + assertEquals(2, comparison.getDifferences().size()); + assertEquals(1, comparison.getConflicts().size()); assertSame(ConflictKind.PSEUDO, comparison.getConflicts().get(0).getKind()); } @@ -1049,12 +1049,12 @@ public class FragmentationTest { final Diff diff = differences.get(0); mergerRegistry.getHighestRankingMerger(diff).copyRightToLeft(diff, new BasicMonitor()); - assertSame(Integer.valueOf(2), Integer.valueOf(left.getContents().size())); - assertSame(Integer.valueOf(2), Integer.valueOf(origin.getContents().size())); - assertSame(Integer.valueOf(2), Integer.valueOf(right.getContents().size())); + assertEquals(2, left.getContents().size()); + assertEquals(2, origin.getContents().size()); + assertEquals(2, right.getContents().size()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1075,19 +1075,19 @@ public class FragmentationTest { EcoreUtil.resolveAll(originSet); EcoreUtil.resolveAll(rightSet); - assertSame(Integer.valueOf(2), Integer.valueOf(left.getContents().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(origin.getContents().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(right.getContents().size())); + assertEquals(2, left.getContents().size()); + assertEquals(1, origin.getContents().size()); + assertEquals(1, right.getContents().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(leftSet.getResources().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(originSet.getResources().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(rightSet.getResources().size())); + assertEquals(1, leftSet.getResources().size()); + assertEquals(1, originSet.getResources().size()); + assertEquals(1, rightSet.getResources().size()); final IComparisonScope scope = new DefaultComparisonScope(leftSet, rightSet, originSet); Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final Diff diff = differences.get(0); assertTrue(diff instanceof ResourceAttachmentChange); @@ -1120,19 +1120,19 @@ public class FragmentationTest { final Diff diff = differences.get(0); mergerRegistry.getHighestRankingMerger(diff).copyLeftToRight(diff, new BasicMonitor()); - assertSame(Integer.valueOf(2), Integer.valueOf(left.getContents().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(origin.getContents().size())); - assertSame(Integer.valueOf(2), Integer.valueOf(right.getContents().size())); + assertEquals(2, left.getContents().size()); + assertEquals(1, origin.getContents().size()); + assertEquals(2, right.getContents().size()); // there should be no diff between left and right final Comparison lrCompare = EMFCompare.builder().build().compare( new DefaultComparisonScope(leftSet, rightSet, null)); - assertSame(Integer.valueOf(0), Integer.valueOf(lrCompare.getDifferences().size())); + assertEquals(0, lrCompare.getDifferences().size()); // but there should be two diffs (a pseudo conflict addition) when compared with origin comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getConflicts().size())); + assertEquals(2, comparison.getDifferences().size()); + assertEquals(1, comparison.getConflicts().size()); assertSame(ConflictKind.PSEUDO, comparison.getConflicts().get(0).getKind()); } @@ -1158,12 +1158,12 @@ public class FragmentationTest { final Diff diff = differences.get(0); mergerRegistry.getHighestRankingMerger(diff).copyRightToLeft(diff, new BasicMonitor()); - assertSame(Integer.valueOf(1), Integer.valueOf(left.getContents().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(origin.getContents().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(right.getContents().size())); + assertEquals(1, left.getContents().size()); + assertEquals(1, origin.getContents().size()); + assertEquals(1, right.getContents().size()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1172,15 +1172,15 @@ public class FragmentationTest { final Resource origin = input.getNewRootOrigin(); final Resource right = input.getNewRootRight(); - assertSame(Integer.valueOf(2), Integer.valueOf(left.getContents().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(origin.getContents().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(right.getContents().size())); + assertEquals(2, left.getContents().size()); + assertEquals(1, origin.getContents().size()); + assertEquals(1, right.getContents().size()); final IComparisonScope scope = new DefaultComparisonScope(left, right, origin); Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final Diff diff = differences.get(0); assertTrue(diff instanceof ResourceAttachmentChange); @@ -1205,19 +1205,19 @@ public class FragmentationTest { final Diff diff = differences.get(0); mergerRegistry.getHighestRankingMerger(diff).copyLeftToRight(diff, new BasicMonitor()); - assertSame(Integer.valueOf(2), Integer.valueOf(left.getContents().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(origin.getContents().size())); - assertSame(Integer.valueOf(2), Integer.valueOf(right.getContents().size())); + assertEquals(2, left.getContents().size()); + assertEquals(1, origin.getContents().size()); + assertEquals(2, right.getContents().size()); // there should be no diff between left and right final Comparison lrCompare = EMFCompare.builder().build().compare( new DefaultComparisonScope(left, right, null)); - assertSame(Integer.valueOf(0), Integer.valueOf(lrCompare.getDifferences().size())); + assertEquals(0, lrCompare.getDifferences().size()); // but there should be two diffs (a pseudo conflict addition) when compared with origin comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getConflicts().size())); + assertEquals(2, comparison.getDifferences().size()); + assertEquals(1, comparison.getConflicts().size()); assertSame(ConflictKind.PSEUDO, comparison.getConflicts().get(0).getKind()); } @@ -1235,12 +1235,12 @@ public class FragmentationTest { final Diff diff = differences.get(0); mergerRegistry.getHighestRankingMerger(diff).copyRightToLeft(diff, new BasicMonitor()); - assertSame(Integer.valueOf(1), Integer.valueOf(left.getContents().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(origin.getContents().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(right.getContents().size())); + assertEquals(1, left.getContents().size()); + assertEquals(1, origin.getContents().size()); + assertEquals(1, right.getContents().size()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } private EObject getNodeNamed(Notifier notifier, String name) { diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/ExtLibraryTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/ExtLibraryTest.java index bee74c41e..1f1004b35 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/ExtLibraryTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/ExtLibraryTest.java @@ -16,6 +16,7 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedAttribut import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedReference; import static org.eclipse.emf.compare.utils.EMFComparePredicates.fromSide; import static org.eclipse.emf.compare.utils.EMFComparePredicates.removed; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; @@ -66,7 +67,7 @@ public class ExtLibraryTest { final Conflict audiovisualNameConflict = rightAudiovisualNameDiff.getConflict(); assertNotNull(audiovisualNameConflict); - assertSame(Integer.valueOf(2), Integer.valueOf(audiovisualNameConflict.getDifferences().size())); + assertEquals(2, audiovisualNameConflict.getDifferences().size()); assertTrue(audiovisualNameConflict.getDifferences().contains(rightAudiovisualNameDiff)); assertTrue(audiovisualNameConflict.getDifferences().contains(leftAudiovisualNameDiff)); assertSame(audiovisualNameConflict, leftAudiovisualNameDiff.getConflict()); @@ -88,7 +89,7 @@ public class ExtLibraryTest { final Conflict readerConflict = rightRemovedReaderDiff.getConflict(); assertNotNull(readerConflict); - assertSame(Integer.valueOf(4), Integer.valueOf(readerConflict.getDifferences().size())); + assertEquals(4, readerConflict.getDifferences().size()); assertTrue(readerConflict.getDifferences().contains(rightRemovedReaderDiff)); assertTrue(readerConflict.getDifferences().contains(rightUnsetReaderTypeDiff)); assertTrue(readerConflict.getDifferences().contains(leftRemovedReaderDiff)); @@ -109,7 +110,7 @@ public class ExtLibraryTest { final Conflict familyNameConflict = leftRemovedLastNameDiff.getConflict(); assertNotNull(familyNameConflict); - assertSame(Integer.valueOf(2), Integer.valueOf(familyNameConflict.getDifferences().size())); + assertEquals(2, familyNameConflict.getDifferences().size()); assertTrue(familyNameConflict.getDifferences().contains(leftRemovedLastNameDiff)); assertTrue(familyNameConflict.getDifferences().contains(rightRenamedFamilyNameDiff)); assertSame(familyNameConflict, rightRenamedFamilyNameDiff.getConflict()); @@ -130,7 +131,7 @@ public class ExtLibraryTest { final Conflict periodicalConflict = rightSetPeriodicalSupertypeDiff.getConflict(); assertNotNull(periodicalConflict); - assertSame(Integer.valueOf(3), Integer.valueOf(periodicalConflict.getDifferences().size())); + assertEquals(3, periodicalConflict.getDifferences().size()); assertTrue(periodicalConflict.getDifferences().contains(leftRemovedPeriodicalDiff)); assertTrue(periodicalConflict.getDifferences().contains(rightSetPeriodicalSupertypeDiff)); assertTrue(periodicalConflict.getDifferences().contains(rightSetTitledItemSupertypeDiff)); @@ -152,13 +153,13 @@ public class ExtLibraryTest { final Conflict titleConflict = leftRemovedTitleDiff.getConflict(); assertNotNull(titleConflict); - assertSame(Integer.valueOf(4), Integer.valueOf(titleConflict.getDifferences().size())); + assertEquals(4, titleConflict.getDifferences().size()); assertTrue(titleConflict.getDifferences().contains(leftRemovedTitleDiff)); assertTrue(titleConflict.getDifferences().contains(leftUnsetTitleTypeDiff)); assertTrue(titleConflict.getDifferences().contains(rightRemovedTitleDiff)); assertTrue(titleConflict.getDifferences().contains(rightUnsetTitleTypeDiff)); assertSame(ConflictKind.PSEUDO, titleConflict.getKind()); - assertSame(Integer.valueOf(5), Integer.valueOf(comparison.getConflicts().size())); + assertEquals(5, comparison.getConflicts().size()); } } diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/IdentifierComparisonTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/IdentifierComparisonTest.java index ff5b63d63..0ec3769b9 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/IdentifierComparisonTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/IdentifierComparisonTest.java @@ -87,7 +87,7 @@ public class IdentifierComparisonTest extends EMFCompareTestBase { final Resource origin = (Resource)scope.getOrigin(); assertSame(Boolean.valueOf(origin != null), Boolean.valueOf(comparison.isThreeWay())); - assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getMatchedResources().size())); + assertEquals(1, comparison.getMatchedResources().size()); final MatchResource matchedResource = comparison.getMatchedResources().get(0); assertEquals(left.getURI().toString(), matchedResource.getLeftURI()); assertEquals(right.getURI().toString(), matchedResource.getRightURI()); diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ConflictMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ConflictMergeTest.java index 584d53a65..2eb756ef8 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ConflictMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ConflictMergeTest.java @@ -18,7 +18,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import com.google.common.collect.Iterators; @@ -68,7 +67,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.LEFT)); @@ -102,7 +101,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.RIGHT)); @@ -135,7 +134,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.LEFT)); @@ -168,7 +167,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.RIGHT)); @@ -202,7 +201,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.LEFT)); @@ -236,7 +235,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.RIGHT)); @@ -269,7 +268,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.LEFT)); @@ -302,7 +301,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.RIGHT)); @@ -337,7 +336,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(3), Integer.valueOf(differences.size())); + assertEquals(3, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.LEFT)); @@ -365,7 +364,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(3), Integer.valueOf(differences.size())); + assertEquals(3, differences.size()); final UnmodifiableIterator<Diff> diffs = Iterators.filter(differences.iterator(), fromSide(DifferenceSource.RIGHT)); @@ -404,7 +403,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(3), Integer.valueOf(differences.size())); + assertEquals(3, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.LEFT)); @@ -434,7 +433,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(3), Integer.valueOf(differences.size())); + assertEquals(3, differences.size()); final UnmodifiableIterator<Diff> diffs = Iterators.filter(differences.iterator(), fromSide(DifferenceSource.RIGHT)); @@ -473,7 +472,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(3), Integer.valueOf(differences.size())); + assertEquals(3, differences.size()); final UnmodifiableIterator<Diff> diffs = Iterators.filter(differences.iterator(), fromSide(DifferenceSource.LEFT)); @@ -512,7 +511,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(3), Integer.valueOf(differences.size())); + assertEquals(3, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.RIGHT)); @@ -542,7 +541,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(3), Integer.valueOf(differences.size())); + assertEquals(3, differences.size()); final UnmodifiableIterator<Diff> diffs = Iterators.filter(differences.iterator(), fromSide(DifferenceSource.LEFT)); @@ -581,7 +580,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(3), Integer.valueOf(differences.size())); + assertEquals(3, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.RIGHT)); @@ -609,7 +608,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.LEFT)); @@ -643,7 +642,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.RIGHT)); @@ -677,7 +676,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.LEFT)); @@ -711,7 +710,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.RIGHT)); @@ -744,7 +743,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.LEFT)); @@ -777,7 +776,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.RIGHT)); @@ -811,7 +810,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.LEFT)); @@ -845,7 +844,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.RIGHT)); @@ -879,7 +878,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.LEFT)); @@ -907,7 +906,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.RIGHT)); @@ -949,7 +948,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.LEFT)); @@ -991,7 +990,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.RIGHT)); @@ -1032,7 +1031,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.LEFT)); assertNotNull(diff); @@ -1079,7 +1078,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.RIGHT)); assertNotNull(diff); @@ -1126,7 +1125,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.LEFT)); assertNotNull(diff); @@ -1173,7 +1172,7 @@ public class ConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), fromSide(DifferenceSource.RIGHT)); assertNotNull(diff); diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ExtensionMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ExtensionMergeTest.java index 9c407662c..6e54d30a9 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ExtensionMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ExtensionMergeTest.java @@ -15,7 +15,6 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedAttribut import static org.eclipse.emf.compare.utils.EMFComparePredicates.fromSide; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import com.google.common.collect.Iterators; @@ -52,7 +51,7 @@ public class ExtensionMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -70,7 +69,7 @@ public class ExtensionMergeTest { assertEquals("leftValue", originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } public static IMerger getMerger(final IMerger.Registry registry, final Diff diff, diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps2wayMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps2wayMergeTest.java index 72e24f0d4..1810c8870 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps2wayMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps2wayMergeTest.java @@ -16,7 +16,6 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import com.google.common.collect.Iterators; @@ -68,7 +67,7 @@ public class FeatureMaps2wayMergeTest { // 2 add diffs, 2 delete diffs (delete diffs are detected because same models are used for 2-way // and 3-way comparison, so the right add detected in 3-way is a delete in 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -99,7 +98,7 @@ public class FeatureMaps2wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -113,7 +112,7 @@ public class FeatureMaps2wayMergeTest { // 2 add diffs, 2 delete diffs (delete diffs are detected because same models are used for 2-way // and 3-way comparison, so the right add detected in 3-way is a delete in 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -144,7 +143,7 @@ public class FeatureMaps2wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -158,7 +157,7 @@ public class FeatureMaps2wayMergeTest { // 2 add diffs, 2 delete diffs (delete diffs are detected because same models are used for 2-way // and 3-way comparison, so the right add detected in 3-way is a delete in 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -189,7 +188,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(0, ((BasicFeatureMap)map).size(eSFFirstKey)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -203,7 +202,7 @@ public class FeatureMaps2wayMergeTest { // 2 add diffs, 2 delete diffs (delete diffs are detected because same models are used for 2-way // and 3-way comparison, so the right add detected in 3-way is a delete in 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -234,7 +233,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(0, ((BasicFeatureMap)map).size(eSFFirstKey)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -248,7 +247,7 @@ public class FeatureMaps2wayMergeTest { // 2 delete diffs, 2 add diffs (add diffs are detected because same models are used for 2-way // and 3-way comparison, so the right delete detected in 3-way is a add in 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); @@ -279,7 +278,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(0, ((BasicFeatureMap)map).size(eSFFirstKey)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -293,7 +292,7 @@ public class FeatureMaps2wayMergeTest { // 2 delete diffs, 2 add diffs (add diffs are detected because same models are used for 2-way // and 3-way comparison, so the right delete detected in 3-way is a add in 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); @@ -324,7 +323,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(0, ((BasicFeatureMap)map).size(eSFFirstKey)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -338,7 +337,7 @@ public class FeatureMaps2wayMergeTest { // 2 delete diffs, 2 add diffs (add diffs are detected because same models are used for 2-way // and 3-way comparison, so the right delete detected in 3-way is a add in 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); @@ -369,7 +368,7 @@ public class FeatureMaps2wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, leftNode2)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -383,7 +382,7 @@ public class FeatureMaps2wayMergeTest { // 2 delete diffs, 2 add diffs (add diffs are detected because same models are used for 2-way // and 3-way comparison, so the right delete detected in 3-way is a add in 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); @@ -414,7 +413,7 @@ public class FeatureMaps2wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, leftNode2)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -429,7 +428,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right move/key changes detected in 3-way are a simple move/key changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -460,7 +459,7 @@ public class FeatureMaps2wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -475,7 +474,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right move/key changes detected in 3-way are a simple move/key changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.CHANGE), instanceOf(FeatureMapChange.class))); @@ -506,7 +505,7 @@ public class FeatureMaps2wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -521,7 +520,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right move/key changes detected in 3-way are a simple move/key changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -552,7 +551,7 @@ public class FeatureMaps2wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFSecondKey, leftNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -567,7 +566,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right move/key changes detected in 3-way are a simple move/key changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.CHANGE), instanceOf(FeatureMapChange.class))); @@ -598,7 +597,7 @@ public class FeatureMaps2wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFSecondKey, leftNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -613,7 +612,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right moves changes detected in 3-way are the same changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -644,7 +643,7 @@ public class FeatureMaps2wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -659,7 +658,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right moves changes detected in 3-way are the same changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -690,7 +689,7 @@ public class FeatureMaps2wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -705,7 +704,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right moves changes detected in 3-way are the same changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -736,7 +735,7 @@ public class FeatureMaps2wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, leftNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -751,7 +750,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right moves changes detected in 3-way are the same changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -782,7 +781,7 @@ public class FeatureMaps2wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, leftNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -797,7 +796,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right moves changes detected in 3-way are the same changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -830,7 +829,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)map).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -845,7 +844,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right moves changes detected in 3-way are the same changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -878,7 +877,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)map).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -893,7 +892,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right moves changes detected in 3-way are the same changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -926,7 +925,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(leftNode1, ((BasicFeatureMap)map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -941,7 +940,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right moves changes detected in 3-way are the same changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -974,7 +973,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(leftNode1, ((BasicFeatureMap)map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -989,7 +988,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right moves changes detected in 3-way are the same changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1020,7 +1019,7 @@ public class FeatureMaps2wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1035,7 +1034,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right moves changes detected in 3-way are the same changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1066,7 +1065,7 @@ public class FeatureMaps2wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1081,7 +1080,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right moves changes detected in 3-way are the same changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1112,7 +1111,7 @@ public class FeatureMaps2wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFSecondKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1127,7 +1126,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right moves changes detected in 3-way are the same changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1158,7 +1157,7 @@ public class FeatureMaps2wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFSecondKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1173,7 +1172,7 @@ public class FeatureMaps2wayMergeTest { // 2 add diffs, 2 delete diffs (delete diffs are detected because same models are used for 2-way // and 3-way comparison, so the right add detected in 3-way is a delete in 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -1216,7 +1215,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1231,7 +1230,7 @@ public class FeatureMaps2wayMergeTest { // 2 add diffs, 2 delete diffs (delete diffs are detected because same models are used for 2-way // and 3-way comparison, so the right add detected in 3-way is a delete in 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -1274,7 +1273,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1289,7 +1288,7 @@ public class FeatureMaps2wayMergeTest { // 2 add diffs, 2 delete diffs (delete diffs are detected because same models are used for 2-way // and 3-way comparison, so the right add detected in 3-way is a delete in 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -1328,7 +1327,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(1, ((BasicFeatureMap)rightMap).size()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1343,7 +1342,7 @@ public class FeatureMaps2wayMergeTest { // 2 add diffs, 2 delete diffs (delete diffs are detected because same models are used for 2-way // and 3-way comparison, so the right add detected in 3-way is a delete in 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -1382,7 +1381,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(1, ((BasicFeatureMap)rightMap).size()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1397,7 +1396,7 @@ public class FeatureMaps2wayMergeTest { // 2 add diffs, 2 delete diffs (add diffs are detected because same models are used for 2-way // and 3-way comparison, so the left delete detected in 3-way is a add in 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); @@ -1436,7 +1435,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(0, ((BasicFeatureMap)rightMap).size()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1451,7 +1450,7 @@ public class FeatureMaps2wayMergeTest { // 2 add diffs, 2 delete diffs (add diffs are detected because same models are used for 2-way // and 3-way comparison, so the left delete detected in 3-way is a add in 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); @@ -1490,7 +1489,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(0, ((BasicFeatureMap)rightMap).size()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1505,7 +1504,7 @@ public class FeatureMaps2wayMergeTest { // 2 add diffs, 2 delete diffs (add diffs are detected because same models are used for 2-way // and 3-way comparison, so the left delete detected in 3-way is a add in 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); @@ -1548,7 +1547,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(rightNode2, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1563,7 +1562,7 @@ public class FeatureMaps2wayMergeTest { // 2 add diffs, 2 delete diffs (add diffs are detected because same models are used for 2-way // and 3-way comparison, so the left delete detected in 3-way is a add in 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); @@ -1606,7 +1605,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(rightNode2, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1622,7 +1621,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right moves changes detected in 3-way are the same changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1665,7 +1664,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1681,7 +1680,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right moves changes detected in 3-way are the same changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1724,7 +1723,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1740,7 +1739,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right moves changes detected in 3-way are the same changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1783,7 +1782,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1799,7 +1798,7 @@ public class FeatureMaps2wayMergeTest { // comparison, so the right moves changes detected in 3-way are the same changes in // 2-way). List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1842,7 +1841,7 @@ public class FeatureMaps2wayMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } private EObject getNodeNamed(Resource res, String name) { diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps3wayMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps3wayMergeTest.java index 6764d2d64..2e81fdc21 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps3wayMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps3wayMergeTest.java @@ -18,7 +18,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import com.google.common.collect.Iterators; @@ -84,7 +83,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -115,7 +114,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -128,7 +127,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -159,7 +158,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -172,7 +171,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -203,7 +202,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -216,7 +215,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -247,7 +246,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -260,7 +259,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -291,7 +290,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -304,7 +303,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -335,7 +334,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).contains(eSFFirstKey, leftNode2)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -348,7 +347,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -379,7 +378,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -392,7 +391,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -423,7 +422,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).contains(eSFFirstKey, leftNode2)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -436,7 +435,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); @@ -467,7 +466,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -480,7 +479,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); @@ -511,7 +510,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).contains(eSFFirstKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -524,7 +523,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); @@ -555,7 +554,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -568,7 +567,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); @@ -599,7 +598,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).contains(eSFFirstKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -612,7 +611,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); @@ -643,7 +642,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, leftNode2)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -656,7 +655,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); @@ -687,7 +686,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -700,7 +699,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); @@ -731,7 +730,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, leftNode2)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -744,7 +743,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); @@ -775,7 +774,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -789,7 +788,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -820,7 +819,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -834,7 +833,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.CHANGE), instanceOf(FeatureMapChange.class))); @@ -865,7 +864,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -879,7 +878,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -910,7 +909,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFSecondKey, leftNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -924,7 +923,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.CHANGE), instanceOf(FeatureMapChange.class))); @@ -955,7 +954,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFSecondKey, leftNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -969,7 +968,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1000,7 +999,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1014,7 +1013,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1045,7 +1044,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1059,7 +1058,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1090,7 +1089,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, leftNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -1104,7 +1103,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1135,7 +1134,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, leftNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -1149,7 +1148,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1182,7 +1181,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)map).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -1196,7 +1195,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1229,7 +1228,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)map).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -1243,7 +1242,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1276,7 +1275,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(leftNode1, ((BasicFeatureMap)map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1290,7 +1289,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1323,7 +1322,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(leftNode1, ((BasicFeatureMap)map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1337,7 +1336,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1368,7 +1367,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1382,7 +1381,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1413,7 +1412,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFSecondKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -1427,7 +1426,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1458,7 +1457,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFSecondKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -1472,7 +1471,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1503,7 +1502,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)map).basicContains(eSFFirstKey, rightNode1)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1517,7 +1516,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -1560,7 +1559,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -1574,7 +1573,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -1615,7 +1614,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)rightMap).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1629,7 +1628,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -1672,7 +1671,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -1686,7 +1685,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -1727,7 +1726,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)rightMap).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1741,7 +1740,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -1780,7 +1779,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(1, ((BasicFeatureMap)rightMap).size()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1794,7 +1793,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -1837,7 +1836,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(rightNode2, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -1851,7 +1850,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -1890,7 +1889,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(1, ((BasicFeatureMap)rightMap).size()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1904,7 +1903,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -1947,7 +1946,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(rightNode2, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -1961,7 +1960,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); @@ -2000,7 +1999,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)rightMap).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -2014,7 +2013,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); @@ -2055,7 +2054,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -2069,7 +2068,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); @@ -2108,7 +2107,7 @@ public class FeatureMaps3wayMergeTest { assertTrue(((BasicFeatureMap)rightMap).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -2122,7 +2121,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); @@ -2163,7 +2162,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -2177,7 +2176,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); @@ -2220,7 +2219,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(rightNode2, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -2234,7 +2233,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); @@ -2273,7 +2272,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(1, ((BasicFeatureMap)rightMap).size()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -2287,7 +2286,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); @@ -2330,7 +2329,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(rightNode2, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -2344,7 +2343,7 @@ public class FeatureMaps3wayMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); @@ -2383,7 +2382,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(1, ((BasicFeatureMap)rightMap).size()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -2398,7 +2397,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -2441,7 +2440,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -2456,7 +2455,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -2499,7 +2498,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(6), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(6, comparison.getDifferences().size()); } @Test @@ -2514,7 +2513,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -2557,7 +2556,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -2572,7 +2571,7 @@ public class FeatureMaps3wayMergeTest { // In this case, left and right diffs represent the same case. There is no need to test both sides. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -2615,7 +2614,7 @@ public class FeatureMaps3wayMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMap).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } private EObject getNodeNamed(Resource res, String name) { diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMapsConflictsMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMapsConflictsMergeTest.java index 1a5fd97fa..0eaad12c8 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMapsConflictsMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMapsConflictsMergeTest.java @@ -17,7 +17,6 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import com.google.common.collect.Iterators; @@ -71,7 +70,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 doesn't exists in the ancestor, is contained under mapNode2 in left, and contained under // mapNode1 in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -137,7 +136,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode2Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -152,7 +151,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 doesn't exists in the ancestor, is contained under mapNode2 in left, and contained under // mapNode1 in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -218,7 +217,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode2Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -233,7 +232,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 doesn't exists in the ancestor, is contained under mapNode2 in left, and contained under // mapNode1 in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -297,7 +296,7 @@ public class FeatureMapsConflictsMergeTest { assertTrue(((BasicFeatureMap)rightMapNode2Map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -312,7 +311,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 doesn't exists in the ancestor, is contained under mapNode2 in left, and contained under // mapNode1 in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -376,7 +375,7 @@ public class FeatureMapsConflictsMergeTest { assertTrue(((BasicFeatureMap)rightMapNode2Map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -393,7 +392,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 doesn't exists in the ancestor, has firstKey in left, and secondKey in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -439,7 +438,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -456,7 +455,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 doesn't exists in the ancestor, has firstKey in left, and secondKey in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -502,7 +501,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -519,7 +518,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 doesn't exists in the ancestor, has firstKey in left, and secondKey in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -561,7 +560,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFSecondKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -578,7 +577,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 doesn't exists in the ancestor, has firstKey in left, and secondKey in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -620,7 +619,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFSecondKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -634,7 +633,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 has firstKey in the ancestor, has secondKey in left, and doesn't exists in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -679,7 +678,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFSecondKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -693,7 +692,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 has firstKey in the ancestor, has secondKey in left, and doesn't exists in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); @@ -739,7 +738,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -753,7 +752,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 has firstKey in the ancestor, has secondKey in left, and doesn't exists in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.CHANGE), instanceOf(FeatureMapChange.class))); @@ -797,7 +796,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFSecondKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -811,7 +810,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 has firstKey in the ancestor, has secondKey in left, and doesn't exists in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); @@ -856,7 +855,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -870,7 +869,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 has firstKey in the ancestor, has secondKey in left, and doesn't exists in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -914,7 +913,7 @@ public class FeatureMapsConflictsMergeTest { assertTrue(((BasicFeatureMap)rightMapNode1Map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -928,7 +927,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 has firstKey in the ancestor, has secondKey in left, and doesn't exists in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); @@ -971,7 +970,7 @@ public class FeatureMapsConflictsMergeTest { assertTrue(((BasicFeatureMap)rightMapNode1Map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -985,7 +984,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 has firstKey in the ancestor, has secondKey in left, and doesn't exists in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.CHANGE), instanceOf(FeatureMapChange.class))); @@ -1028,7 +1027,7 @@ public class FeatureMapsConflictsMergeTest { assertTrue(((BasicFeatureMap)rightMapNode1Map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1042,7 +1041,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 has firstKey in the ancestor, has secondKey in left, and doesn't exists in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); @@ -1085,7 +1084,7 @@ public class FeatureMapsConflictsMergeTest { assertTrue(((BasicFeatureMap)rightMapNode1Map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1100,7 +1099,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 is contained under mapNode1 in the ancestor, under mapNode2 in left, and // under mapNode3 in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1144,7 +1143,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode2Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1159,7 +1158,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 is contained under mapNode1 in the ancestor, under mapNode2 in left, and // under mapNode3 in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1203,7 +1202,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode2Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1218,7 +1217,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 is contained under mapNode1 in the ancestor, under mapNode2 in left, and // under mapNode3 in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1262,7 +1261,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode3Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1277,7 +1276,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 is contained under mapNode1 in the ancestor, under mapNode2 in left, and // under mapNode3 in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1321,7 +1320,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode3Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1337,7 +1336,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 is in the first position in the ancestor, in the second position in left, and in third // position in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1383,7 +1382,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1399,7 +1398,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 is in the first position in the ancestor, in the second position in left, and in third // position in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1445,7 +1444,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1461,7 +1460,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 is in the first position in the ancestor, in the second position in left, and in third // position in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1507,7 +1506,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 2, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1523,7 +1522,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 is in the first position in the ancestor, in the second position in left, and in third // position in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1569,7 +1568,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 2, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1588,7 +1587,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 is in the first position in the ancestor, in the second position in left, and in third // position in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1634,7 +1633,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1653,7 +1652,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 is in the first position in the ancestor, in the second position in left, and in third // position in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1699,7 +1698,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1718,7 +1717,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 is in the first position in the ancestor, in the second position in left, and in third // position in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1764,7 +1763,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 2, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } @Test @@ -1783,7 +1782,7 @@ public class FeatureMapsConflictsMergeTest { // the node1 is in the first position in the ancestor, in the second position in left, and in third // position in right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1829,7 +1828,7 @@ public class FeatureMapsConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 2, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(2, comparison.getDifferences().size()); } private EObject getNodeNamed(Resource res, String name) { diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMapsPseudoConflictsMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMapsPseudoConflictsMergeTest.java index f939b4c54..b49295e89 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMapsPseudoConflictsMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMapsPseudoConflictsMergeTest.java @@ -17,7 +17,6 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import com.google.common.collect.Iterators; @@ -70,7 +69,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 doesn't exists in the ancestor, exists in left and right under mapNode1. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -116,7 +115,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -130,7 +129,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 doesn't exists in the ancestor, exists in left and right under mapNode1. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -176,7 +175,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -190,7 +189,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 doesn't exists in the ancestor, exists in left and right under mapNode1. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -236,7 +235,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -250,7 +249,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 doesn't exists in the ancestor, exists in left and right under mapNode1. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -296,7 +295,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -310,7 +309,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode1, but not in left and right . List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); @@ -353,7 +352,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertTrue(((BasicFeatureMap)rightMapNode1Map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -367,7 +366,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode1, but not in left and right . List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); @@ -410,7 +409,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertTrue(((BasicFeatureMap)rightMapNode1Map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -424,7 +423,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode1, but not in left and right . List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); @@ -467,7 +466,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertTrue(((BasicFeatureMap)rightMapNode1Map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -481,7 +480,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode1, but not in left and right . List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); @@ -524,7 +523,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertTrue(((BasicFeatureMap)rightMapNode1Map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -539,7 +538,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode1 with key secondKey, exists in left and right under // mapNode1 with key fisrtKey. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -585,7 +584,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -600,7 +599,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode1 with key secondKey, exists in left and right under // mapNode1 with key fisrtKey. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.CHANGE), instanceOf(FeatureMapChange.class))); @@ -646,7 +645,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -661,7 +660,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode1 with key secondKey, exists in left and right under // mapNode1 with key fisrtKey. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -707,7 +706,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -722,7 +721,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode1 with key secondKey, exists in left and right under // mapNode1 with key fisrtKey. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.CHANGE), instanceOf(FeatureMapChange.class))); @@ -768,7 +767,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -783,7 +782,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode1 in first position, exists in left and right under // mapNode1 in last position. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -829,7 +828,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -844,7 +843,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode1 in first position, exists in left and right under // mapNode1 in last position. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -890,7 +889,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -905,7 +904,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode1 in first position, exists in left and right under // mapNode1 in last position. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -951,7 +950,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -966,7 +965,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode1 in first position, exists in left and right under // mapNode1 in last position. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1012,7 +1011,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1026,7 +1025,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode2, exists in left and right under mapNode1. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1072,7 +1071,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1086,7 +1085,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode2, exists in left and right under mapNode1. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1132,7 +1131,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1146,7 +1145,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode2, exists in left and right under mapNode1. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1192,7 +1191,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1206,7 +1205,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode2, exists in left and right under mapNode1. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1252,7 +1251,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1267,7 +1266,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 doesn't referenced by mapNC1 in the ancestor, referenced in left and right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -1313,7 +1312,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1328,7 +1327,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 doesn't referenced by mapNC1 in the ancestor, referenced in left and right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -1374,7 +1373,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1389,7 +1388,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 doesn't referenced by mapNC1 in the ancestor, referenced in left and right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); @@ -1435,7 +1434,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1450,7 +1449,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 doesn't referenced by mapNC1 in the ancestor, referenced in left and right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); @@ -1496,7 +1495,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 0, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1511,7 +1510,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 is referenced by mapNC1 in the ancestor, not referenced in left and right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); @@ -1554,7 +1553,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertTrue(((BasicFeatureMap)rightMapNode1Map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1569,7 +1568,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 is referenced by mapNC1 in the ancestor, not referenced in left and right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); @@ -1612,7 +1611,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertTrue(((BasicFeatureMap)rightMapNode1Map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1627,7 +1626,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 is referenced by mapNC1 in the ancestor, not referenced in left and right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); @@ -1670,7 +1669,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertTrue(((BasicFeatureMap)rightMapNode1Map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1685,7 +1684,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 is referenced by mapNC1 in the ancestor, not referenced in left and right. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); @@ -1728,7 +1727,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertTrue(((BasicFeatureMap)rightMapNode1Map).isEmpty()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1744,7 +1743,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode1 in first position, exists in left and right under // mapNode1 in last position. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1790,7 +1789,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1806,7 +1805,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode1 in first position, exists in left and right under // mapNode1 in last position. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1852,7 +1851,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1868,7 +1867,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode1 in first position, exists in left and right under // mapNode1 in last position. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); @@ -1914,7 +1913,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } @Test @@ -1930,7 +1929,7 @@ public class FeatureMapsPseudoConflictsMergeTest { // the node1 exists in the ancestor under mapNode1 in first position, exists in left and right under // mapNode1 in last position. List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); @@ -1976,7 +1975,7 @@ public class FeatureMapsPseudoConflictsMergeTest { assertEquals(rightNode1, ((BasicFeatureMap)rightMapNode1Map).get(eSFFirstKey, 1, true)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(4), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(4, comparison.getDifferences().size()); } private EObject getNodeNamed(Resource res, String name) { diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java index b41b4a71a..1e6dc28ca 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java @@ -53,7 +53,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -84,7 +84,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(((InternalEObject)leftValue).eProxyURI(), ((InternalEObject)rightValue).eProxyURI()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -96,7 +96,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -127,7 +127,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(((InternalEObject)leftValue).eProxyURI(), ((InternalEObject)rightValue).eProxyURI()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -140,7 +140,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -181,7 +181,7 @@ public class IndividualMergeOutOfScopeValuesTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -194,7 +194,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -232,7 +232,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(((InternalEObject)leftValue).eProxyURI(), ((InternalEObject)originValue).eProxyURI()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -246,7 +246,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -284,7 +284,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(((InternalEObject)leftValue).eProxyURI(), ((InternalEObject)originValue).eProxyURI()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -298,7 +298,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -339,7 +339,7 @@ public class IndividualMergeOutOfScopeValuesTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -351,7 +351,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -382,7 +382,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(((InternalEObject)leftValue).eProxyURI(), ((InternalEObject)rightValue).eProxyURI()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -394,7 +394,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -423,7 +423,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertNull(rightValue); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -436,7 +436,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -473,7 +473,7 @@ public class IndividualMergeOutOfScopeValuesTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -486,7 +486,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -519,7 +519,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertNull(originValue); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -533,7 +533,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -566,7 +566,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertNull(originValue); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -580,7 +580,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -617,7 +617,7 @@ public class IndividualMergeOutOfScopeValuesTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -629,7 +629,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -658,7 +658,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertNull(rightValue); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -670,7 +670,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -701,7 +701,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(((InternalEObject)leftValue).eProxyURI(), ((InternalEObject)rightValue).eProxyURI()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -714,7 +714,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -749,7 +749,7 @@ public class IndividualMergeOutOfScopeValuesTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -762,7 +762,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -797,7 +797,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(((InternalEObject)leftValue).eProxyURI(), ((InternalEObject)rightValue).eProxyURI()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -811,7 +811,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -846,7 +846,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(((InternalEObject)leftValue).eProxyURI(), ((InternalEObject)rightValue).eProxyURI()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -860,7 +860,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -895,7 +895,7 @@ public class IndividualMergeOutOfScopeValuesTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -907,7 +907,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -955,7 +955,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(leftProxyIndex, rightProxyIndex); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -967,7 +967,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -1014,7 +1014,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(-1, rightProxyIndex); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1027,7 +1027,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -1089,7 +1089,7 @@ public class IndividualMergeOutOfScopeValuesTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1102,7 +1102,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -1161,7 +1161,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(-1, originProxyIndex); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1175,7 +1175,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -1234,7 +1234,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(-1, originProxyIndex); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1248,7 +1248,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -1310,7 +1310,7 @@ public class IndividualMergeOutOfScopeValuesTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1322,7 +1322,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -1369,7 +1369,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(-1, rightProxyIndex); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1381,7 +1381,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -1429,7 +1429,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(leftProxyIndex, rightProxyIndex); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1442,7 +1442,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -1504,7 +1504,7 @@ public class IndividualMergeOutOfScopeValuesTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1518,7 +1518,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -1580,7 +1580,7 @@ public class IndividualMergeOutOfScopeValuesTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1594,7 +1594,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -1655,7 +1655,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(leftProxyIndex, rightProxyIndex); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1668,7 +1668,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -1729,7 +1729,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(leftProxyIndex, rightProxyIndex); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1741,7 +1741,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -1791,7 +1791,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(leftProxyIndex, rightProxyIndex); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1803,7 +1803,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -1853,7 +1853,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(leftProxyIndex, rightProxyIndex); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1866,7 +1866,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -1930,7 +1930,7 @@ public class IndividualMergeOutOfScopeValuesTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1943,7 +1943,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -2005,7 +2005,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(leftProxyIndex, originProxyIndex); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -2019,7 +2019,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -2081,7 +2081,7 @@ public class IndividualMergeOutOfScopeValuesTest { assertEquals(leftProxyIndex, originProxyIndex); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -2095,7 +2095,7 @@ public class IndividualMergeOutOfScopeValuesTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; assertTrue(differences.get(0) instanceof ReferenceChange); @@ -2159,7 +2159,7 @@ public class IndividualMergeOutOfScopeValuesTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } private EObject getNodeNamed(Resource res, String name) { diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java index d5299b274..490239014 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java @@ -66,7 +66,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -81,7 +81,7 @@ public class IndividualMergeTest { assertEquals("leftValue", originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -93,7 +93,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -108,7 +108,7 @@ public class IndividualMergeTest { assertEquals("originValue", originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -121,7 +121,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -138,7 +138,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -151,7 +151,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -166,7 +166,7 @@ public class IndividualMergeTest { assertEquals("originValue", originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -180,7 +180,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -195,7 +195,7 @@ public class IndividualMergeTest { assertEquals("originValue", originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -209,7 +209,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -226,7 +226,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -238,7 +238,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -253,7 +253,7 @@ public class IndividualMergeTest { assertEquals("leftValue", originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -265,7 +265,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -280,7 +280,7 @@ public class IndividualMergeTest { assertNull(originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -293,7 +293,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -310,7 +310,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -323,7 +323,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -338,7 +338,7 @@ public class IndividualMergeTest { assertNull(originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -352,7 +352,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -367,7 +367,7 @@ public class IndividualMergeTest { assertNull(originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -381,7 +381,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -398,7 +398,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -410,7 +410,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -425,7 +425,7 @@ public class IndividualMergeTest { assertNull(originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -437,7 +437,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -452,7 +452,7 @@ public class IndividualMergeTest { assertEquals("originValue", originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -465,7 +465,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -482,7 +482,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -495,7 +495,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -510,7 +510,7 @@ public class IndividualMergeTest { assertEquals("originValue", originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -524,7 +524,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -539,7 +539,7 @@ public class IndividualMergeTest { assertEquals("originValue", originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -553,7 +553,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -570,7 +570,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -582,7 +582,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -599,7 +599,7 @@ public class IndividualMergeTest { assertTrue(((Collection<?>)featureValue).contains("value1")); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -611,7 +611,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -628,7 +628,7 @@ public class IndividualMergeTest { assertFalse(((Collection<?>)featureValue).contains("value1")); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -641,7 +641,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -660,7 +660,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -673,7 +673,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -690,7 +690,7 @@ public class IndividualMergeTest { assertFalse(((Collection<?>)featureValue).contains("value1")); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -704,7 +704,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -721,7 +721,7 @@ public class IndividualMergeTest { assertFalse(((Collection<?>)featureValue).contains("value1")); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -735,7 +735,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -754,7 +754,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -766,7 +766,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -783,7 +783,7 @@ public class IndividualMergeTest { assertFalse(((Collection<?>)featureValue).contains("value1")); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -795,7 +795,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -812,7 +812,7 @@ public class IndividualMergeTest { assertTrue(((Collection<?>)featureValue).contains("value1")); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -825,7 +825,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -844,7 +844,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -857,7 +857,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -874,7 +874,7 @@ public class IndividualMergeTest { assertTrue(((Collection<?>)featureValue).contains("value1")); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -888,7 +888,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -905,7 +905,7 @@ public class IndividualMergeTest { assertTrue(((Collection<?>)featureValue).contains("value1")); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -919,7 +919,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -938,7 +938,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @SuppressWarnings("unchecked") @@ -951,7 +951,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -972,7 +972,7 @@ public class IndividualMergeTest { assertEqualContents(((List<Object>)targetFeatureValue), ((List<Object>)sourceFeatureValue)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @SuppressWarnings("unchecked") @@ -985,7 +985,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1006,7 +1006,7 @@ public class IndividualMergeTest { assertEqualContents(((List<Object>)targetFeatureValue), ((List<Object>)sourceFeatureValue)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @SuppressWarnings("unchecked") @@ -1020,7 +1020,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1043,7 +1043,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @SuppressWarnings("unchecked") @@ -1057,7 +1057,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1078,7 +1078,7 @@ public class IndividualMergeTest { assertEqualContents(((List<Object>)targetFeatureValue), ((List<Object>)sourceFeatureValue)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @SuppressWarnings("unchecked") @@ -1093,7 +1093,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -1114,7 +1114,7 @@ public class IndividualMergeTest { assertEqualContents(((List<Object>)targetFeatureValue), ((List<Object>)sourceFeatureValue)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @SuppressWarnings("unchecked") @@ -1129,7 +1129,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -1152,7 +1152,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1164,7 +1164,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1181,7 +1181,7 @@ public class IndividualMergeTest { assertSame(targetNode, originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1193,7 +1193,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1210,7 +1210,7 @@ public class IndividualMergeTest { assertSame(targetNode, originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1223,7 +1223,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1242,7 +1242,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1255,7 +1255,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1272,7 +1272,7 @@ public class IndividualMergeTest { assertSame(targetNode, originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1286,7 +1286,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -1303,7 +1303,7 @@ public class IndividualMergeTest { assertSame(targetNode, originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1317,7 +1317,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -1336,7 +1336,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1348,7 +1348,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1365,7 +1365,7 @@ public class IndividualMergeTest { assertSame(targetNode, originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1377,7 +1377,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1392,7 +1392,7 @@ public class IndividualMergeTest { assertNull(originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1405,7 +1405,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1424,7 +1424,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1437,7 +1437,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1452,7 +1452,7 @@ public class IndividualMergeTest { assertNull(originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1466,7 +1466,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -1481,7 +1481,7 @@ public class IndividualMergeTest { assertNull(originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1495,7 +1495,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -1514,7 +1514,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1526,7 +1526,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1541,7 +1541,7 @@ public class IndividualMergeTest { assertNull(originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1553,7 +1553,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1570,7 +1570,7 @@ public class IndividualMergeTest { assertSame(targetNode, originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1583,7 +1583,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1600,7 +1600,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1613,7 +1613,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1630,7 +1630,7 @@ public class IndividualMergeTest { assertSame(targetNode, originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1644,7 +1644,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -1661,7 +1661,7 @@ public class IndividualMergeTest { assertSame(targetNode, originNode.eGet(feature)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1675,7 +1675,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "singleValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -1692,7 +1692,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1704,7 +1704,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1723,7 +1723,7 @@ public class IndividualMergeTest { assertTrue(((Collection<?>)featureValue).contains(targetNode)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1735,7 +1735,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1754,7 +1754,7 @@ public class IndividualMergeTest { assertFalse(((Collection<?>)featureValue).contains(targetNode)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1767,7 +1767,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1788,7 +1788,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1801,7 +1801,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1820,7 +1820,7 @@ public class IndividualMergeTest { assertFalse(((Collection<?>)featureValue).contains(targetNode)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1834,7 +1834,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -1853,7 +1853,7 @@ public class IndividualMergeTest { assertFalse(((Collection<?>)featureValue).contains(targetNode)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1867,7 +1867,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -1888,7 +1888,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1900,7 +1900,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1919,7 +1919,7 @@ public class IndividualMergeTest { assertFalse(((Collection<?>)featureValue).contains(targetNode)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1931,7 +1931,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1950,7 +1950,7 @@ public class IndividualMergeTest { assertTrue(((Collection<?>)featureValue).contains(targetNode)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1963,7 +1963,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -1984,7 +1984,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -1997,7 +1997,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -2016,7 +2016,7 @@ public class IndividualMergeTest { assertTrue(((Collection<?>)featureValue).contains(targetNode)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -2030,7 +2030,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -2049,7 +2049,7 @@ public class IndividualMergeTest { assertTrue(((Collection<?>)featureValue).contains(targetNode)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -2063,7 +2063,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -2084,7 +2084,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @SuppressWarnings("unchecked") @@ -2097,7 +2097,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -2119,7 +2119,7 @@ public class IndividualMergeTest { ((List<EObject>)sourceFeatureValue)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @SuppressWarnings("unchecked") @@ -2132,7 +2132,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -2154,7 +2154,7 @@ public class IndividualMergeTest { ((List<EObject>)sourceFeatureValue)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @SuppressWarnings("unchecked") @@ -2168,7 +2168,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -2192,7 +2192,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @SuppressWarnings("unchecked") @@ -2206,7 +2206,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), @@ -2228,7 +2228,7 @@ public class IndividualMergeTest { ((List<EObject>)sourceFeatureValue)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @SuppressWarnings("unchecked") @@ -2243,7 +2243,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -2265,7 +2265,7 @@ public class IndividualMergeTest { ((List<EObject>)sourceFeatureValue)); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @SuppressWarnings("unchecked") @@ -2280,7 +2280,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "multiValuedReference"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), @@ -2304,7 +2304,7 @@ public class IndividualMergeTest { // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -2316,7 +2316,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "containmentRef1"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), moved( @@ -2338,7 +2338,7 @@ public class IndividualMergeTest { assertEquals(sourceContainerNode, sourceNode.eContainer()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -2350,7 +2350,7 @@ public class IndividualMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); final List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(1), Integer.valueOf(differences.size())); + assertEquals(1, differences.size()); final String featureName = "containmentRef1"; final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), moved( @@ -2372,7 +2372,7 @@ public class IndividualMergeTest { assertEquals(sourceContainerNode, sourceNode.eContainer()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } /** @@ -2386,7 +2386,7 @@ public class IndividualMergeTest { */ private static <T> void assertEqualContents(List<T> list1, List<T> list2) { final int size = list1.size(); - assertSame(Integer.valueOf(size), Integer.valueOf(list2.size())); + assertEquals(size, list2.size()); for (int i = 0; i < size; i++) { final Object object1 = list1.get(i); @@ -2407,7 +2407,7 @@ public class IndividualMergeTest { private static <T extends EObject> void assertEqualContents(Comparison comparison, List<T> list1, List<T> list2) { final int size = list1.size(); - assertSame(Integer.valueOf(size), Integer.valueOf(list2.size())); + assertEquals(size, list2.size()); boolean list2IsOrigin = false; for (int i = 0; i < size; i++) { diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MultipleMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MultipleMergeTest.java index 825636213..a735e32b8 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MultipleMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MultipleMergeTest.java @@ -463,7 +463,7 @@ public class MultipleMergeTest { final List<Diff> differences = comparison.getDifferences(); // Initially 6 differences, equivalent by pairs - assertSame(Integer.valueOf(6), Integer.valueOf(differences.size())); + assertEquals(6, differences.size()); // diff1 is equivalent to diff2 // diff3 is equivalent to diff4 @@ -501,7 +501,7 @@ public class MultipleMergeTest { assertMerged(comparison, diff6, false, false); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -515,7 +515,7 @@ public class MultipleMergeTest { final List<Diff> differences = comparison.getDifferences(); // Initially 6 differences, equivalent by pairs - assertSame(Integer.valueOf(6), Integer.valueOf(differences.size())); + assertEquals(6, differences.size()); // diff1 is equivalent to diff2 // diff3 is equivalent to diff4 @@ -549,7 +549,7 @@ public class MultipleMergeTest { assertMerged(comparison, diff6, true, true); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -563,7 +563,7 @@ public class MultipleMergeTest { final List<Diff> differences = comparison.getDifferences(); // Initially 4 differences, equivalent by pairs - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); // diff1 is equivalent to diff2 // diff3 is equivalent to diff4 @@ -586,7 +586,7 @@ public class MultipleMergeTest { assertMerged(comparison, diff4, false, false); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -600,7 +600,7 @@ public class MultipleMergeTest { final List<Diff> differences = comparison.getDifferences(); // Initially 4 differences, equivalent by pairs - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); // diff1 is equivalent to diff2 // diff3 is equivalent to diff4 @@ -623,7 +623,7 @@ public class MultipleMergeTest { assertMerged(comparison, diff4, true, true); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -637,7 +637,7 @@ public class MultipleMergeTest { final List<Diff> differences = comparison.getDifferences(); // Initially 12 differences, 3 equivalent pairs, some dependencies - assertSame(Integer.valueOf(12), Integer.valueOf(differences.size())); + assertEquals(12, differences.size()); // diff1 is equivalent to diff2 // diff3 is equivalent to diff4 @@ -692,7 +692,7 @@ public class MultipleMergeTest { assertSame(DifferenceState.MERGED, diff12.getState()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -706,7 +706,7 @@ public class MultipleMergeTest { final List<Diff> differences = comparison.getDifferences(); // Initially 12 differences, 3 equivalent pairs, some dependencies - assertSame(Integer.valueOf(12), Integer.valueOf(differences.size())); + assertEquals(12, differences.size()); // diff1 is equivalent to diff2 // diff3 is equivalent to diff4 @@ -771,7 +771,7 @@ public class MultipleMergeTest { mergerRegistry.getHighestRankingMerger(diff12).copyRightToLeft(diff12, new BasicMonitor()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -791,7 +791,7 @@ public class MultipleMergeTest { // 4 : changed reference "source" of C to A // 2, 3 and 4 are equivalent // 2 and 4 require 1 - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final ReferenceChange diff1 = (ReferenceChange)Iterators.find(differences.iterator(), addedToReference("Requirements", "containmentRef1", "Requirements.C")); @@ -809,7 +809,7 @@ public class MultipleMergeTest { assertMerged(comparison, diff4, false, false); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -829,7 +829,7 @@ public class MultipleMergeTest { // 4 : changed reference "source" of C to A // 2, 3 and 4 are equivalent // 2 and 4 require 1 - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final ReferenceChange diff1 = (ReferenceChange)Iterators.find(differences.iterator(), addedToReference("Requirements", "containmentRef1", "Requirements.C")); @@ -852,7 +852,7 @@ public class MultipleMergeTest { assertMerged(comparison, diff4, false, false); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -872,7 +872,7 @@ public class MultipleMergeTest { // 4 : changed reference "source" of C to A // 2, 3 and 4 are equivalent // 2 and 4 require 1 - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); final ReferenceChange diff1 = (ReferenceChange)Iterators.find(differences.iterator(), addedToReference("Requirements", "containmentRef1", "Requirements.C")); @@ -900,7 +900,7 @@ public class MultipleMergeTest { mergerRegistry.getHighestRankingMerger(diff1).copyRightToLeft(diff1, new BasicMonitor()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -922,7 +922,7 @@ public class MultipleMergeTest { // 3, 4 and 5 are equivalent // 2 requires 3 and 4 // 3 and 5 require 1 - assertSame(Integer.valueOf(5), Integer.valueOf(differences.size())); + assertEquals(5, differences.size()); final ReferenceChange diff1 = (ReferenceChange)Iterators.find(differences.iterator(), addedToReference("Requirements", "containmentRef1", "Requirements.C")); @@ -955,7 +955,7 @@ public class MultipleMergeTest { assertMerged(comparison, diff5, false, false); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } @Test @@ -977,7 +977,7 @@ public class MultipleMergeTest { // 3, 4 and 5 are equivalent // 2 requires 3 and 4 // 3 and 5 require 1 - assertSame(Integer.valueOf(5), Integer.valueOf(differences.size())); + assertEquals(5, differences.size()); final ReferenceChange diff1 = (ReferenceChange)Iterators.find(differences.iterator(), addedToReference("Requirements", "containmentRef1", "Requirements.C")); @@ -1009,7 +1009,7 @@ public class MultipleMergeTest { assertNull(diff5.getMatch().getRight()); comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size())); + assertEquals(0, comparison.getDifferences().size()); } /** @@ -1024,7 +1024,7 @@ public class MultipleMergeTest { private static <T extends EObject> void assertEqualContents(Comparison comparison, List<T> list1, List<T> list2) { final int size = list1.size(); - assertSame(Integer.valueOf(size), Integer.valueOf(list2.size())); + assertEquals(size, list2.size()); for (int i = 0; i < size; i++) { final EObject eObject1 = list1.get(i); @@ -1089,7 +1089,7 @@ public class MultipleMergeTest { assertSame(containerMatch.getLeft().eResource(), valueMatch.getLeft().eResource()); final EObject addedToLeft = valueMatch.getLeft(); final List<EObject> values = getAsList(containerMatch.getLeft(), diff.getReference()); - assertSame(Integer.valueOf(expectedIndex), Integer.valueOf(values.indexOf(addedToLeft))); + assertEquals(expectedIndex, values.indexOf(addedToLeft)); } else { assertTrue(valueMatch == null || valueMatch.getLeft() == null); } @@ -1099,7 +1099,7 @@ public class MultipleMergeTest { assertSame(containerMatch.getRight().eResource(), valueMatch.getRight().eResource()); final EObject addedToRight = valueMatch.getRight(); final List<EObject> values = getAsList(containerMatch.getRight(), diff.getReference()); - assertSame(Integer.valueOf(expectedIndex), Integer.valueOf(values.indexOf(addedToRight))); + assertEquals(expectedIndex, values.indexOf(addedToRight)); } else { assertTrue(valueMatch == null || valueMatch.getRight() == null); } diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/PseudoConflictMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/PseudoConflictMergeTest.java index 10109fc66..c3517a19e 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/PseudoConflictMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/PseudoConflictMergeTest.java @@ -19,7 +19,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import com.google.common.collect.Iterators; @@ -68,7 +67,7 @@ public class PseudoConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD))); @@ -108,7 +107,7 @@ public class PseudoConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD))); @@ -148,7 +147,7 @@ public class PseudoConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD))); @@ -188,7 +187,7 @@ public class PseudoConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD))); @@ -228,7 +227,7 @@ public class PseudoConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE))); @@ -268,7 +267,7 @@ public class PseudoConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.DELETE))); @@ -308,7 +307,7 @@ public class PseudoConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE))); @@ -348,7 +347,7 @@ public class PseudoConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.DELETE))); @@ -388,7 +387,7 @@ public class PseudoConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.CHANGE))); @@ -430,7 +429,7 @@ public class PseudoConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.CHANGE))); @@ -472,7 +471,7 @@ public class PseudoConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.CHANGE))); @@ -514,7 +513,7 @@ public class PseudoConflictMergeTest { Comparison comparison = EMFCompare.builder().build().compare(scope); List<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.CHANGE))); diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/postprocess/PostProcessorTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/postprocess/PostProcessorTest.java index 5a080404a..18f37b473 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/postprocess/PostProcessorTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/postprocess/PostProcessorTest.java @@ -11,7 +11,6 @@ package org.eclipse.emf.compare.tests.postprocess; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import java.io.IOException; @@ -52,7 +51,7 @@ public class PostProcessorTest { final IComparisonScope scope = new DefaultComparisonScope(left, right, null); final Comparison comparison = EMFCompare.builder().build().compare(scope); - assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getMatches().size())); + assertEquals(1, comparison.getMatches().size()); } @Test @@ -65,7 +64,7 @@ public class PostProcessorTest { final Comparison comparison = compareWithPostProcessing(left, right, Pattern .compile("http://www.eclipse.org/emf/compare/tests/nodes"), null); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getMatches().size())); + assertEquals(2, comparison.getMatches().size()); } @@ -79,7 +78,7 @@ public class PostProcessorTest { final Comparison comparison = compareWithPostProcessing(left, right, Pattern.compile(".*/nodes"), null); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getMatches().size())); + assertEquals(2, comparison.getMatches().size()); } @@ -92,7 +91,7 @@ public class PostProcessorTest { final Comparison comparison = compareWithPostProcessing(left, right, Pattern.compile(".*/nides"), null); - assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getMatches().size())); + assertEquals(1, comparison.getMatches().size()); } @@ -104,7 +103,7 @@ public class PostProcessorTest { // No post processes if the regex matches no scanned namespace URIs (null value case) final Comparison comparison = compareWithPostProcessing(left, right, null, null); - assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getMatches().size())); + assertEquals(1, comparison.getMatches().size()); } @@ -116,7 +115,7 @@ public class PostProcessorTest { // No post processes if the regex matches no scanned namespace URIs (empty value cas) final Comparison comparison = compareWithPostProcessing(left, right, Pattern.compile(""), null); - assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getMatches().size())); + assertEquals(1, comparison.getMatches().size()); } @@ -128,7 +127,7 @@ public class PostProcessorTest { // No post processes if the regex matches no scanned namespace URIs (blank value cas) final Comparison comparison = compareWithPostProcessing(left, right, Pattern.compile(" "), null); - assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getMatches().size())); + assertEquals(1, comparison.getMatches().size()); } @@ -142,7 +141,7 @@ public class PostProcessorTest { final Comparison comparison = compareWithPostProcessing(left, right, null, Pattern.compile(left .getURI().toString())); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getMatches().size())); + assertEquals(2, comparison.getMatches().size()); } @@ -156,7 +155,7 @@ public class PostProcessorTest { final Comparison comparison = compareWithPostProcessing(left, right, null, Pattern .compile(".*.nodes")); - assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getMatches().size())); + assertEquals(2, comparison.getMatches().size()); } @@ -169,7 +168,7 @@ public class PostProcessorTest { final Comparison comparison = compareWithPostProcessing(left, right, null, Pattern .compile(".*.nides")); - assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getMatches().size())); + assertEquals(1, comparison.getMatches().size()); } @@ -181,7 +180,7 @@ public class PostProcessorTest { // No post processes if the regex matches no scanned resource URIs (empty value) final Comparison comparison = compareWithPostProcessing(left, right, null, Pattern.compile("")); - assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getMatches().size())); + assertEquals(1, comparison.getMatches().size()); } @@ -193,7 +192,7 @@ public class PostProcessorTest { // No post processes if the regex matches no scanned resource URIs (blank value) final Comparison comparison = compareWithPostProcessing(left, right, null, Pattern.compile(" ")); - assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getMatches().size())); + assertEquals(1, comparison.getMatches().size()); } diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/ReqComputingTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/ReqComputingTest.java index 9461dcdc0..787378115 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/ReqComputingTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/ReqComputingTest.java @@ -18,8 +18,8 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedReferenc import static org.eclipse.emf.compare.utils.EMFComparePredicates.movedInReference; import static org.eclipse.emf.compare.utils.EMFComparePredicates.removed; import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromReference; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import com.google.common.base.Predicate; @@ -624,7 +624,7 @@ public class ReqComputingTest { EList<Diff> differences = comparison.getDifferences(); - assertSame(Integer.valueOf(3), Integer.valueOf(differences.size())); + assertEquals(3, differences.size()); Diff added1 = getOnlyElement(filter(differences, added(node1)), null); assertNotNull(added1); Diff added2 = getOnlyElement(filter(differences, added(node2)), null); @@ -641,10 +641,10 @@ public class ReqComputingTest { // Happy compiler assert singleChange != null; assertTrue(singleChange.getValue().eIsProxy()); - assertSame(Integer.valueOf(0), Integer.valueOf(added1.getRequires().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(added2.getRequires().size())); + assertEquals(0, added1.getRequires().size()); + assertEquals(1, added2.getRequires().size()); assertTrue(added2.getRequires().contains(added1)); - assertSame(Integer.valueOf(1), Integer.valueOf(singleChange.getRequires().size())); + assertEquals(1, singleChange.getRequires().size()); assertTrue(singleChange.getRequires().contains(added2)); } @@ -652,7 +652,7 @@ public class ReqComputingTest { final List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 3 differences - assertSame(Integer.valueOf(3), Integer.valueOf(differences.size())); + assertEquals(3, differences.size()); Predicate<? super Diff> deleteSourceDiffDescription = null; Predicate<? super Diff> deleteDestinationDiffDescription = null; @@ -688,19 +688,19 @@ public class ReqComputingTest { // CHECK REQUIREMENT if (kind.equals(TestKind.ADD)) { - assertSame(Integer.valueOf(0), Integer.valueOf(deleteSourceDiff.getRequires().size())); + assertEquals(0, deleteSourceDiff.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(deleteDestinationDiff.getRequires().size())); + assertEquals(0, deleteDestinationDiff.getRequires().size()); - assertSame(Integer.valueOf(2), Integer.valueOf(changedSingleValuedRefDiff.getRequires().size())); + assertEquals(2, changedSingleValuedRefDiff.getRequires().size()); assertTrue(changedSingleValuedRefDiff.getRequires().contains(deleteDestinationDiff)); assertTrue(changedSingleValuedRefDiff.getRequires().contains(deleteSourceDiff)); } else { - assertSame(Integer.valueOf(1), Integer.valueOf(deleteSourceDiff.getRequires().size())); + assertEquals(1, deleteSourceDiff.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(deleteDestinationDiff.getRequires().size())); + assertEquals(1, deleteDestinationDiff.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(changedSingleValuedRefDiff.getRequires().size())); + assertEquals(0, changedSingleValuedRefDiff.getRequires().size()); } } @@ -708,7 +708,7 @@ public class ReqComputingTest { final List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 3 differences - assertSame(Integer.valueOf(3), Integer.valueOf(differences.size())); + assertEquals(3, differences.size()); Predicate<? super Diff> deleteSourceDiffDescription = null; Predicate<? super Diff> deleteDestinationDiffDescription = null; @@ -739,21 +739,21 @@ public class ReqComputingTest { // CHECK REQUIREMENT if (kind.equals(TestKind.ADD)) { - assertSame(Integer.valueOf(0), Integer.valueOf(deleteSourceDiff.getRequires().size())); + assertEquals(0, deleteSourceDiff.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(deleteDestinationDiff.getRequires().size())); + assertEquals(0, deleteDestinationDiff.getRequires().size()); - assertSame(Integer.valueOf(2), Integer.valueOf(deleteMultiValuedRefDiff.getRequires().size())); + assertEquals(2, deleteMultiValuedRefDiff.getRequires().size()); assertTrue(deleteMultiValuedRefDiff.getRequires().contains(deleteDestinationDiff)); assertTrue(deleteMultiValuedRefDiff.getRequires().contains(deleteSourceDiff)); } else { - assertSame(Integer.valueOf(1), Integer.valueOf(deleteSourceDiff.getRequires().size())); + assertEquals(1, deleteSourceDiff.getRequires().size()); assertTrue(deleteSourceDiff.getRequires().contains(deleteMultiValuedRefDiff)); - assertSame(Integer.valueOf(1), Integer.valueOf(deleteDestinationDiff.getRequires().size())); + assertEquals(1, deleteDestinationDiff.getRequires().size()); assertTrue(deleteDestinationDiff.getRequires().contains(deleteMultiValuedRefDiff)); - assertSame(Integer.valueOf(0), Integer.valueOf(deleteMultiValuedRefDiff.getRequires().size())); + assertEquals(0, deleteMultiValuedRefDiff.getRequires().size()); } } @@ -761,7 +761,7 @@ public class ReqComputingTest { final List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 2 differences - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); Predicate<? super Diff> deleteDestinationDiffDescription = null; Predicate<? super Diff> changedSingleValuedRefDiffDescription = null; @@ -788,15 +788,15 @@ public class ReqComputingTest { // CHECK REQUIREMENT if (kind.equals(TestKind.ADD)) { - assertSame(Integer.valueOf(0), Integer.valueOf(deleteDestinationDiff.getRequires().size())); + assertEquals(0, deleteDestinationDiff.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(changedSingleValuedRefDiff.getRequires().size())); + assertEquals(1, changedSingleValuedRefDiff.getRequires().size()); assertTrue(changedSingleValuedRefDiff.getRequires().contains(deleteDestinationDiff)); } else { - assertSame(Integer.valueOf(1), Integer.valueOf(deleteDestinationDiff.getRequires().size())); + assertEquals(1, deleteDestinationDiff.getRequires().size()); assertTrue(deleteDestinationDiff.getRequires().contains(changedSingleValuedRefDiff)); - assertSame(Integer.valueOf(0), Integer.valueOf(changedSingleValuedRefDiff.getRequires().size())); + assertEquals(0, changedSingleValuedRefDiff.getRequires().size()); } } @@ -804,7 +804,7 @@ public class ReqComputingTest { final List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 3 differences - assertSame(Integer.valueOf(3), Integer.valueOf(differences.size())); + assertEquals(3, differences.size()); Predicate<? super Diff> deleteDestinationDiffDescription = null; Predicate<? super Diff> deletedMultiValuedRefDiffDescription = null; @@ -839,19 +839,19 @@ public class ReqComputingTest { // CHECK REQUIREMENT if (kind.equals(TestKind.ADD)) { - assertSame(Integer.valueOf(0), Integer.valueOf(deleteDestinationDiff.getRequires().size())); + assertEquals(0, deleteDestinationDiff.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(deletedMultiValuedRefDiff.getRequires().size())); + assertEquals(1, deletedMultiValuedRefDiff.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(addedMultiValuedRefDiff.getRequires().size())); + assertEquals(0, addedMultiValuedRefDiff.getRequires().size()); assertTrue(deletedMultiValuedRefDiff.getRequires().contains(deleteDestinationDiff)); } else { - assertSame(Integer.valueOf(1), Integer.valueOf(deleteDestinationDiff.getRequires().size())); + assertEquals(1, deleteDestinationDiff.getRequires().size()); assertTrue(deleteDestinationDiff.getRequires().contains(deletedMultiValuedRefDiff)); - assertSame(Integer.valueOf(0), Integer.valueOf(deletedMultiValuedRefDiff.getRequires().size())); + assertEquals(0, deletedMultiValuedRefDiff.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(addedMultiValuedRefDiff.getRequires().size())); + assertEquals(0, addedMultiValuedRefDiff.getRequires().size()); } } @@ -860,7 +860,7 @@ public class ReqComputingTest { final List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 8 differences - assertSame(Integer.valueOf(8), Integer.valueOf(differences.size())); + assertEquals(8, differences.size()); Predicate<? super Diff> addDest4Description = null; Predicate<? super Diff> delDest2Description = null; @@ -924,44 +924,44 @@ public class ReqComputingTest { // CHECK REQUIREMENT if (kind.equals(TestKind.ADD)) { - assertSame(Integer.valueOf(1), Integer.valueOf(addDest4.getRequires().size())); + assertEquals(1, addDest4.getRequires().size()); assertTrue(addDest4.getRequires().contains(addRefDest4)); - assertSame(Integer.valueOf(0), Integer.valueOf(delDest2.getRequires().size())); + assertEquals(0, delDest2.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(delDest3.getRequires().size())); + assertEquals(0, delDest3.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(addRefDest1.getRequires().size())); + assertEquals(0, addRefDest1.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(addRefDest4.getRequires().size())); + assertEquals(0, addRefDest4.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(delRefDest2.getRequires().size())); + assertEquals(1, delRefDest2.getRequires().size()); assertTrue(delRefDest2.getRequires().contains(delDest2)); - assertSame(Integer.valueOf(1), Integer.valueOf(delRefDest3.getRequires().size())); + assertEquals(1, delRefDest3.getRequires().size()); assertTrue(delRefDest3.getRequires().contains(delDest3)); - assertSame(Integer.valueOf(0), Integer.valueOf(delRefDest5.getRequires().size())); + assertEquals(0, delRefDest5.getRequires().size()); } else { - assertSame(Integer.valueOf(0), Integer.valueOf(addDest4.getRequires().size())); + assertEquals(0, addDest4.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(delDest2.getRequires().size())); + assertEquals(1, delDest2.getRequires().size()); assertTrue(delDest2.getRequires().contains(delRefDest2)); - assertSame(Integer.valueOf(1), Integer.valueOf(delDest3.getRequires().size())); + assertEquals(1, delDest3.getRequires().size()); assertTrue(delDest3.getRequires().contains(delRefDest3)); - assertSame(Integer.valueOf(0), Integer.valueOf(addRefDest1.getRequires().size())); + assertEquals(0, addRefDest1.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(addRefDest4.getRequires().size())); + assertEquals(1, addRefDest4.getRequires().size()); assertTrue(addRefDest4.getRequires().contains(addDest4)); - assertSame(Integer.valueOf(0), Integer.valueOf(delRefDest2.getRequires().size())); + assertEquals(0, delRefDest2.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(delRefDest3.getRequires().size())); + assertEquals(0, delRefDest3.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(delRefDest5.getRequires().size())); + assertEquals(0, delRefDest5.getRequires().size()); } } @@ -970,7 +970,7 @@ public class ReqComputingTest { final List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 7 differences - assertSame(Integer.valueOf(7), Integer.valueOf(differences.size())); + assertEquals(7, differences.size()); Predicate<? super Diff> delDestDescription = null; Predicate<? super Diff> delContainerDescription = null; @@ -1022,47 +1022,47 @@ public class ReqComputingTest { // CHECK REQUIREMENT if (kind.equals(TestKind.ADD)) { - assertSame(Integer.valueOf(0), Integer.valueOf(delDest.getRequires().size())); + assertEquals(0, delDest.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(delContainer.getRequires().size())); + assertEquals(0, delContainer.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(delSubContainer.getRequires().size())); + assertEquals(1, delSubContainer.getRequires().size()); assertTrue(delSubContainer.getRequires().contains(delContainer)); - assertSame(Integer.valueOf(1), Integer.valueOf(delSource1.getRequires().size())); + assertEquals(1, delSource1.getRequires().size()); assertTrue(delSource1.getRequires().contains(delSubContainer)); - assertSame(Integer.valueOf(1), Integer.valueOf(delSource2.getRequires().size())); + assertEquals(1, delSource2.getRequires().size()); assertTrue(delSource2.getRequires().contains(delSubContainer)); - assertSame(Integer.valueOf(2), Integer.valueOf(delRefSource1.getRequires().size())); + assertEquals(2, delRefSource1.getRequires().size()); assertTrue(delRefSource1.getRequires().contains(delSource1)); assertTrue(delRefSource2.getRequires().contains(delSource2)); - assertSame(Integer.valueOf(2), Integer.valueOf(delRefSource2.getRequires().size())); + assertEquals(2, delRefSource2.getRequires().size()); assertTrue(delRefSource1.getRequires().contains(delDest)); assertTrue(delRefSource2.getRequires().contains(delDest)); } else { - assertSame(Integer.valueOf(2), Integer.valueOf(delDest.getRequires().size())); + assertEquals(2, delDest.getRequires().size()); assertTrue(delDest.getRequires().contains(delRefSource1)); assertTrue(delDest.getRequires().contains(delRefSource2)); - assertSame(Integer.valueOf(1), Integer.valueOf(delContainer.getRequires().size())); + assertEquals(1, delContainer.getRequires().size()); assertTrue(delContainer.getRequires().contains(delSubContainer)); - assertSame(Integer.valueOf(2), Integer.valueOf(delSubContainer.getRequires().size())); + assertEquals(2, delSubContainer.getRequires().size()); assertTrue(delSubContainer.getRequires().contains(delSource1)); assertTrue(delSubContainer.getRequires().contains(delSource2)); - assertSame(Integer.valueOf(1), Integer.valueOf(delSource1.getRequires().size())); + assertEquals(1, delSource1.getRequires().size()); assertTrue(delSource1.getRequires().contains(delRefSource1)); - assertSame(Integer.valueOf(1), Integer.valueOf(delSource2.getRequires().size())); + assertEquals(1, delSource2.getRequires().size()); assertTrue(delSource2.getRequires().contains(delRefSource2)); - assertSame(Integer.valueOf(0), Integer.valueOf(delRefSource1.getRequires().size())); + assertEquals(0, delRefSource1.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(delRefSource2.getRequires().size())); + assertEquals(0, delRefSource2.getRequires().size()); } } @@ -1071,7 +1071,7 @@ public class ReqComputingTest { final List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 4 differences - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); Predicate<? super Diff> addBDescription = null; Predicate<? super Diff> delCDescription = null; @@ -1102,23 +1102,23 @@ public class ReqComputingTest { // CHECK REQUIREMENT if (kind.equals(TestKind.ADD)) { - assertSame(Integer.valueOf(1), Integer.valueOf(addB.getRequires().size())); + assertEquals(1, addB.getRequires().size()); assertTrue(addB.getRequires().contains(delC)); - assertSame(Integer.valueOf(0), Integer.valueOf(delC.getRequires().size())); + assertEquals(0, delC.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(addE.getRequires().size())); + assertEquals(0, addE.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(delF.getRequires().size())); + assertEquals(0, delF.getRequires().size()); } else { - assertSame(Integer.valueOf(0), Integer.valueOf(addB.getRequires().size())); + assertEquals(0, addB.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(delC.getRequires().size())); + assertEquals(1, delC.getRequires().size()); assertTrue(delC.getRequires().contains(addB)); - assertSame(Integer.valueOf(0), Integer.valueOf(addE.getRequires().size())); + assertEquals(0, addE.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(delF.getRequires().size())); + assertEquals(0, delF.getRequires().size()); } } @@ -1127,7 +1127,7 @@ public class ReqComputingTest { final List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 7 differences - assertSame(Integer.valueOf(7), Integer.valueOf(differences.size())); + assertEquals(7, differences.size()); Predicate<? super Diff> addBDescription = null; Predicate<? super Diff> delCDescription = null; @@ -1177,40 +1177,40 @@ public class ReqComputingTest { // CHECK REQUIREMENT if (kind.equals(TestKind.ADD)) { - assertSame(Integer.valueOf(0), Integer.valueOf(addB.getRequires().size())); + assertEquals(0, addB.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(delC.getRequires().size())); + assertEquals(1, delC.getRequires().size()); assertTrue(delC.getRequires().contains(changeRefB)); - assertSame(Integer.valueOf(1), Integer.valueOf(changeRefB.getRequires().size())); + assertEquals(1, changeRefB.getRequires().size()); assertTrue(changeRefB.getRequires().contains(addB)); - assertSame(Integer.valueOf(0), Integer.valueOf(addE.getRequires().size())); + assertEquals(0, addE.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(delF.getRequires().size())); + assertEquals(1, delF.getRequires().size()); assertTrue(delF.getRequires().contains(delRefF)); - assertSame(Integer.valueOf(1), Integer.valueOf(addRefE.getRequires().size())); + assertEquals(1, addRefE.getRequires().size()); assertTrue(addRefE.getRequires().contains(addE)); - assertSame(Integer.valueOf(0), Integer.valueOf(delRefF.getRequires().size())); + assertEquals(0, delRefF.getRequires().size()); } else { - assertSame(Integer.valueOf(1), Integer.valueOf(addB.getRequires().size())); + assertEquals(1, addB.getRequires().size()); assertTrue(addB.getRequires().contains(changeRefB)); - assertSame(Integer.valueOf(0), Integer.valueOf(delC.getRequires().size())); + assertEquals(0, delC.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(changeRefB.getRequires().size())); + assertEquals(1, changeRefB.getRequires().size()); assertTrue(changeRefB.getRequires().contains(delC)); - assertSame(Integer.valueOf(1), Integer.valueOf(addE.getRequires().size())); + assertEquals(1, addE.getRequires().size()); assertTrue(addE.getRequires().contains(addRefE)); - assertSame(Integer.valueOf(0), Integer.valueOf(delF.getRequires().size())); + assertEquals(0, delF.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(addRefE.getRequires().size())); + assertEquals(0, addRefE.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(delRefF.getRequires().size())); + assertEquals(1, delRefF.getRequires().size()); assertTrue(delRefF.getRequires().contains(delF)); } @@ -1220,7 +1220,7 @@ public class ReqComputingTest { final List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 2 differences - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); Predicate<? super Diff> addBDescription = null; Predicate<? super Diff> addCDescription = null; @@ -1241,15 +1241,15 @@ public class ReqComputingTest { // CHECK REQUIREMENT if (kind.equals(TestKind.ADD)) { - assertSame(Integer.valueOf(0), Integer.valueOf(addB.getRequires().size())); + assertEquals(0, addB.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(addC.getRequires().size())); + assertEquals(1, addC.getRequires().size()); assertTrue(addC.getRequires().contains(addB)); } else { - assertSame(Integer.valueOf(1), Integer.valueOf(addB.getRequires().size())); + assertEquals(1, addB.getRequires().size()); assertTrue(addB.getRequires().contains(addC)); - assertSame(Integer.valueOf(0), Integer.valueOf(addC.getRequires().size())); + assertEquals(0, addC.getRequires().size()); } } @@ -1258,7 +1258,7 @@ public class ReqComputingTest { final List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 4 differences - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); Predicate<? super Diff> addADescription = null; Predicate<? super Diff> addCDescription = null; @@ -1292,25 +1292,25 @@ public class ReqComputingTest { // CHECK REQUIREMENT if (kind.equals(TestKind.ADD)) { - assertSame(Integer.valueOf(0), Integer.valueOf(addA.getRequires().size())); + assertEquals(0, addA.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(addC.getRequires().size())); + assertEquals(0, addC.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(changeRefB.getRequires().size())); + assertEquals(1, changeRefB.getRequires().size()); assertTrue(changeRefB.getRequires().contains(addA)); - assertSame(Integer.valueOf(1), Integer.valueOf(addRefB.getRequires().size())); + assertEquals(1, addRefB.getRequires().size()); assertTrue(addRefB.getRequires().contains(addC)); } else { - assertSame(Integer.valueOf(1), Integer.valueOf(addA.getRequires().size())); + assertEquals(1, addA.getRequires().size()); assertTrue(addA.getRequires().contains(changeRefB)); - assertSame(Integer.valueOf(1), Integer.valueOf(addC.getRequires().size())); + assertEquals(1, addC.getRequires().size()); assertTrue(addC.getRequires().contains(addRefB)); - assertSame(Integer.valueOf(0), Integer.valueOf(changeRefB.getRequires().size())); + assertEquals(0, changeRefB.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(addRefB.getRequires().size())); + assertEquals(0, addRefB.getRequires().size()); } } @@ -1319,7 +1319,7 @@ public class ReqComputingTest { final List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 4 differences - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); Predicate<? super Diff> delBDescription = null; Predicate<? super Diff> moveCDescription = null; @@ -1350,25 +1350,25 @@ public class ReqComputingTest { // CHECK REQUIREMENT if (kind.equals(TestKind.ADD)) { - assertSame(Integer.valueOf(1), Integer.valueOf(delB.getRequires().size())); + assertEquals(1, delB.getRequires().size()); assertTrue(delB.getRequires().contains(moveC)); - assertSame(Integer.valueOf(0), Integer.valueOf(moveC.getRequires().size())); + assertEquals(0, moveC.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(moveD.getRequires().size())); + assertEquals(0, moveD.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(moveE.getRequires().size())); + assertEquals(1, moveE.getRequires().size()); assertTrue(moveE.getRequires().contains(moveD)); } else { - assertSame(Integer.valueOf(0), Integer.valueOf(delB.getRequires().size())); + assertEquals(0, delB.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(moveC.getRequires().size())); + assertEquals(1, moveC.getRequires().size()); assertTrue(moveC.getRequires().contains(delB)); - assertSame(Integer.valueOf(1), Integer.valueOf(moveD.getRequires().size())); + assertEquals(1, moveD.getRequires().size()); assertTrue(moveD.getRequires().contains(moveE)); - assertSame(Integer.valueOf(0), Integer.valueOf(moveE.getRequires().size())); + assertEquals(0, moveE.getRequires().size()); } } @@ -1377,7 +1377,7 @@ public class ReqComputingTest { final List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 5 differences - assertSame(Integer.valueOf(5), Integer.valueOf(differences.size())); + assertEquals(5, differences.size()); Predicate<? super Diff> deleteADiffDescription = null; Predicate<? super Diff> deleteBDiffDescription = null; @@ -1417,33 +1417,33 @@ public class ReqComputingTest { // CHECK REQUIREMENT if (kind.equals(TestKind.ADD)) { - assertSame(Integer.valueOf(0), Integer.valueOf(deleteADiff.getRequires().size())); + assertEquals(0, deleteADiff.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(deleteBDiff.getRequires().size())); + assertEquals(0, deleteBDiff.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(deleteCDiff.getRequires().size())); + assertEquals(0, deleteCDiff.getRequires().size()); - assertSame(Integer.valueOf(2), Integer.valueOf(deleteRefBDiff.getRequires().size())); + assertEquals(2, deleteRefBDiff.getRequires().size()); assertTrue(deleteRefBDiff.getRequires().contains(deleteBDiff)); assertTrue(deleteRefBDiff.getRequires().contains(deleteADiff)); - assertSame(Integer.valueOf(2), Integer.valueOf(deleteRefCDiff.getRequires().size())); + assertEquals(2, deleteRefCDiff.getRequires().size()); assertTrue(deleteRefCDiff.getRequires().contains(deleteCDiff)); assertTrue(deleteRefCDiff.getRequires().contains(deleteADiff)); } else { - assertSame(Integer.valueOf(2), Integer.valueOf(deleteADiff.getRequires().size())); + assertEquals(2, deleteADiff.getRequires().size()); assertTrue(deleteADiff.getRequires().contains(deleteRefBDiff)); assertTrue(deleteADiff.getRequires().contains(deleteRefCDiff)); - assertSame(Integer.valueOf(1), Integer.valueOf(deleteBDiff.getRequires().size())); + assertEquals(1, deleteBDiff.getRequires().size()); assertTrue(deleteBDiff.getRequires().contains(deleteRefBDiff)); - assertSame(Integer.valueOf(1), Integer.valueOf(deleteCDiff.getRequires().size())); + assertEquals(1, deleteCDiff.getRequires().size()); assertTrue(deleteCDiff.getRequires().contains(deleteRefCDiff)); - assertSame(Integer.valueOf(0), Integer.valueOf(deleteRefBDiff.getRequires().size())); + assertEquals(0, deleteRefBDiff.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(deleteRefCDiff.getRequires().size())); + assertEquals(0, deleteRefCDiff.getRequires().size()); } } @@ -1452,7 +1452,7 @@ public class ReqComputingTest { final List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 5 differences - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); Predicate<? super Diff> deleteADiffDescription = null; Predicate<? super Diff> deleteCDiffDescription = null; @@ -1487,27 +1487,27 @@ public class ReqComputingTest { // CHECK REQUIREMENT if (kind.equals(TestKind.ADD)) { - assertSame(Integer.valueOf(0), Integer.valueOf(deleteADiff.getRequires().size())); + assertEquals(0, deleteADiff.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(deleteCDiff.getRequires().size())); + assertEquals(0, deleteCDiff.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(deleteRefBDiff.getRequires().size())); + assertEquals(1, deleteRefBDiff.getRequires().size()); assertTrue(deleteRefBDiff.getRequires().contains(deleteADiff)); - assertSame(Integer.valueOf(2), Integer.valueOf(deleteRefCDiff.getRequires().size())); + assertEquals(2, deleteRefCDiff.getRequires().size()); assertTrue(deleteRefCDiff.getRequires().contains(deleteCDiff)); assertTrue(deleteRefCDiff.getRequires().contains(deleteADiff)); } else { - assertSame(Integer.valueOf(2), Integer.valueOf(deleteADiff.getRequires().size())); + assertEquals(2, deleteADiff.getRequires().size()); assertTrue(deleteADiff.getRequires().contains(deleteRefBDiff)); assertTrue(deleteADiff.getRequires().contains(deleteRefCDiff)); - assertSame(Integer.valueOf(1), Integer.valueOf(deleteCDiff.getRequires().size())); + assertEquals(1, deleteCDiff.getRequires().size()); assertTrue(deleteCDiff.getRequires().contains(deleteRefCDiff)); - assertSame(Integer.valueOf(0), Integer.valueOf(deleteRefBDiff.getRequires().size())); + assertEquals(0, deleteRefBDiff.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(deleteRefCDiff.getRequires().size())); + assertEquals(0, deleteRefCDiff.getRequires().size()); } } @@ -1516,7 +1516,7 @@ public class ReqComputingTest { final List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 5 differences - assertSame(Integer.valueOf(4), Integer.valueOf(differences.size())); + assertEquals(4, differences.size()); Predicate<? super Diff> deleteBDiffDescription = null; Predicate<? super Diff> deleteCDiffDescription = null; @@ -1551,25 +1551,25 @@ public class ReqComputingTest { // CHECK REQUIREMENT if (kind.equals(TestKind.ADD)) { - assertSame(Integer.valueOf(0), Integer.valueOf(deleteBDiff.getRequires().size())); + assertEquals(0, deleteBDiff.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(deleteCDiff.getRequires().size())); + assertEquals(0, deleteCDiff.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(deleteRefBDiff.getRequires().size())); + assertEquals(1, deleteRefBDiff.getRequires().size()); assertTrue(deleteRefBDiff.getRequires().contains(deleteBDiff)); - assertSame(Integer.valueOf(1), Integer.valueOf(deleteRefCDiff.getRequires().size())); + assertEquals(1, deleteRefCDiff.getRequires().size()); assertTrue(deleteRefCDiff.getRequires().contains(deleteCDiff)); } else { - assertSame(Integer.valueOf(1), Integer.valueOf(deleteBDiff.getRequires().size())); + assertEquals(1, deleteBDiff.getRequires().size()); assertTrue(deleteBDiff.getRequires().contains(deleteRefBDiff)); - assertSame(Integer.valueOf(1), Integer.valueOf(deleteCDiff.getRequires().size())); + assertEquals(1, deleteCDiff.getRequires().size()); assertTrue(deleteCDiff.getRequires().contains(deleteRefCDiff)); - assertSame(Integer.valueOf(0), Integer.valueOf(deleteRefBDiff.getRequires().size())); + assertEquals(0, deleteRefBDiff.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(deleteRefCDiff.getRequires().size())); + assertEquals(0, deleteRefCDiff.getRequires().size()); } } @@ -1578,7 +1578,7 @@ public class ReqComputingTest { final List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 5 differences - assertSame(Integer.valueOf(3), Integer.valueOf(differences.size())); + assertEquals(3, differences.size()); Predicate<? super Diff> deleteCDiffDescription = null; Predicate<? super Diff> deleteRefBDiffDescription = null; @@ -1608,19 +1608,19 @@ public class ReqComputingTest { // CHECK REQUIREMENT if (kind.equals(TestKind.ADD)) { - assertSame(Integer.valueOf(0), Integer.valueOf(deleteCDiff.getRequires().size())); + assertEquals(0, deleteCDiff.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(deleteRefBDiff.getRequires().size())); + assertEquals(0, deleteRefBDiff.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(deleteRefCDiff.getRequires().size())); + assertEquals(1, deleteRefCDiff.getRequires().size()); assertTrue(deleteRefCDiff.getRequires().contains(deleteCDiff)); } else { - assertSame(Integer.valueOf(1), Integer.valueOf(deleteCDiff.getRequires().size())); + assertEquals(1, deleteCDiff.getRequires().size()); assertTrue(deleteCDiff.getRequires().contains(deleteRefCDiff)); - assertSame(Integer.valueOf(0), Integer.valueOf(deleteRefBDiff.getRequires().size())); + assertEquals(0, deleteRefBDiff.getRequires().size()); - assertSame(Integer.valueOf(0), Integer.valueOf(deleteRefCDiff.getRequires().size())); + assertEquals(0, deleteRefCDiff.getRequires().size()); } } @@ -1629,7 +1629,7 @@ public class ReqComputingTest { final List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 2 differences - assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); + assertEquals(2, differences.size()); Predicate<? super Diff> deleteCDiffDescription = null; Predicate<? super Diff> deleteRefCDiffDescription = null; @@ -1652,15 +1652,15 @@ public class ReqComputingTest { // CHECK REQUIREMENT if (kind.equals(TestKind.ADD)) { - assertSame(Integer.valueOf(0), Integer.valueOf(deleteCDiff.getRequires().size())); + assertEquals(0, deleteCDiff.getRequires().size()); - assertSame(Integer.valueOf(1), Integer.valueOf(deleteRefCDiff.getRequires().size())); + assertEquals(1, deleteRefCDiff.getRequires().size()); assertTrue(deleteRefCDiff.getRequires().contains(deleteCDiff)); } else { - assertSame(Integer.valueOf(1), Integer.valueOf(deleteCDiff.getRequires().size())); + assertEquals(1, deleteCDiff.getRequires().size()); assertTrue(deleteCDiff.getRequires().contains(deleteRefCDiff)); - assertSame(Integer.valueOf(0), Integer.valueOf(deleteRefCDiff.getRequires().size())); + assertEquals(0, deleteRefCDiff.getRequires().size()); } } |