Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/.settings/org.eclipse.jdt.ui.prefs60
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/AbstractTest.java15
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/PapyrusDifferencesOrderTest.java4
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/EdgeMergeTest.java9
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/NodeMergeTest.java46
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/EdgeMergeInputData.java3
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/NodeMergeInputData.java3
-rw-r--r--plugins/org.eclipse.emf.compare.diagram/src-gen/org/eclipse/emf/compare/diagram/internal/extensions/impl/DiagramDiffImpl.java55
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/AbstractModelResolver.java1
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/groups/provider/TestReferenceChangeTreeNodeItemProviderSpec.java13
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/extender/DifferenceGroupExtenderRegistryListener.java1
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/Node.java1
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/NodeFeatureMapContainment.java1
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/NodeFeatureMapNonContainment.java1
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeFeatureMapContainmentImpl.java4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeFeatureMapNonContainmentImpl.java4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeImpl.java5
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeMultiValueReferenceImpl.java3
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeMultiValuedAttributeImpl.java3
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeMultipleContainmentImpl.java4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeOppositeRefManyToManyImpl.java4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeOppositeRefOneToManyImpl.java5
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeOppositeRefOneToOneImpl.java3
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeSingleValueAttributeImpl.java3
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeSingleValueContainmentImpl.java3
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodeSingleValueReferenceImpl.java3
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/impl/NodesFactoryImpl.java18
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesAdapterFactory.java17
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesResourceFactoryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesResourceImpl.java1
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/nodes/util/NodesSwitch.java15
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/ConflictDetectionTest.java299
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/ComparisonUtilTest.java2
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java26
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/equi/EquiComputingTest.java21
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/FragmentationTest.java256
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/ExtLibraryTest.java13
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/IdentifierComparisonTest.java2
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ConflictMergeTest.java65
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ExtensionMergeTest.java5
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps2wayMergeTest.java145
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps3wayMergeTest.java209
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMapsConflictsMergeTest.java113
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMapsPseudoConflictsMergeTest.java129
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java144
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java300
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MultipleMergeTest.java50
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/PseudoConflictMergeTest.java25
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/postprocess/PostProcessorTest.java25
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/ReqComputingTest.java302
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/impl/UML2CompareTestProfileFactoryImpl.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/ACliche2ItemProvider.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/ACliche3ItemProvider.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/AClicheItemProvider.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/UML2CompareTestProfileEditPlugin.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/UML2CompareTestProfileItemProviderAdapterFactory.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/util/UML2CompareTestProfileAdapterFactory.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java53
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation3Test.java53
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociationTest.java45
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/ChangeAssociationTest.java35
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddAbstractionTest.java18
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddDependencyTest.java18
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java10
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddRealizationTest.java18
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java12
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddUsageTest.java18
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeDependencyTest.java17
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeUsageTest.java17
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddActionExecutionSpecificationTest.java67
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddBehaviorExecutionSpecificationTest.java67
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/extend/AddExtendTest.java27
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/generalizationSet/AddGeneralizationSetTest.java23
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsAssociationTest.java11
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsTransitionTest.java11
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/include/AddIncludeTest.java27
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/message/AddMessageTest.java121
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/DynamicProfileTest.java27
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/StaticProfileTest.java27
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java97
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java93
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/timeConstraint/AddTimeConstraintTest.java47
83 files changed, 1715 insertions, 1707 deletions
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 000000000..4e1442ee9
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,60 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_EMF Compare
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=fr;com;java;javax;org;
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/AbstractTest.java b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/AbstractTest.java
index e06ee019e..578016457 100644
--- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/AbstractTest.java
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/AbstractTest.java
@@ -10,9 +10,14 @@
*******************************************************************************/
package org.eclipse.emf.compare.diagram.papyrus.tests;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Iterators;
+
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -20,7 +25,6 @@ import java.util.regex.Pattern;
import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
-import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.ReferenceChange;
import org.eclipse.emf.compare.diagram.internal.CompareDiagramPostProcessor;
@@ -34,7 +38,6 @@ import org.eclipse.emf.compare.tests.postprocess.data.TestPostProcessor;
import org.eclipse.emf.compare.uml2.internal.UMLDiff;
import org.eclipse.emf.compare.uml2.internal.merge.UMLMerger;
import org.eclipse.emf.compare.uml2.internal.postprocessor.UMLPostProcessor;
-import org.eclipse.emf.compare.utils.EMFComparePredicates;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
@@ -44,12 +47,6 @@ import org.eclipse.uml2.uml.NamedElement;
import org.junit.After;
import org.junit.Before;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Iterators;
-
@SuppressWarnings("nls")
public abstract class AbstractTest {
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/PapyrusDifferencesOrderTest.java b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/PapyrusDifferencesOrderTest.java
index de13701d6..d55db2d5b 100644
--- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/PapyrusDifferencesOrderTest.java
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/PapyrusDifferencesOrderTest.java
@@ -12,6 +12,8 @@ package org.eclipse.emf.compare.diagram.papyrus.tests.groups;
import static com.google.common.base.Predicates.alwaysTrue;
+import com.google.common.collect.Lists;
+
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -62,8 +64,6 @@ import org.eclipse.uml2.uml.internal.resource.UMLResourceFactoryImpl;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.collect.Lists;
-
/**
* Tests the order of the differences they would be displayed in the structure merge viewer for MDT Papyrus
* model.
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/EdgeMergeTest.java b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/EdgeMergeTest.java
index 9582f083a..0bd21ee1a 100644
--- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/EdgeMergeTest.java
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/EdgeMergeTest.java
@@ -11,10 +11,13 @@
package org.eclipse.emf.compare.diagram.papyrus.tests.merge;
import static com.google.common.base.Predicates.and;
-import static com.google.common.base.Predicates.not;
import static com.google.common.base.Predicates.instanceOf;
+import static com.google.common.base.Predicates.not;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
+
import java.io.IOException;
import org.eclipse.emf.common.util.BasicMonitor;
@@ -32,12 +35,8 @@ import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.uml2.uml.UMLPackage;
-import org.junit.Ignore;
import org.junit.Test;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-
@SuppressWarnings("nls")
public class EdgeMergeTest extends AbstractTest {
private EdgeMergeInputData input = new EdgeMergeInputData();
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/NodeMergeTest.java b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/NodeMergeTest.java
index 65e5c2c01..6744f2e43 100644
--- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/NodeMergeTest.java
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/NodeMergeTest.java
@@ -12,40 +12,16 @@ package org.eclipse.emf.compare.diagram.papyrus.tests.merge;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.instanceOf;
-import static com.google.common.base.Predicates.equalTo;
-import static com.google.common.base.Predicates.or;
-import static com.google.common.base.Predicates.not;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
-import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToAttribute;
-import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToReference;
-import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedAttribute;
-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.movedInAttribute;
-import static org.eclipse.emf.compare.utils.EMFComparePredicates.movedInReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind;
-import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromAttribute;
-import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.valueNameMatches;
-import static org.eclipse.emf.compare.utils.EMFComparePredicates.fromSide;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import com.google.common.base.Predicate;
-import com.google.common.collect.Collections2;
import com.google.common.collect.Iterables;
-import com.google.common.collect.Iterators;
import java.io.IOException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
import org.eclipse.emf.common.util.BasicMonitor;
import org.eclipse.emf.compare.AttributeChange;
@@ -54,35 +30,17 @@ import org.eclipse.emf.compare.ConflictKind;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.DifferenceSource;
-import org.eclipse.emf.compare.EMFCompare;
-import org.eclipse.emf.compare.Match;
import org.eclipse.emf.compare.ReferenceChange;
import org.eclipse.emf.compare.diagram.internal.extensions.CoordinatesChange;
-import org.eclipse.emf.compare.diagram.internal.extensions.DiagramDiff;
import org.eclipse.emf.compare.diagram.internal.extensions.EdgeChange;
import org.eclipse.emf.compare.diagram.internal.extensions.NodeChange;
-import org.eclipse.emf.compare.diagram.internal.merge.CompareDiagramMerger;
import org.eclipse.emf.compare.diagram.papyrus.tests.AbstractTest;
import org.eclipse.emf.compare.diagram.papyrus.tests.DiagramInputData;
-import org.eclipse.emf.compare.diagram.papyrus.tests.merge.data.EdgeMergeInputData;
import org.eclipse.emf.compare.diagram.papyrus.tests.merge.data.NodeMergeInputData;
-import org.eclipse.emf.compare.merge.IMerger;
-import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.uml2.internal.AssociationChange;
-import org.eclipse.emf.compare.uml2.internal.UMLDiff;
-import org.eclipse.emf.compare.uml2.internal.merge.UMLMerger;
-import org.eclipse.emf.compare.utils.MatchUtil;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
import org.eclipse.uml2.uml.UMLPackage;
-import org.junit.Ignore;
import org.junit.Test;
@SuppressWarnings("nls")
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/EdgeMergeInputData.java b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/EdgeMergeInputData.java
index c0a2aac27..ecc028b26 100644
--- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/EdgeMergeInputData.java
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/EdgeMergeInputData.java
@@ -18,14 +18,11 @@ import java.util.Collections;
import org.eclipse.emf.common.EMFPlugin;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.compare.diagram.papyrus.tests.DiagramInputData;
-import org.eclipse.emf.compare.tests.framework.AbstractInputData;
import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
import org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.uml2.uml.UMLPackage;
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/NodeMergeInputData.java b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/NodeMergeInputData.java
index 48c1cd8f3..7d4992644 100644
--- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/NodeMergeInputData.java
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/NodeMergeInputData.java
@@ -18,14 +18,11 @@ import java.util.Collections;
import org.eclipse.emf.common.EMFPlugin;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.compare.diagram.papyrus.tests.DiagramInputData;
-import org.eclipse.emf.compare.tests.framework.AbstractInputData;
import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
import org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.uml2.uml.UMLPackage;
diff --git a/plugins/org.eclipse.emf.compare.diagram/src-gen/org/eclipse/emf/compare/diagram/internal/extensions/impl/DiagramDiffImpl.java b/plugins/org.eclipse.emf.compare.diagram/src-gen/org/eclipse/emf/compare/diagram/internal/extensions/impl/DiagramDiffImpl.java
index 8c30ef974..4172cdd13 100644
--- a/plugins/org.eclipse.emf.compare.diagram/src-gen/org/eclipse/emf/compare/diagram/internal/extensions/impl/DiagramDiffImpl.java
+++ b/plugins/org.eclipse.emf.compare.diagram/src-gen/org/eclipse/emf/compare/diagram/internal/extensions/impl/DiagramDiffImpl.java
@@ -11,9 +11,7 @@
package org.eclipse.emf.compare.diagram.internal.extensions.impl;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.compare.AttributeChange;
import org.eclipse.emf.compare.Diff;
-import org.eclipse.emf.compare.ReferenceChange;
import org.eclipse.emf.compare.diagram.internal.extensions.DiagramDiff;
import org.eclipse.emf.compare.diagram.internal.extensions.ExtensionsPackage;
import org.eclipse.emf.compare.impl.DiffImpl;
@@ -28,8 +26,9 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.compare.diagram.internal.extensions.impl.DiagramDiffImpl#getSemanticDiff <em>Semantic Diff</em>}</li>
- * <li>{@link org.eclipse.emf.compare.diagram.internal.extensions.impl.DiagramDiffImpl#getView <em>View</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.diagram.internal.extensions.impl.DiagramDiffImpl#getSemanticDiff <em>
+ * Semantic Diff</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.diagram.internal.extensions.impl.DiagramDiffImpl#getView <em>View</em>}</li>
* </ul>
* </p>
*
@@ -47,9 +46,9 @@ public abstract class DiagramDiffImpl extends DiffImpl implements DiagramDiff {
protected Diff semanticDiff;
/**
- * The cached value of the '{@link #getView() <em>View</em>}' reference.
- * <!-- begin-user-doc --> <!--
+ * The cached value of the '{@link #getView() <em>View</em>}' reference. <!-- begin-user-doc --> <!--
* end-user-doc -->
+ *
* @see #getView()
* @generated
* @ordered
@@ -58,6 +57,7 @@ public abstract class DiagramDiffImpl extends DiffImpl implements DiagramDiff {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected DiagramDiffImpl() {
@@ -66,6 +66,7 @@ public abstract class DiagramDiffImpl extends DiffImpl implements DiagramDiff {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -75,6 +76,7 @@ public abstract class DiagramDiffImpl extends DiffImpl implements DiagramDiff {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Diff getSemanticDiff() {
@@ -82,8 +84,10 @@ public abstract class DiagramDiffImpl extends DiffImpl implements DiagramDiff {
InternalEObject oldSemanticDiff = (InternalEObject)semanticDiff;
semanticDiff = (Diff)eResolveProxy(oldSemanticDiff);
if (semanticDiff != oldSemanticDiff) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExtensionsPackage.DIAGRAM_DIFF__SEMANTIC_DIFF, oldSemanticDiff, semanticDiff));
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ ExtensionsPackage.DIAGRAM_DIFF__SEMANTIC_DIFF, oldSemanticDiff, semanticDiff));
+ }
}
}
return semanticDiff;
@@ -91,6 +95,7 @@ public abstract class DiagramDiffImpl extends DiffImpl implements DiagramDiff {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Diff basicGetSemanticDiff() {
@@ -99,17 +104,21 @@ public abstract class DiagramDiffImpl extends DiffImpl implements DiagramDiff {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setSemanticDiff(Diff newSemanticDiff) {
Diff oldSemanticDiff = semanticDiff;
semanticDiff = newSemanticDiff;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ExtensionsPackage.DIAGRAM_DIFF__SEMANTIC_DIFF, oldSemanticDiff, semanticDiff));
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ ExtensionsPackage.DIAGRAM_DIFF__SEMANTIC_DIFF, oldSemanticDiff, semanticDiff));
+ }
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EObject getView() {
@@ -117,8 +126,10 @@ public abstract class DiagramDiffImpl extends DiffImpl implements DiagramDiff {
InternalEObject oldView = (InternalEObject)view;
view = eResolveProxy(oldView);
if (view != oldView) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExtensionsPackage.DIAGRAM_DIFF__VIEW, oldView, view));
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ ExtensionsPackage.DIAGRAM_DIFF__VIEW, oldView, view));
+ }
}
}
return view;
@@ -126,6 +137,7 @@ public abstract class DiagramDiffImpl extends DiffImpl implements DiagramDiff {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EObject basicGetView() {
@@ -134,27 +146,35 @@ public abstract class DiagramDiffImpl extends DiffImpl implements DiagramDiff {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setView(EObject newView) {
EObject oldView = view;
view = newView;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, ExtensionsPackage.DIAGRAM_DIFF__VIEW, oldView, view));
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, ExtensionsPackage.DIAGRAM_DIFF__VIEW,
+ oldView, view));
+ }
}
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case ExtensionsPackage.DIAGRAM_DIFF__SEMANTIC_DIFF:
- if (resolve) return getSemanticDiff();
+ if (resolve) {
+ return getSemanticDiff();
+ }
return basicGetSemanticDiff();
case ExtensionsPackage.DIAGRAM_DIFF__VIEW:
- if (resolve) return getView();
+ if (resolve) {
+ return getView();
+ }
return basicGetView();
}
return super.eGet(featureID, resolve, coreType);
@@ -162,6 +182,7 @@ public abstract class DiagramDiffImpl extends DiffImpl implements DiagramDiff {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -179,6 +200,7 @@ public abstract class DiagramDiffImpl extends DiffImpl implements DiagramDiff {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -196,6 +218,7 @@ public abstract class DiagramDiffImpl extends DiffImpl implements DiagramDiff {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/AbstractModelResolver.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/AbstractModelResolver.java
index 29ecea6ee..072ae0ae0 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/AbstractModelResolver.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/AbstractModelResolver.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.emf.compare.ide.ui.logical;
-import com.google.common.annotations.Beta;
/**
* This can be subclassed instead of {@link IModelResolver} to avoid reimplementing common extension-related
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/groups/provider/TestReferenceChangeTreeNodeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/groups/provider/TestReferenceChangeTreeNodeItemProviderSpec.java
index eea0c265e..4d812542c 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/groups/provider/TestReferenceChangeTreeNodeItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/groups/provider/TestReferenceChangeTreeNodeItemProviderSpec.java
@@ -10,12 +10,6 @@
*******************************************************************************/
package org.eclipse.emf.compare.rcp.ui.tests.structuremergeviewer.groups.provider;
-import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Iterables.get;
-import static com.google.common.collect.Iterables.transform;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import java.io.IOException;
import java.util.Collection;
import java.util.Iterator;
@@ -36,7 +30,12 @@ import org.eclipse.emf.edit.tree.TreeNode;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.base.Predicate;
+import static com.google.common.collect.Iterables.filter;
+import static com.google.common.collect.Iterables.get;
+import static com.google.common.collect.Iterables.transform;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/extender/DifferenceGroupExtenderRegistryListener.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/extender/DifferenceGroupExtenderRegistryListener.java
index 45c04f58b..03cf69819 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/extender/DifferenceGroupExtenderRegistryListener.java
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/extender/DifferenceGroupExtenderRegistryListener.java
@@ -16,7 +16,6 @@ import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.emf.compare.rcp.extension.AbstractRegistryEventListener;
import org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.extender.IDifferenceGroupExtender;
-import org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.extender.IDifferenceGroupExtender.Registry;
/**
* Utility class to listen to the
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());
}
}
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/impl/UML2CompareTestProfileFactoryImpl.java b/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/impl/UML2CompareTestProfileFactoryImpl.java
index e8963f206..1138ca9e5 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/impl/UML2CompareTestProfileFactoryImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/impl/UML2CompareTestProfileFactoryImpl.java
@@ -10,8 +10,9 @@
*******************************************************************************/
package org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.impl;
-import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.*;
import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.ACliche;
+import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.ACliche2;
+import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.ACliche3;
import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.UML2CompareTestProfileFactory;
import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.UML2CompareTestProfilePackage;
import org.eclipse.emf.ecore.EClass;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/ACliche2ItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/ACliche2ItemProvider.java
index 2aa61ddfe..92c972147 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/ACliche2ItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/ACliche2ItemProvider.java
@@ -15,12 +15,9 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.ACliche2;
import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.UML2CompareTestProfilePackage;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/ACliche3ItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/ACliche3ItemProvider.java
index 8319cf3cc..b10a1230f 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/ACliche3ItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/ACliche3ItemProvider.java
@@ -15,11 +15,8 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.UML2CompareTestProfilePackage;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/AClicheItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/AClicheItemProvider.java
index 2732d6ec3..9dc580f01 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/AClicheItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/AClicheItemProvider.java
@@ -15,12 +15,9 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.ACliche;
import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.UML2CompareTestProfilePackage;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/UML2CompareTestProfileEditPlugin.java b/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/UML2CompareTestProfileEditPlugin.java
index edb6fa21e..a8edef3d7 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/UML2CompareTestProfileEditPlugin.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/UML2CompareTestProfileEditPlugin.java
@@ -11,11 +11,8 @@
package org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.provider;
import org.eclipse.emf.common.EMFPlugin;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/UML2CompareTestProfileItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/UML2CompareTestProfileItemProviderAdapterFactory.java
index dcba48186..98249deaf 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/UML2CompareTestProfileItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/UML2CompareTestProfileItemProviderAdapterFactory.java
@@ -16,9 +16,7 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.util.UML2CompareTestProfileAdapterFactory;
-
import org.eclipse.emf.edit.provider.ChangeNotifier;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/util/UML2CompareTestProfileAdapterFactory.java b/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/util/UML2CompareTestProfileAdapterFactory.java
index 5db335f2f..b8c67a4e5 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/util/UML2CompareTestProfileAdapterFactory.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/util/UML2CompareTestProfileAdapterFactory.java
@@ -13,8 +13,9 @@ package org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.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.uml2.profile.test.uml2comparetestprofile.*;
import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.ACliche;
+import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.ACliche2;
+import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.ACliche3;
import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.UML2CompareTestProfilePackage;
import org.eclipse.emf.ecore.EObject;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java
index d6e3a5919..594d8397f 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java
@@ -2,9 +2,6 @@ package org.eclipse.emf.compare.uml2.tests.association;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.instanceOf;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedReference;
@@ -13,6 +10,10 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.onEObject;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.onFeature;
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;
import com.google.common.collect.Iterators;
@@ -24,8 +25,8 @@ import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.uml2.internal.AssociationChange;
-import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
+import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.association.data.AssociationInputData;
import org.eclipse.emf.ecore.resource.Resource;
import org.junit.Test;
@@ -137,7 +138,7 @@ public class AddAssociation2Test extends AbstractUMLTest {
private void testAB1(TestKind kind, final Comparison comparison) {
final List<Diff> differences = comparison.getDifferences();
- assertSame(Integer.valueOf(14), Integer.valueOf(differences.size()));
+ assertEquals(14, differences.size());
Predicate<? super Diff> addAssociationDescription = null;
Predicate<? super Diff> addPropertyClass1Description = null;
@@ -248,7 +249,7 @@ public class AddAssociation2Test extends AbstractUMLTest {
instanceOf(AssociationChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLAssociation);
- assertSame(Integer.valueOf(13), Integer.valueOf(addUMLAssociation.getRefinedBy().size()));
+ assertEquals(13, addUMLAssociation.getRefinedBy().size());
assertTrue(addUMLAssociation.getRefinedBy().contains(addAssociation));
assertTrue(addUMLAssociation.getRefinedBy().contains(addPropertyClass1));
@@ -266,10 +267,10 @@ public class AddAssociation2Test extends AbstractUMLTest {
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(1), Integer.valueOf(addPropertyClass1.getRequires().size()));
+ assertEquals(1, addPropertyClass1.getRequires().size());
assertTrue(addPropertyClass1.getRequires().contains(addAssociation));
- assertSame(Integer.valueOf(0), Integer.valueOf(addPropertyClass0.getRequires().size()));
+ assertEquals(0, addPropertyClass0.getRequires().size());
assertSame(Integer.valueOf(2), Integer.valueOf(addPropertyClass0InAssociation.getRequires()
.size()));
@@ -281,7 +282,7 @@ public class AddAssociation2Test extends AbstractUMLTest {
assertTrue(addRefAssociationInPropertyClass1.getRequires().contains(addPropertyClass1));
assertTrue(addRefAssociationInPropertyClass1.getRequires().contains(addAssociation));
- assertSame(Integer.valueOf(1), Integer.valueOf(addRefTypeInPropertyClass1.getRequires().size()));
+ assertEquals(1, addRefTypeInPropertyClass1.getRequires().size());
assertTrue(addRefTypeInPropertyClass1.getRequires().contains(addPropertyClass1));
assertSame(Integer.valueOf(2), Integer.valueOf(addRefAssociationInPropertyClass0.getRequires()
@@ -289,32 +290,32 @@ public class AddAssociation2Test extends AbstractUMLTest {
assertTrue(addRefAssociationInPropertyClass0.getRequires().contains(addPropertyClass0));
assertTrue(addRefAssociationInPropertyClass0.getRequires().contains(addAssociation));
- assertSame(Integer.valueOf(1), Integer.valueOf(addRefTypeInPropertyClass0.getRequires().size()));
+ assertEquals(1, addRefTypeInPropertyClass0.getRequires().size());
assertTrue(addRefTypeInPropertyClass0.getRequires().contains(addPropertyClass0));
- assertSame(Integer.valueOf(0), Integer.valueOf(addAssociation.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLAssociation.getRequires().size()));
+ assertEquals(0, addAssociation.getRequires().size());
+ assertEquals(0, addUMLAssociation.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addLiteralIntegerInClass1.getRequires().size()));
+ assertEquals(1, addLiteralIntegerInClass1.getRequires().size());
assertTrue(addLiteralIntegerInClass1.getRequires().contains(addPropertyClass1));
- assertSame(Integer.valueOf(1), Integer.valueOf(addUnlimitedNaturalInClass1.getRequires().size()));
+ assertEquals(1, addUnlimitedNaturalInClass1.getRequires().size());
assertTrue(addUnlimitedNaturalInClass1.getRequires().contains(addPropertyClass1));
- assertSame(Integer.valueOf(1), Integer.valueOf(addLiteralIntegerInClass0.getRequires().size()));
+ assertEquals(1, addLiteralIntegerInClass0.getRequires().size());
assertTrue(addLiteralIntegerInClass0.getRequires().contains(addPropertyClass0));
- assertSame(Integer.valueOf(1), Integer.valueOf(addUnlimitedNaturalInClass0.getRequires().size()));
+ assertEquals(1, addUnlimitedNaturalInClass0.getRequires().size());
assertTrue(addUnlimitedNaturalInClass0.getRequires().contains(addPropertyClass0));
} else {
- assertSame(Integer.valueOf(5), Integer.valueOf(addPropertyClass1.getRequires().size()));
+ assertEquals(5, addPropertyClass1.getRequires().size());
assertTrue(addPropertyClass1.getRequires().contains(addLiteralIntegerInClass1));
assertTrue(addPropertyClass1.getRequires().contains(addUnlimitedNaturalInClass1));
assertTrue(addPropertyClass1.getRequires().contains(addRefAssociationInPropertyClass1));
assertTrue(addPropertyClass1.getRequires().contains(addRefTypeInPropertyClass1));
assertTrue(addPropertyClass1.getRequires().contains(addPropertyClass1InAssociation));
- assertSame(Integer.valueOf(5), Integer.valueOf(addPropertyClass0.getRequires().size()));
+ assertEquals(5, addPropertyClass0.getRequires().size());
assertTrue(addPropertyClass0.getRequires().contains(addLiteralIntegerInClass0));
assertTrue(addPropertyClass0.getRequires().contains(addUnlimitedNaturalInClass0));
assertTrue(addPropertyClass0.getRequires().contains(addRefAssociationInPropertyClass0));
@@ -323,24 +324,24 @@ public class AddAssociation2Test extends AbstractUMLTest {
assertSame(Integer.valueOf(0), Integer.valueOf(addRefAssociationInPropertyClass1.getRequires()
.size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addRefTypeInPropertyClass1.getRequires().size()));
+ assertEquals(0, addRefTypeInPropertyClass1.getRequires().size());
assertSame(Integer.valueOf(0), Integer.valueOf(addRefAssociationInPropertyClass0.getRequires()
.size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addRefTypeInPropertyClass0.getRequires().size()));
+ assertEquals(0, addRefTypeInPropertyClass0.getRequires().size());
- assertSame(Integer.valueOf(5), Integer.valueOf(addAssociation.getRequires().size()));
+ assertEquals(5, addAssociation.getRequires().size());
assertTrue(addAssociation.getRequires().contains(addPropertyClass1));
assertTrue(addAssociation.getRequires().contains(addRefAssociationInPropertyClass1));
assertTrue(addAssociation.getRequires().contains(addRefAssociationInPropertyClass0));
assertTrue(addAssociation.getRequires().contains(addPropertyClass0InAssociation));
assertTrue(addAssociation.getRequires().contains(addPropertyClass1InAssociation));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLAssociation.getRequires().size()));
+ assertEquals(0, addUMLAssociation.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addLiteralIntegerInClass1.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUnlimitedNaturalInClass1.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addLiteralIntegerInClass0.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUnlimitedNaturalInClass0.getRequires().size()));
+ assertEquals(0, addLiteralIntegerInClass1.getRequires().size());
+ assertEquals(0, addUnlimitedNaturalInClass1.getRequires().size());
+ assertEquals(0, addLiteralIntegerInClass0.getRequires().size());
+ assertEquals(0, addUnlimitedNaturalInClass0.getRequires().size());
}
assertNotNull(addPropertyClass0InAssociation.getEquivalence());
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation3Test.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation3Test.java
index abf19ece8..48b64e7f6 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation3Test.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation3Test.java
@@ -2,9 +2,6 @@ package org.eclipse.emf.compare.uml2.tests.association;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.instanceOf;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedReference;
@@ -13,6 +10,10 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.onEObject;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.onFeature;
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;
import com.google.common.collect.Iterators;
@@ -24,8 +25,8 @@ import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.uml2.internal.AssociationChange;
-import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
+import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.association.data.AssociationInputData;
import org.eclipse.emf.ecore.resource.Resource;
import org.junit.Test;
@@ -138,7 +139,7 @@ public class AddAssociation3Test extends AbstractUMLTest {
private void testAB1(TestKind kind, final Comparison comparison) {
final List<Diff> differences = comparison.getDifferences();
- assertSame(Integer.valueOf(14), Integer.valueOf(differences.size()));
+ assertEquals(14, differences.size());
Predicate<? super Diff> addAssociationDescription = null;
Predicate<? super Diff> addPropertyClass1Description = null;
@@ -250,7 +251,7 @@ public class AddAssociation3Test extends AbstractUMLTest {
instanceOf(AssociationChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLAssociation);
- assertSame(Integer.valueOf(13), Integer.valueOf(addUMLAssociation.getRefinedBy().size()));
+ assertEquals(13, addUMLAssociation.getRefinedBy().size());
assertTrue(addUMLAssociation.getRefinedBy().contains(addRefTypeInPropertyClass1));
assertTrue(addUMLAssociation.getRefinedBy().contains(addLiteralIntegerInClass1));
assertTrue(addUMLAssociation.getRefinedBy().contains(addUnlimitedNaturalInClass1));
@@ -267,10 +268,10 @@ public class AddAssociation3Test extends AbstractUMLTest {
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(1), Integer.valueOf(addPropertyClass0.getRequires().size()));
+ assertEquals(1, addPropertyClass0.getRequires().size());
assertTrue(addPropertyClass0.getRequires().contains(addAssociation));
- assertSame(Integer.valueOf(0), Integer.valueOf(addPropertyClass1.getRequires().size()));
+ assertEquals(0, addPropertyClass1.getRequires().size());
assertSame(Integer.valueOf(2), Integer.valueOf(addPropertyClass1InAssociation.getRequires()
.size()));
@@ -282,7 +283,7 @@ public class AddAssociation3Test extends AbstractUMLTest {
assertTrue(addRefAssociationInPropertyClass1.getRequires().contains(addPropertyClass1));
assertTrue(addRefAssociationInPropertyClass1.getRequires().contains(addAssociation));
- assertSame(Integer.valueOf(1), Integer.valueOf(addRefTypeInPropertyClass1.getRequires().size()));
+ assertEquals(1, addRefTypeInPropertyClass1.getRequires().size());
assertTrue(addRefTypeInPropertyClass1.getRequires().contains(addPropertyClass1));
assertSame(Integer.valueOf(2), Integer.valueOf(addRefAssociationInPropertyClass0.getRequires()
@@ -290,32 +291,32 @@ public class AddAssociation3Test extends AbstractUMLTest {
assertTrue(addRefAssociationInPropertyClass0.getRequires().contains(addPropertyClass0));
assertTrue(addRefAssociationInPropertyClass0.getRequires().contains(addAssociation));
- assertSame(Integer.valueOf(1), Integer.valueOf(addRefTypeInPropertyClass0.getRequires().size()));
+ assertEquals(1, addRefTypeInPropertyClass0.getRequires().size());
assertTrue(addRefTypeInPropertyClass0.getRequires().contains(addPropertyClass0));
- assertSame(Integer.valueOf(0), Integer.valueOf(addAssociation.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLAssociation.getRequires().size()));
+ assertEquals(0, addAssociation.getRequires().size());
+ assertEquals(0, addUMLAssociation.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addLiteralIntegerInClass1.getRequires().size()));
+ assertEquals(1, addLiteralIntegerInClass1.getRequires().size());
assertTrue(addLiteralIntegerInClass1.getRequires().contains(addPropertyClass1));
- assertSame(Integer.valueOf(1), Integer.valueOf(addUnlimitedNaturalInClass1.getRequires().size()));
+ assertEquals(1, addUnlimitedNaturalInClass1.getRequires().size());
assertTrue(addUnlimitedNaturalInClass1.getRequires().contains(addPropertyClass1));
- assertSame(Integer.valueOf(1), Integer.valueOf(addLiteralIntegerInClass0.getRequires().size()));
+ assertEquals(1, addLiteralIntegerInClass0.getRequires().size());
assertTrue(addLiteralIntegerInClass0.getRequires().contains(addPropertyClass0));
- assertSame(Integer.valueOf(1), Integer.valueOf(addUnlimitedNaturalInClass0.getRequires().size()));
+ assertEquals(1, addUnlimitedNaturalInClass0.getRequires().size());
assertTrue(addUnlimitedNaturalInClass0.getRequires().contains(addPropertyClass0));
} else {
- assertSame(Integer.valueOf(5), Integer.valueOf(addPropertyClass1.getRequires().size()));
+ assertEquals(5, addPropertyClass1.getRequires().size());
assertTrue(addPropertyClass1.getRequires().contains(addLiteralIntegerInClass1));
assertTrue(addPropertyClass1.getRequires().contains(addUnlimitedNaturalInClass1));
assertTrue(addPropertyClass1.getRequires().contains(addRefAssociationInPropertyClass1));
assertTrue(addPropertyClass1.getRequires().contains(addRefTypeInPropertyClass1));
assertTrue(addPropertyClass1.getRequires().contains(addPropertyClass1InAssociation));
- assertSame(Integer.valueOf(5), Integer.valueOf(addPropertyClass0.getRequires().size()));
+ assertEquals(5, addPropertyClass0.getRequires().size());
assertTrue(addPropertyClass0.getRequires().contains(addLiteralIntegerInClass0));
assertTrue(addPropertyClass0.getRequires().contains(addUnlimitedNaturalInClass0));
assertTrue(addPropertyClass0.getRequires().contains(addRefAssociationInPropertyClass0));
@@ -324,24 +325,24 @@ public class AddAssociation3Test extends AbstractUMLTest {
assertSame(Integer.valueOf(0), Integer.valueOf(addRefAssociationInPropertyClass1.getRequires()
.size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addRefTypeInPropertyClass1.getRequires().size()));
+ assertEquals(0, addRefTypeInPropertyClass1.getRequires().size());
assertSame(Integer.valueOf(0), Integer.valueOf(addRefAssociationInPropertyClass0.getRequires()
.size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addRefTypeInPropertyClass0.getRequires().size()));
+ assertEquals(0, addRefTypeInPropertyClass0.getRequires().size());
- assertSame(Integer.valueOf(5), Integer.valueOf(addAssociation.getRequires().size()));
+ assertEquals(5, addAssociation.getRequires().size());
assertTrue(addAssociation.getRequires().contains(addPropertyClass0));
assertTrue(addAssociation.getRequires().contains(addRefAssociationInPropertyClass1));
assertTrue(addAssociation.getRequires().contains(addRefAssociationInPropertyClass0));
assertTrue(addAssociation.getRequires().contains(addPropertyClass1InAssociation));
assertTrue(addAssociation.getRequires().contains(addPropertyClass0InAssociation));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLAssociation.getRequires().size()));
+ assertEquals(0, addUMLAssociation.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addLiteralIntegerInClass1.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUnlimitedNaturalInClass1.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addLiteralIntegerInClass0.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUnlimitedNaturalInClass0.getRequires().size()));
+ assertEquals(0, addLiteralIntegerInClass1.getRequires().size());
+ assertEquals(0, addUnlimitedNaturalInClass1.getRequires().size());
+ assertEquals(0, addLiteralIntegerInClass0.getRequires().size());
+ assertEquals(0, addUnlimitedNaturalInClass0.getRequires().size());
}
assertNotNull(addPropertyClass1InAssociation.getEquivalence());
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociationTest.java
index beb4b04e5..76ebb4fd2 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociationTest.java
@@ -2,9 +2,6 @@ package org.eclipse.emf.compare.uml2.tests.association;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.instanceOf;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedReference;
@@ -13,6 +10,10 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.onEObject;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.onFeature;
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;
import com.google.common.collect.Iterators;
@@ -24,8 +25,8 @@ import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.uml2.internal.AssociationChange;
-import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
+import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.association.data.AssociationInputData;
import org.eclipse.emf.ecore.resource.Resource;
import org.junit.Test;
@@ -139,7 +140,7 @@ public class AddAssociationTest extends AbstractUMLTest {
final 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> addAssociationDescription = null;
Predicate<? super Diff> addNavigableOwnedEndClass1InAssociationDescription = null;
@@ -268,7 +269,7 @@ public class AddAssociationTest extends AbstractUMLTest {
instanceOf(AssociationChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLAssociation);
- assertSame(Integer.valueOf(15), Integer.valueOf(addUMLAssociation.getRefinedBy().size()));
+ assertEquals(15, addUMLAssociation.getRefinedBy().size());
assertTrue(addUMLAssociation.getRefinedBy().contains(addAssociation));
assertTrue(addUMLAssociation.getRefinedBy().contains(addNavigableOwnedEndClass1InAssociation));
assertTrue(addUMLAssociation.getRefinedBy().contains(addNavigableOwnedEndClass2InAssociation));
@@ -293,7 +294,7 @@ public class AddAssociationTest extends AbstractUMLTest {
addOwnedEndClass1InAssociation));
assertTrue(addRefAssociationInPropertyClass1.getRequires().contains(addAssociation));
- assertSame(Integer.valueOf(1), Integer.valueOf(addRefTypeInPropertyClass1.getRequires().size()));
+ assertEquals(1, addRefTypeInPropertyClass1.getRequires().size());
assertTrue(addRefTypeInPropertyClass1.getRequires().contains(addOwnedEndClass1InAssociation));
assertSame(Integer.valueOf(2), Integer.valueOf(addRefAssociationInPropertyClass2.getRequires()
@@ -302,11 +303,11 @@ public class AddAssociationTest extends AbstractUMLTest {
addOwnedEndClass2InAssociation));
assertTrue(addRefAssociationInPropertyClass2.getRequires().contains(addAssociation));
- assertSame(Integer.valueOf(1), Integer.valueOf(addRefTypeInPropertyClass2.getRequires().size()));
+ assertEquals(1, addRefTypeInPropertyClass2.getRequires().size());
assertTrue(addRefTypeInPropertyClass2.getRequires().contains(addOwnedEndClass2InAssociation));
- assertSame(Integer.valueOf(0), Integer.valueOf(addAssociation.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLAssociation.getRequires().size()));
+ assertEquals(0, addAssociation.getRequires().size());
+ assertEquals(0, addUMLAssociation.getRequires().size());
assertSame(Integer.valueOf(2), Integer.valueOf(addNavigableOwnedEndClass1InAssociation
.getRequires().size()));
@@ -320,16 +321,16 @@ public class AddAssociationTest extends AbstractUMLTest {
assertTrue(addNavigableOwnedEndClass2InAssociation.getRequires().contains(
addOwnedEndClass2InAssociation));
- assertSame(Integer.valueOf(1), Integer.valueOf(addLiteralIntegerInClass1.getRequires().size()));
+ assertEquals(1, addLiteralIntegerInClass1.getRequires().size());
assertTrue(addLiteralIntegerInClass1.getRequires().contains(addOwnedEndClass1InAssociation));
- assertSame(Integer.valueOf(1), Integer.valueOf(addUnlimitedNaturalInClass1.getRequires().size()));
+ assertEquals(1, addUnlimitedNaturalInClass1.getRequires().size());
assertTrue(addUnlimitedNaturalInClass1.getRequires().contains(addOwnedEndClass1InAssociation));
- assertSame(Integer.valueOf(1), Integer.valueOf(addLiteralIntegerInClass2.getRequires().size()));
+ assertEquals(1, addLiteralIntegerInClass2.getRequires().size());
assertTrue(addLiteralIntegerInClass2.getRequires().contains(addOwnedEndClass2InAssociation));
- assertSame(Integer.valueOf(1), Integer.valueOf(addUnlimitedNaturalInClass2.getRequires().size()));
+ assertEquals(1, addUnlimitedNaturalInClass2.getRequires().size());
assertTrue(addUnlimitedNaturalInClass2.getRequires().contains(addOwnedEndClass2InAssociation));
} else {
assertSame(Integer.valueOf(0), Integer.valueOf(addNavigableOwnedEndClass1InAssociation
@@ -340,12 +341,12 @@ public class AddAssociationTest extends AbstractUMLTest {
assertSame(Integer.valueOf(0), Integer.valueOf(addRefAssociationInPropertyClass1.getRequires()
.size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addRefTypeInPropertyClass1.getRequires().size()));
+ assertEquals(0, addRefTypeInPropertyClass1.getRequires().size());
assertSame(Integer.valueOf(0), Integer.valueOf(addRefAssociationInPropertyClass2.getRequires()
.size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addRefTypeInPropertyClass2.getRequires().size()));
+ assertEquals(0, addRefTypeInPropertyClass2.getRequires().size());
- assertSame(Integer.valueOf(8), Integer.valueOf(addAssociation.getRequires().size()));
+ assertEquals(8, addAssociation.getRequires().size());
assertTrue(addAssociation.getRequires().contains(addNavigableOwnedEndClass1InAssociation));
assertTrue(addAssociation.getRequires().contains(addNavigableOwnedEndClass2InAssociation));
assertTrue(addAssociation.getRequires().contains(addRefAssociationInPropertyClass1));
@@ -355,12 +356,12 @@ public class AddAssociationTest extends AbstractUMLTest {
assertTrue(addAssociation.getRequires().contains(addMemberEndClass1InAssociation));
assertTrue(addAssociation.getRequires().contains(addMemberEndClass2InAssociation));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLAssociation.getRequires().size()));
+ assertEquals(0, addUMLAssociation.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addLiteralIntegerInClass1.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUnlimitedNaturalInClass1.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addLiteralIntegerInClass2.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUnlimitedNaturalInClass2.getRequires().size()));
+ assertEquals(0, addLiteralIntegerInClass1.getRequires().size());
+ assertEquals(0, addUnlimitedNaturalInClass1.getRequires().size());
+ assertEquals(0, addLiteralIntegerInClass2.getRequires().size());
+ assertEquals(0, addUnlimitedNaturalInClass2.getRequires().size());
testIntersections(comparison);
}
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/ChangeAssociationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/ChangeAssociationTest.java
index fbf2eb751..61487e7b6 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/ChangeAssociationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/ChangeAssociationTest.java
@@ -2,16 +2,17 @@ package org.eclipse.emf.compare.uml2.tests.association;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.instanceOf;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
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.ofKind;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.onEObject;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.onFeature;
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.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
@@ -23,8 +24,8 @@ import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.uml2.internal.AssociationChange;
-import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
+import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.association.data.AssociationInputData;
import org.eclipse.emf.ecore.resource.Resource;
import org.junit.Test;
@@ -138,7 +139,7 @@ public class ChangeAssociationTest extends AbstractUMLTest {
final List<Diff> differences = comparison.getDifferences();
// We should have no less and no more than 5 differences
- assertSame(Integer.valueOf(6), Integer.valueOf(differences.size()));
+ assertEquals(6, differences.size());
Predicate<? super Diff> addPropertyClass2Description = null;
Predicate<? super Diff> addRefAssociationInPropertyClass2Description = null;
@@ -197,7 +198,7 @@ public class ChangeAssociationTest extends AbstractUMLTest {
instanceOf(AssociationChange.class), ofKind(DifferenceKind.CHANGE)), null);
assertNull(changeUMLAssociation);
// assertNotNull(changeUMLAssociation);
- // assertSame(Integer.valueOf(5), Integer.valueOf(changeUMLAssociation.getRefinedBy().size()));
+ // assertEquals(5, changeUMLAssociation.getRefinedBy().size());
// assertTrue(changeUMLAssociation.getRefinedBy().contains(addRefTypeInPropertyClass2));
// assertTrue(changeUMLAssociation.getRefinedBy().contains(addLiteralIntegerInClass2));
// assertTrue(changeUMLAssociation.getRefinedBy().contains(addUnlimitedNaturalInClass2));
@@ -206,24 +207,24 @@ public class ChangeAssociationTest extends AbstractUMLTest {
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(0), Integer.valueOf(addPropertyClass2.getRequires().size()));
+ assertEquals(0, addPropertyClass2.getRequires().size());
assertSame(Integer.valueOf(1), Integer.valueOf(addRefAssociationInPropertyClass2.getRequires()
.size()));
assertTrue(addRefAssociationInPropertyClass2.getRequires().contains(addPropertyClass2));
- assertSame(Integer.valueOf(1), Integer.valueOf(addRefTypeInPropertyClass2.getRequires().size()));
+ assertEquals(1, addRefTypeInPropertyClass2.getRequires().size());
assertTrue(addRefTypeInPropertyClass2.getRequires().contains(addPropertyClass2));
- // assertSame(Integer.valueOf(0), Integer.valueOf(changeUMLAssociation.getRequires().size()));
+ // assertEquals(0, changeUMLAssociation.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addLiteralIntegerInClass2.getRequires().size()));
+ assertEquals(1, addLiteralIntegerInClass2.getRequires().size());
assertTrue(addLiteralIntegerInClass2.getRequires().contains(addPropertyClass2));
- assertSame(Integer.valueOf(1), Integer.valueOf(addUnlimitedNaturalInClass2.getRequires().size()));
+ assertEquals(1, addUnlimitedNaturalInClass2.getRequires().size());
assertTrue(addUnlimitedNaturalInClass2.getRequires().contains(addPropertyClass2));
} else {
- assertSame(Integer.valueOf(5), Integer.valueOf(addPropertyClass2.getRequires().size()));
+ assertEquals(5, addPropertyClass2.getRequires().size());
assertTrue(addPropertyClass2.getRequires().contains(addLiteralIntegerInClass2));
assertTrue(addPropertyClass2.getRequires().contains(addUnlimitedNaturalInClass2));
assertTrue(addPropertyClass2.getRequires().contains(addRefAssociationInPropertyClass2));
@@ -232,10 +233,10 @@ public class ChangeAssociationTest extends AbstractUMLTest {
assertSame(Integer.valueOf(0), Integer.valueOf(addRefAssociationInPropertyClass2.getRequires()
.size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addRefTypeInPropertyClass2.getRequires().size()));
- // assertSame(Integer.valueOf(0), Integer.valueOf(changeUMLAssociation.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addLiteralIntegerInClass2.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUnlimitedNaturalInClass2.getRequires().size()));
+ assertEquals(0, addRefTypeInPropertyClass2.getRequires().size());
+ // assertEquals(0, changeUMLAssociation.getRequires().size());
+ assertEquals(0, addLiteralIntegerInClass2.getRequires().size());
+ assertEquals(0, addUnlimitedNaturalInClass2.getRequires().size());
}
testIntersections(comparison);
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddAbstractionTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddAbstractionTest.java
index 02db99fb3..8cbb8d74a 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddAbstractionTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddAbstractionTest.java
@@ -129,31 +129,31 @@ public class AddAbstractionTest extends AbstractUMLTest {
instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLDependency);
- assertSame(Integer.valueOf(3), Integer.valueOf(addUMLDependency.getRefinedBy().size()));
+ assertEquals(3, addUMLDependency.getRefinedBy().size());
assertTrue(addUMLDependency.getRefinedBy().contains(addRefClass1InAbstraction));
assertTrue(addUMLDependency.getRefinedBy().contains(addRefClass0InAbstraction));
assertTrue(addUMLDependency.getRefinedBy().contains(addAbstraction));
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(1), Integer.valueOf(addRefClass1InAbstraction.getRequires().size()));
+ assertEquals(1, addRefClass1InAbstraction.getRequires().size());
assertTrue(addRefClass1InAbstraction.getRequires().contains(addAbstraction));
- assertSame(Integer.valueOf(1), Integer.valueOf(addRefClass0InAbstraction.getRequires().size()));
+ assertEquals(1, addRefClass0InAbstraction.getRequires().size());
assertTrue(addRefClass0InAbstraction.getRequires().contains(addAbstraction));
- assertSame(Integer.valueOf(0), Integer.valueOf(addAbstraction.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));
+ assertEquals(0, addAbstraction.getRequires().size());
+ assertEquals(0, addUMLDependency.getRequires().size());
} else {
- assertSame(Integer.valueOf(0), Integer.valueOf(addRefClass1InAbstraction.getRequires().size()));
+ assertEquals(0, addRefClass1InAbstraction.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addRefClass0InAbstraction.getRequires().size()));
+ assertEquals(0, addRefClass0InAbstraction.getRequires().size());
- assertSame(Integer.valueOf(2), Integer.valueOf(addAbstraction.getRequires().size()));
+ assertEquals(2, addAbstraction.getRequires().size());
assertTrue(addAbstraction.getRequires().contains(addRefClass1InAbstraction));
assertTrue(addAbstraction.getRequires().contains(addRefClass0InAbstraction));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));
+ assertEquals(0, addUMLDependency.getRequires().size());
}
// CHECK EQUIVALENCE
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddDependencyTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddDependencyTest.java
index 00ed56db6..3582711b7 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddDependencyTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddDependencyTest.java
@@ -128,32 +128,32 @@ public class AddDependencyTest extends AbstractUMLTest {
instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLDependency);
- assertSame(Integer.valueOf(3), Integer.valueOf(addUMLDependency.getRefinedBy().size()));
+ assertEquals(3, addUMLDependency.getRefinedBy().size());
assertTrue(addUMLDependency.getRefinedBy().contains(addRefClass0InDependency));
assertTrue(addUMLDependency.getRefinedBy().contains(addRefClass1InDependency));
assertTrue(addUMLDependency.getRefinedBy().contains(addDependency));
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(1), Integer.valueOf(addRefClass0InDependency.getRequires().size()));
+ assertEquals(1, addRefClass0InDependency.getRequires().size());
assertTrue(addRefClass0InDependency.getRequires().contains(addDependency));
- assertSame(Integer.valueOf(1), Integer.valueOf(addRefClass1InDependency.getRequires().size()));
+ assertEquals(1, addRefClass1InDependency.getRequires().size());
assertTrue(addRefClass1InDependency.getRequires().contains(addDependency));
- assertSame(Integer.valueOf(0), Integer.valueOf(addDependency.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));
+ assertEquals(0, addDependency.getRequires().size());
+ assertEquals(0, addUMLDependency.getRequires().size());
} else {
- assertSame(Integer.valueOf(0), Integer.valueOf(addRefClass0InDependency.getRequires().size()));
+ assertEquals(0, addRefClass0InDependency.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addRefClass1InDependency.getRequires().size()));
+ assertEquals(0, addRefClass1InDependency.getRequires().size());
// Was 3 with UML 4.0 but NamedElement::clientDependency has been made derived in UML 5.0
- assertSame(Integer.valueOf(2), Integer.valueOf(addDependency.getRequires().size()));
+ assertEquals(2, addDependency.getRequires().size());
assertTrue(addDependency.getRequires().contains(addRefClass0InDependency));
assertTrue(addDependency.getRequires().contains(addRefClass1InDependency));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));
+ assertEquals(0, addUMLDependency.getRequires().size());
}
// CHECK EQUIVALENCE
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java
index 64096728d..c189cc3ae 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java
@@ -140,7 +140,7 @@ public class AddInterfaceRealizationTest extends AbstractUMLTest {
instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLDependency);
- assertSame(Integer.valueOf(4), Integer.valueOf(addUMLDependency.getRefinedBy().size()));
+ assertEquals(4, addUMLDependency.getRefinedBy().size());
assertTrue(addUMLDependency.getRefinedBy().contains(addInterfaceRealization));
assertTrue(addUMLDependency.getRefinedBy().contains(addClientInInterfaceRealization));
assertTrue(addUMLDependency.getRefinedBy().contains(addSupplierInInterfaceRealization));
@@ -158,8 +158,8 @@ public class AddInterfaceRealizationTest extends AbstractUMLTest {
.size()));
assertTrue(addContractInInterfaceRealization.getRequires().contains(addInterfaceRealization));
- assertSame(Integer.valueOf(0), Integer.valueOf(addInterfaceRealization.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));
+ assertEquals(0, addInterfaceRealization.getRequires().size());
+ assertEquals(0, addUMLDependency.getRequires().size());
} else {
assertSame(Integer.valueOf(0), Integer.valueOf(addClientInInterfaceRealization.getRequires()
.size()));
@@ -168,12 +168,12 @@ public class AddInterfaceRealizationTest extends AbstractUMLTest {
assertSame(Integer.valueOf(0), Integer.valueOf(addContractInInterfaceRealization.getRequires()
.size()));
- assertSame(Integer.valueOf(3), Integer.valueOf(addInterfaceRealization.getRequires().size()));
+ assertEquals(3, addInterfaceRealization.getRequires().size());
assertTrue(addInterfaceRealization.getRequires().contains(addClientInInterfaceRealization));
assertTrue(addInterfaceRealization.getRequires().contains(addSupplierInInterfaceRealization));
assertTrue(addInterfaceRealization.getRequires().contains(addContractInInterfaceRealization));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));
+ assertEquals(0, addUMLDependency.getRequires().size());
}
// CHECK EQUIVALENCE
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddRealizationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddRealizationTest.java
index ebba6b537..6b3e620b9 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddRealizationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddRealizationTest.java
@@ -129,31 +129,31 @@ public class AddRealizationTest extends AbstractUMLTest {
instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLDependency);
- assertSame(Integer.valueOf(3), Integer.valueOf(addUMLDependency.getRefinedBy().size()));
+ assertEquals(3, addUMLDependency.getRefinedBy().size());
assertTrue(addUMLDependency.getRefinedBy().contains(addRefClass0InDependency));
assertTrue(addUMLDependency.getRefinedBy().contains(addRefClass1InDependency));
assertTrue(addUMLDependency.getRefinedBy().contains(addDependency));
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(1), Integer.valueOf(addRefClass0InDependency.getRequires().size()));
+ assertEquals(1, addRefClass0InDependency.getRequires().size());
assertTrue(addRefClass0InDependency.getRequires().contains(addDependency));
- assertSame(Integer.valueOf(1), Integer.valueOf(addRefClass1InDependency.getRequires().size()));
+ assertEquals(1, addRefClass1InDependency.getRequires().size());
assertTrue(addRefClass1InDependency.getRequires().contains(addDependency));
- assertSame(Integer.valueOf(0), Integer.valueOf(addDependency.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));
+ assertEquals(0, addDependency.getRequires().size());
+ assertEquals(0, addUMLDependency.getRequires().size());
} else {
- assertSame(Integer.valueOf(0), Integer.valueOf(addRefClass0InDependency.getRequires().size()));
+ assertEquals(0, addRefClass0InDependency.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addRefClass1InDependency.getRequires().size()));
+ assertEquals(0, addRefClass1InDependency.getRequires().size());
- assertSame(Integer.valueOf(2), Integer.valueOf(addDependency.getRequires().size()));
+ assertEquals(2, addDependency.getRequires().size());
assertTrue(addDependency.getRequires().contains(addRefClass0InDependency));
assertTrue(addDependency.getRequires().contains(addRefClass1InDependency));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));
+ assertEquals(0, addUMLDependency.getRequires().size());
}
// CHECK EQUIVALENCE
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java
index 62da2f0e2..88fa29d28 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java
@@ -140,7 +140,7 @@ public class AddSubstitutionTest extends AbstractUMLTest {
instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLDependency);
- assertSame(Integer.valueOf(4), Integer.valueOf(addUMLDependency.getRefinedBy().size()));
+ assertEquals(4, addUMLDependency.getRefinedBy().size());
assertTrue(addUMLDependency.getRefinedBy().contains(addClientInInterfaceRealization));
assertTrue(addUMLDependency.getRefinedBy().contains(addSupplierInInterfaceRealization));
assertTrue(addUMLDependency.getRefinedBy().contains(addContractInInterfaceRealization));
@@ -158,8 +158,8 @@ public class AddSubstitutionTest extends AbstractUMLTest {
.size()));
assertTrue(addContractInInterfaceRealization.getRequires().contains(addInterfaceRealization));
- assertSame(Integer.valueOf(0), Integer.valueOf(addInterfaceRealization.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));
+ assertEquals(0, addInterfaceRealization.getRequires().size());
+ assertEquals(0, addUMLDependency.getRequires().size());
} else {
assertSame(Integer.valueOf(0), Integer.valueOf(addClientInInterfaceRealization.getRequires()
.size()));
@@ -168,16 +168,16 @@ public class AddSubstitutionTest extends AbstractUMLTest {
assertSame(Integer.valueOf(0), Integer.valueOf(addContractInInterfaceRealization.getRequires()
.size()));
- assertSame(Integer.valueOf(3), Integer.valueOf(addInterfaceRealization.getRequires().size()));
+ assertEquals(3, addInterfaceRealization.getRequires().size());
assertTrue(addInterfaceRealization.getRequires().contains(addClientInInterfaceRealization));
assertTrue(addInterfaceRealization.getRequires().contains(addSupplierInInterfaceRealization));
assertTrue(addInterfaceRealization.getRequires().contains(addContractInInterfaceRealization));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));
+ assertEquals(0, addUMLDependency.getRequires().size());
}
// CHECK EQUIVALENCE
- assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ assertEquals(0, comparison.getEquivalences().size());
assertNull(addClientInInterfaceRealization.getEquivalence());
testIntersections(comparison);
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddUsageTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddUsageTest.java
index 88ae7042f..7ed45c77b 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddUsageTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddUsageTest.java
@@ -127,31 +127,31 @@ public class AddUsageTest extends AbstractUMLTest {
instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLDependency);
- assertSame(Integer.valueOf(3), Integer.valueOf(addUMLDependency.getRefinedBy().size()));
+ assertEquals(3, addUMLDependency.getRefinedBy().size());
assertTrue(addUMLDependency.getRefinedBy().contains(addRefClass0InDependency));
assertTrue(addUMLDependency.getRefinedBy().contains(addRefClass1InDependency));
assertTrue(addUMLDependency.getRefinedBy().contains(addDependency));
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(1), Integer.valueOf(addRefClass0InDependency.getRequires().size()));
+ assertEquals(1, addRefClass0InDependency.getRequires().size());
assertTrue(addRefClass0InDependency.getRequires().contains(addDependency));
- assertSame(Integer.valueOf(1), Integer.valueOf(addRefClass1InDependency.getRequires().size()));
+ assertEquals(1, addRefClass1InDependency.getRequires().size());
assertTrue(addRefClass1InDependency.getRequires().contains(addDependency));
- assertSame(Integer.valueOf(0), Integer.valueOf(addDependency.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));
+ assertEquals(0, addDependency.getRequires().size());
+ assertEquals(0, addUMLDependency.getRequires().size());
} else {
- assertSame(Integer.valueOf(0), Integer.valueOf(addRefClass0InDependency.getRequires().size()));
+ assertEquals(0, addRefClass0InDependency.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addRefClass1InDependency.getRequires().size()));
+ assertEquals(0, addRefClass1InDependency.getRequires().size());
- assertSame(Integer.valueOf(2), Integer.valueOf(addDependency.getRequires().size()));
+ assertEquals(2, addDependency.getRequires().size());
assertTrue(addDependency.getRequires().contains(addRefClass0InDependency));
assertTrue(addDependency.getRequires().contains(addRefClass1InDependency));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));
+ assertEquals(0, addUMLDependency.getRequires().size());
}
// CHECK EQUIVALENCE
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeDependencyTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeDependencyTest.java
index ea06f9958..446bf2fc1 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeDependencyTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeDependencyTest.java
@@ -2,12 +2,13 @@ package org.eclipse.emf.compare.uml2.tests.dependency;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.instanceOf;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertSame;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind;
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.assertNull;
+import static org.junit.Assert.assertSame;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
@@ -19,8 +20,8 @@ import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;
-import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
+import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;
import org.eclipse.emf.ecore.resource.Resource;
import org.junit.Test;
@@ -82,7 +83,7 @@ public class ChangeDependencyTest extends AbstractUMLTest {
final List<Diff> differences = comparison.getDifferences();
// We should have no less and no more than 1 differences
- assertSame(Integer.valueOf(1), Integer.valueOf(differences.size()));
+ assertEquals(1, differences.size());
Predicate<? super Diff> addSupplierInDependencyDescription = null;
@@ -106,14 +107,14 @@ public class ChangeDependencyTest extends AbstractUMLTest {
instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.CHANGE)), null);
assertNull(changeUMLDependency);
// assertNotNull(changeUMLDependency);
- // assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLDependency.getRefinedBy().size()));
+ // assertEquals(1, changeUMLDependency.getRefinedBy().size());
// assertTrue(changeUMLDependency.getRefinedBy().contains(addSupplierInDependency));
// CHECK REQUIREMENT
- assertSame(Integer.valueOf(0), Integer.valueOf(addSupplierInDependency.getRequires().size()));
+ assertEquals(0, addSupplierInDependency.getRequires().size());
// CHECK EQUIVALENCE
- assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ assertEquals(0, comparison.getEquivalences().size());
testIntersections(comparison);
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeUsageTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeUsageTest.java
index 41c3cf23e..355a934db 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeUsageTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeUsageTest.java
@@ -2,12 +2,13 @@ package org.eclipse.emf.compare.uml2.tests.dependency;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.instanceOf;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertSame;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind;
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.assertNull;
+import static org.junit.Assert.assertSame;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
@@ -19,8 +20,8 @@ import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;
-import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
+import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;
import org.eclipse.emf.ecore.resource.Resource;
import org.junit.Test;
@@ -83,7 +84,7 @@ public class ChangeUsageTest extends AbstractUMLTest {
final List<Diff> differences = comparison.getDifferences();
// We should have no less and no more than 2 differences
- assertSame(Integer.valueOf(1), Integer.valueOf(differences.size()));
+ assertEquals(1, differences.size());
Predicate<? super Diff> addSupplierInDependencyDescription = null;
@@ -106,14 +107,14 @@ public class ChangeUsageTest extends AbstractUMLTest {
instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.CHANGE)), null);
assertNull(changeUMLDependency);
// assertNotNull(changeUMLDependency);
- // assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLDependency.getRefinedBy().size()));
+ // assertEquals(1, changeUMLDependency.getRefinedBy().size());
// assertTrue(changeUMLDependency.getRefinedBy().contains(addSupplierInDependency));
// CHECK REQUIREMENT
- assertSame(Integer.valueOf(0), Integer.valueOf(addSupplierInDependency.getRequires().size()));
+ assertEquals(0, addSupplierInDependency.getRequires().size());
// CHECK EQUIVALENCE
- assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ assertEquals(0, comparison.getEquivalences().size());
testIntersections(comparison);
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddActionExecutionSpecificationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddActionExecutionSpecificationTest.java
index 687e61ebe..baf4844e0 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddActionExecutionSpecificationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddActionExecutionSpecificationTest.java
@@ -2,15 +2,16 @@ package org.eclipse.emf.compare.uml2.tests.executionSpecification;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.instanceOf;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;
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.ofKind;
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;
import com.google.common.collect.Iterators;
@@ -22,8 +23,8 @@ import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange;
-import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
+import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.executionSpecification.data.ExecutionSpecificationInputData;
import org.eclipse.emf.ecore.resource.Resource;
import org.junit.Test;
@@ -85,7 +86,7 @@ public class AddActionExecutionSpecificationTest extends AbstractUMLTest {
final List<Diff> differences = comparison.getDifferences();
// We should have no less and no more than 14 differences
- assertSame(Integer.valueOf(14), Integer.valueOf(differences.size()));
+ assertEquals(14, differences.size());
Predicate<? super Diff> addActionExecSpecDescription = null;
Predicate<? super Diff> addCoveredInStartDescription = null;
@@ -198,7 +199,7 @@ public class AddActionExecutionSpecificationTest extends AbstractUMLTest {
instanceOf(ExecutionSpecificationChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLMessage);
- assertSame(Integer.valueOf(13), Integer.valueOf(addUMLMessage.getRefinedBy().size()));
+ assertEquals(13, addUMLMessage.getRefinedBy().size());
assertTrue(addUMLMessage.getRefinedBy().contains(addFinishInActionExecSpec));
assertTrue(addUMLMessage.getRefinedBy().contains(addStartInActionExecSpec));
assertTrue(addUMLMessage.getRefinedBy().contains(addCoveredInFinish));
@@ -216,48 +217,48 @@ public class AddActionExecutionSpecificationTest extends AbstractUMLTest {
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(0), Integer.valueOf(addActionExecSpec.getRequires().size()));
+ assertEquals(0, addActionExecSpec.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredInStart.getRequires().size()));
+ assertEquals(1, addCoveredInStart.getRequires().size());
assertTrue(addCoveredInStart.getRequires().contains(addStart));
- assertSame(Integer.valueOf(2), Integer.valueOf(addExecutionInStart.getRequires().size()));
+ assertEquals(2, addExecutionInStart.getRequires().size());
assertTrue(addExecutionInStart.getRequires().contains(addStart));
assertTrue(addExecutionInStart.getRequires().contains(addActionExecSpec));
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredInFinish.getRequires().size()));
+ assertEquals(1, addCoveredInFinish.getRequires().size());
assertTrue(addCoveredInFinish.getRequires().contains(addFinish));
- assertSame(Integer.valueOf(2), Integer.valueOf(addExecutionInFinish.getRequires().size()));
+ assertEquals(2, addExecutionInFinish.getRequires().size());
assertTrue(addExecutionInFinish.getRequires().contains(addFinish));
assertTrue(addExecutionInFinish.getRequires().contains(addActionExecSpec));
- assertSame(Integer.valueOf(2), Integer.valueOf(addFinishInActionExecSpec.getRequires().size()));
+ assertEquals(2, addFinishInActionExecSpec.getRequires().size());
assertTrue(addFinishInActionExecSpec.getRequires().contains(addActionExecSpec));
assertTrue(addFinishInActionExecSpec.getRequires().contains(addFinish));
- assertSame(Integer.valueOf(2), Integer.valueOf(addStartInActionExecSpec.getRequires().size()));
+ assertEquals(2, addStartInActionExecSpec.getRequires().size());
assertTrue(addStartInActionExecSpec.getRequires().contains(addActionExecSpec));
assertTrue(addStartInActionExecSpec.getRequires().contains(addStart));
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredByInLifeline1_1.getRequires().size()));
+ assertEquals(1, addCoveredByInLifeline1_1.getRequires().size());
assertTrue(addCoveredByInLifeline1_1.getRequires().contains(addStart));
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredByInLifeline1_2.getRequires().size()));
+ assertEquals(1, addCoveredByInLifeline1_2.getRequires().size());
assertTrue(addCoveredByInLifeline1_2.getRequires().contains(addFinish));
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredByInLifeline1_3.getRequires().size()));
+ assertEquals(1, addCoveredByInLifeline1_3.getRequires().size());
assertTrue(addCoveredByInLifeline1_3.getRequires().contains(addActionExecSpec));
- assertSame(Integer.valueOf(0), Integer.valueOf(addStart.getRequires().size()));
+ assertEquals(0, addStart.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addFinish.getRequires().size()));
+ assertEquals(0, addFinish.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredInActionExecSpec.getRequires().size()));
+ assertEquals(1, addCoveredInActionExecSpec.getRequires().size());
assertTrue(addCoveredInActionExecSpec.getRequires().contains(addActionExecSpec));
} else {
- assertSame(Integer.valueOf(6), Integer.valueOf(addActionExecSpec.getRequires().size()));
+ assertEquals(6, addActionExecSpec.getRequires().size());
assertTrue(addActionExecSpec.getRequires().contains(addFinishInActionExecSpec));
assertTrue(addActionExecSpec.getRequires().contains(addStartInActionExecSpec));
assertTrue(addActionExecSpec.getRequires().contains(addCoveredInActionExecSpec));
@@ -265,41 +266,41 @@ public class AddActionExecutionSpecificationTest extends AbstractUMLTest {
assertTrue(addActionExecSpec.getRequires().contains(addExecutionInStart));
assertTrue(addActionExecSpec.getRequires().contains(addCoveredByInLifeline1_3));
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredInStart.getRequires().size()));
+ assertEquals(0, addCoveredInStart.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addExecutionInStart.getRequires().size()));
+ assertEquals(0, addExecutionInStart.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredInFinish.getRequires().size()));
+ assertEquals(0, addCoveredInFinish.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addExecutionInFinish.getRequires().size()));
+ assertEquals(0, addExecutionInFinish.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addFinishInActionExecSpec.getRequires().size()));
+ assertEquals(0, addFinishInActionExecSpec.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addStartInActionExecSpec.getRequires().size()));
+ assertEquals(0, addStartInActionExecSpec.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredByInLifeline1_1.getRequires().size()));
+ assertEquals(0, addCoveredByInLifeline1_1.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredByInLifeline1_2.getRequires().size()));
+ assertEquals(0, addCoveredByInLifeline1_2.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredByInLifeline1_3.getRequires().size()));
+ assertEquals(0, addCoveredByInLifeline1_3.getRequires().size());
- assertSame(Integer.valueOf(4), Integer.valueOf(addStart.getRequires().size()));
+ assertEquals(4, addStart.getRequires().size());
assertTrue(addStart.getRequires().contains(addStartInActionExecSpec));
assertTrue(addStart.getRequires().contains(addCoveredByInLifeline1_1));
assertTrue(addStart.getRequires().contains(addCoveredInStart));
assertTrue(addStart.getRequires().contains(addExecutionInStart));
- assertSame(Integer.valueOf(4), Integer.valueOf(addFinish.getRequires().size()));
+ assertEquals(4, addFinish.getRequires().size());
assertTrue(addFinish.getRequires().contains(addFinishInActionExecSpec));
assertTrue(addFinish.getRequires().contains(addCoveredByInLifeline1_2));
assertTrue(addFinish.getRequires().contains(addCoveredInFinish));
assertTrue(addFinish.getRequires().contains(addExecutionInFinish));
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredInActionExecSpec.getRequires().size()));
+ assertEquals(0, addCoveredInActionExecSpec.getRequires().size());
}
// CHECK EQUIVALENCE
- assertSame(Integer.valueOf(3), Integer.valueOf(comparison.getEquivalences().size()));
+ assertEquals(3, comparison.getEquivalences().size());
assertNotNull(addCoveredInStart.getEquivalence());
assertSame(Integer.valueOf(2), Integer.valueOf(addCoveredInStart.getEquivalence().getDifferences()
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddBehaviorExecutionSpecificationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddBehaviorExecutionSpecificationTest.java
index 09e6a1358..d149f12bd 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddBehaviorExecutionSpecificationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddBehaviorExecutionSpecificationTest.java
@@ -2,15 +2,16 @@ package org.eclipse.emf.compare.uml2.tests.executionSpecification;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.instanceOf;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;
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.ofKind;
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;
import com.google.common.collect.Iterators;
@@ -22,8 +23,8 @@ import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange;
-import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
+import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.executionSpecification.data.ExecutionSpecificationInputData;
import org.eclipse.emf.ecore.resource.Resource;
import org.junit.Test;
@@ -85,7 +86,7 @@ public class AddBehaviorExecutionSpecificationTest extends AbstractUMLTest {
final List<Diff> differences = comparison.getDifferences();
// We should have no less and no more than 14 differences
- assertSame(Integer.valueOf(14), Integer.valueOf(differences.size()));
+ assertEquals(14, differences.size());
Predicate<? super Diff> addActionExecSpecDescription = null;
Predicate<? super Diff> addCoveredInStartDescription = null;
@@ -198,7 +199,7 @@ public class AddBehaviorExecutionSpecificationTest extends AbstractUMLTest {
instanceOf(ExecutionSpecificationChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLMessage);
- assertSame(Integer.valueOf(13), Integer.valueOf(addUMLMessage.getRefinedBy().size()));
+ assertEquals(13, addUMLMessage.getRefinedBy().size());
assertTrue(addUMLMessage.getRefinedBy().contains(addFinishInActionExecSpec));
assertTrue(addUMLMessage.getRefinedBy().contains(addStartInActionExecSpec));
assertTrue(addUMLMessage.getRefinedBy().contains(addCoveredInFinish));
@@ -216,48 +217,48 @@ public class AddBehaviorExecutionSpecificationTest extends AbstractUMLTest {
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(0), Integer.valueOf(addActionExecSpec.getRequires().size()));
+ assertEquals(0, addActionExecSpec.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredInStart.getRequires().size()));
+ assertEquals(1, addCoveredInStart.getRequires().size());
assertTrue(addCoveredInStart.getRequires().contains(addStart));
- assertSame(Integer.valueOf(2), Integer.valueOf(addExecutionInStart.getRequires().size()));
+ assertEquals(2, addExecutionInStart.getRequires().size());
assertTrue(addExecutionInStart.getRequires().contains(addStart));
assertTrue(addExecutionInStart.getRequires().contains(addActionExecSpec));
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredInFinish.getRequires().size()));
+ assertEquals(1, addCoveredInFinish.getRequires().size());
assertTrue(addCoveredInFinish.getRequires().contains(addFinish));
- assertSame(Integer.valueOf(2), Integer.valueOf(addExecutionInFinish.getRequires().size()));
+ assertEquals(2, addExecutionInFinish.getRequires().size());
assertTrue(addExecutionInFinish.getRequires().contains(addFinish));
assertTrue(addExecutionInFinish.getRequires().contains(addActionExecSpec));
- assertSame(Integer.valueOf(2), Integer.valueOf(addFinishInActionExecSpec.getRequires().size()));
+ assertEquals(2, addFinishInActionExecSpec.getRequires().size());
assertTrue(addFinishInActionExecSpec.getRequires().contains(addActionExecSpec));
assertTrue(addFinishInActionExecSpec.getRequires().contains(addFinish));
- assertSame(Integer.valueOf(2), Integer.valueOf(addStartInActionExecSpec.getRequires().size()));
+ assertEquals(2, addStartInActionExecSpec.getRequires().size());
assertTrue(addStartInActionExecSpec.getRequires().contains(addActionExecSpec));
assertTrue(addStartInActionExecSpec.getRequires().contains(addStart));
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredByInLifeline1_1.getRequires().size()));
+ assertEquals(1, addCoveredByInLifeline1_1.getRequires().size());
assertTrue(addCoveredByInLifeline1_1.getRequires().contains(addStart));
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredByInLifeline1_2.getRequires().size()));
+ assertEquals(1, addCoveredByInLifeline1_2.getRequires().size());
assertTrue(addCoveredByInLifeline1_2.getRequires().contains(addFinish));
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredByInLifeline1_3.getRequires().size()));
+ assertEquals(1, addCoveredByInLifeline1_3.getRequires().size());
assertTrue(addCoveredByInLifeline1_3.getRequires().contains(addActionExecSpec));
- assertSame(Integer.valueOf(0), Integer.valueOf(addStart.getRequires().size()));
+ assertEquals(0, addStart.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addFinish.getRequires().size()));
+ assertEquals(0, addFinish.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredInActionExecSpec.getRequires().size()));
+ assertEquals(1, addCoveredInActionExecSpec.getRequires().size());
assertTrue(addCoveredInActionExecSpec.getRequires().contains(addActionExecSpec));
} else {
- assertSame(Integer.valueOf(6), Integer.valueOf(addActionExecSpec.getRequires().size()));
+ assertEquals(6, addActionExecSpec.getRequires().size());
assertTrue(addActionExecSpec.getRequires().contains(addFinishInActionExecSpec));
assertTrue(addActionExecSpec.getRequires().contains(addStartInActionExecSpec));
assertTrue(addActionExecSpec.getRequires().contains(addCoveredInActionExecSpec));
@@ -265,41 +266,41 @@ public class AddBehaviorExecutionSpecificationTest extends AbstractUMLTest {
assertTrue(addActionExecSpec.getRequires().contains(addExecutionInStart));
assertTrue(addActionExecSpec.getRequires().contains(addCoveredByInLifeline1_3));
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredInStart.getRequires().size()));
+ assertEquals(0, addCoveredInStart.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addExecutionInStart.getRequires().size()));
+ assertEquals(0, addExecutionInStart.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredInFinish.getRequires().size()));
+ assertEquals(0, addCoveredInFinish.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addExecutionInFinish.getRequires().size()));
+ assertEquals(0, addExecutionInFinish.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addFinishInActionExecSpec.getRequires().size()));
+ assertEquals(0, addFinishInActionExecSpec.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addStartInActionExecSpec.getRequires().size()));
+ assertEquals(0, addStartInActionExecSpec.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredByInLifeline1_1.getRequires().size()));
+ assertEquals(0, addCoveredByInLifeline1_1.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredByInLifeline1_2.getRequires().size()));
+ assertEquals(0, addCoveredByInLifeline1_2.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredByInLifeline1_3.getRequires().size()));
+ assertEquals(0, addCoveredByInLifeline1_3.getRequires().size());
- assertSame(Integer.valueOf(4), Integer.valueOf(addStart.getRequires().size()));
+ assertEquals(4, addStart.getRequires().size());
assertTrue(addStart.getRequires().contains(addStartInActionExecSpec));
assertTrue(addStart.getRequires().contains(addCoveredByInLifeline1_1));
assertTrue(addStart.getRequires().contains(addCoveredInStart));
assertTrue(addStart.getRequires().contains(addExecutionInStart));
- assertSame(Integer.valueOf(4), Integer.valueOf(addFinish.getRequires().size()));
+ assertEquals(4, addFinish.getRequires().size());
assertTrue(addFinish.getRequires().contains(addFinishInActionExecSpec));
assertTrue(addFinish.getRequires().contains(addCoveredByInLifeline1_2));
assertTrue(addFinish.getRequires().contains(addCoveredInFinish));
assertTrue(addFinish.getRequires().contains(addExecutionInFinish));
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredInActionExecSpec.getRequires().size()));
+ assertEquals(0, addCoveredInActionExecSpec.getRequires().size());
}
// CHECK EQUIVALENCE
- assertSame(Integer.valueOf(3), Integer.valueOf(comparison.getEquivalences().size()));
+ assertEquals(3, comparison.getEquivalences().size());
assertNotNull(addCoveredInStart.getEquivalence());
assertSame(Integer.valueOf(2), Integer.valueOf(addCoveredInStart.getEquivalence().getDifferences()
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/extend/AddExtendTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/extend/AddExtendTest.java
index ae68b2206..18d211c72 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/extend/AddExtendTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/extend/AddExtendTest.java
@@ -2,15 +2,16 @@ package org.eclipse.emf.compare.uml2.tests.extend;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.instanceOf;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;
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.ofKind;
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;
import com.google.common.collect.Iterators;
@@ -22,8 +23,8 @@ import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.uml2.internal.ExtendChange;
-import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
+import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.extend.data.ExtendInputData;
import org.eclipse.emf.ecore.resource.Resource;
import org.junit.Test;
@@ -85,7 +86,7 @@ public class AddExtendTest extends AbstractUMLTest {
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> addExtendDescription = null;
Predicate<? super Diff> changeRefExtendedCaseInExtendDescription = null;
@@ -131,7 +132,7 @@ public class AddExtendTest extends AbstractUMLTest {
ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLExtend);
- assertSame(Integer.valueOf(4), Integer.valueOf(addUMLExtend.getRefinedBy().size()));
+ assertEquals(4, addUMLExtend.getRefinedBy().size());
assertTrue(addUMLExtend.getRefinedBy().contains(addRefExtendedCaseInExtend));
assertTrue(addUMLExtend.getRefinedBy().contains(addRefExtensionLocationInExtend));
assertTrue(addUMLExtend.getRefinedBy().contains(addExtensionPoint));
@@ -139,7 +140,7 @@ public class AddExtendTest extends AbstractUMLTest {
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(1), Integer.valueOf(addRefExtendedCaseInExtend.getRequires().size()));
+ assertEquals(1, addRefExtendedCaseInExtend.getRequires().size());
assertTrue(addRefExtendedCaseInExtend.getRequires().contains(addExtend));
assertSame(Integer.valueOf(2), Integer.valueOf(addRefExtensionLocationInExtend.getRequires()
@@ -147,23 +148,23 @@ public class AddExtendTest extends AbstractUMLTest {
assertTrue(addRefExtensionLocationInExtend.getRequires().contains(addExtend));
assertTrue(addRefExtensionLocationInExtend.getRequires().contains(addExtensionPoint));
- assertSame(Integer.valueOf(0), Integer.valueOf(addExtend.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLExtend.getRequires().size()));
+ assertEquals(0, addExtend.getRequires().size());
+ assertEquals(0, addUMLExtend.getRequires().size());
} else {
- assertSame(Integer.valueOf(0), Integer.valueOf(addRefExtendedCaseInExtend.getRequires().size()));
+ assertEquals(0, addRefExtendedCaseInExtend.getRequires().size());
assertSame(Integer.valueOf(0), Integer.valueOf(addRefExtensionLocationInExtend.getRequires()
.size()));
- assertSame(Integer.valueOf(2), Integer.valueOf(addExtend.getRequires().size()));
+ assertEquals(2, addExtend.getRequires().size());
assertTrue(addExtend.getRequires().contains(addRefExtendedCaseInExtend));
assertTrue(addExtend.getRequires().contains(addRefExtensionLocationInExtend));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLExtend.getRequires().size()));
+ assertEquals(0, addUMLExtend.getRequires().size());
}
// CHECK EQUIVALENCE
- assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ assertEquals(0, comparison.getEquivalences().size());
testIntersections(comparison);
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/generalizationSet/AddGeneralizationSetTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/generalizationSet/AddGeneralizationSetTest.java
index 71e67698e..f42fac73b 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/generalizationSet/AddGeneralizationSetTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/generalizationSet/AddGeneralizationSetTest.java
@@ -2,14 +2,15 @@ package org.eclipse.emf.compare.uml2.tests.generalizationSet;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.instanceOf;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.onEObject;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.referenceValueMatch;
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;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
@@ -21,8 +22,8 @@ import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange;
-import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
+import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.generalizationSet.data.GeneralizationSetInputData;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.resource.Resource;
@@ -86,7 +87,7 @@ public class AddGeneralizationSetTest extends AbstractUMLTest {
final 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> addGeneralizationSetDescription = null;
Predicate<? super Diff> addRefGeneralizationSetInClass2Description = null;
@@ -152,7 +153,7 @@ public class AddGeneralizationSetTest extends AbstractUMLTest {
instanceOf(GeneralizationSetChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLGeneralizationSet);
- assertSame(Integer.valueOf(5), Integer.valueOf(addUMLGeneralizationSet.getRefinedBy().size()));
+ assertEquals(5, addUMLGeneralizationSet.getRefinedBy().size());
assertTrue(addUMLGeneralizationSet.getRefinedBy().contains(addRefGeneralizationInGeneralizationSet1));
assertTrue(addUMLGeneralizationSet.getRefinedBy().contains(addRefGeneralizationInGeneralizationSet2));
assertTrue(addUMLGeneralizationSet.getRefinedBy().contains(addGeneralizationSet));
@@ -177,8 +178,8 @@ public class AddGeneralizationSetTest extends AbstractUMLTest {
.size()));
assertTrue(addRefGeneralizationSetInClass2.getRequires().contains(addGeneralizationSet));
- assertSame(Integer.valueOf(0), Integer.valueOf(addGeneralizationSet.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLGeneralizationSet.getRequires().size()));
+ assertEquals(0, addGeneralizationSet.getRequires().size());
+ assertEquals(0, addUMLGeneralizationSet.getRequires().size());
} else {
assertSame(Integer.valueOf(0), Integer.valueOf(addRefGeneralizationInGeneralizationSet1
.getRequires().size()));
@@ -192,17 +193,17 @@ public class AddGeneralizationSetTest extends AbstractUMLTest {
assertSame(Integer.valueOf(0), Integer.valueOf(addRefGeneralizationSetInClass2.getRequires()
.size()));
- assertSame(Integer.valueOf(4), Integer.valueOf(addGeneralizationSet.getRequires().size()));
+ assertEquals(4, addGeneralizationSet.getRequires().size());
assertTrue(addGeneralizationSet.getRequires().contains(addRefGeneralizationInGeneralizationSet1));
assertTrue(addGeneralizationSet.getRequires().contains(addRefGeneralizationInGeneralizationSet2));
assertTrue(addGeneralizationSet.getRequires().contains(addRefGeneralizationSetInClass0));
assertTrue(addGeneralizationSet.getRequires().contains(addRefGeneralizationSetInClass2));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLGeneralizationSet.getRequires().size()));
+ assertEquals(0, addUMLGeneralizationSet.getRequires().size());
}
// CHECK EQUIVALENCE
- assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getEquivalences().size()));
+ assertEquals(2, comparison.getEquivalences().size());
assertNotNull(addRefGeneralizationInGeneralizationSet1.getEquivalence());
assertSame(Integer.valueOf(2), Integer.valueOf(addRefGeneralizationInGeneralizationSet1
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsAssociationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsAssociationTest.java
index b1793ab3d..d8071d1a5 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsAssociationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsAssociationTest.java
@@ -2,10 +2,6 @@ package org.eclipse.emf.compare.uml2.tests.implications;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.instanceOf;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedReference;
@@ -14,6 +10,9 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.onEObject;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.onFeature;
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.assertNull;
+import static org.junit.Assert.assertTrue;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
@@ -26,8 +25,8 @@ import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.uml2.internal.AssociationChange;
-import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
+import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.implications.data.ImplicationsInputData;
import org.eclipse.emf.ecore.resource.Resource;
import org.junit.Test;
@@ -937,7 +936,7 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
final List<Diff> differences = comparison.getDifferences();
// We should have no less and no more than 16 differences
- assertSame(Integer.valueOf(NB_DIFFS), Integer.valueOf(differences.size()));
+ assertEquals(NB_DIFFS, differences.size());
DiffsOfInterest diffs = getDiffs(comparison, kind);
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsTransitionTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsTransitionTest.java
index 24411beab..27e3b2af6 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsTransitionTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsTransitionTest.java
@@ -1,14 +1,13 @@
package org.eclipse.emf.compare.uml2.tests.implications;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;
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.removed;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromReference;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
@@ -19,8 +18,8 @@ import java.util.List;
import org.eclipse.emf.common.util.BasicMonitor;
import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
-import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
+import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.implications.data.ImplicationsInputData;
import org.eclipse.emf.ecore.resource.Resource;
import org.junit.Test;
@@ -850,7 +849,7 @@ public class ImplicationsTransitionTest extends AbstractUMLTest {
private void testAB1(TestKind kind, final Comparison comparison) {
final List<Diff> differences = comparison.getDifferences();
- assertSame(Integer.valueOf(NB_DIFFS), Integer.valueOf(differences.size()));
+ assertEquals(NB_DIFFS, differences.size());
DiffsOfInterest diffs = getDiffs(comparison, kind);
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/include/AddIncludeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/include/AddIncludeTest.java
index 787be9068..67bae66da 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/include/AddIncludeTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/include/AddIncludeTest.java
@@ -2,13 +2,14 @@ package org.eclipse.emf.compare.uml2.tests.include;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.instanceOf;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind;
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;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
@@ -20,8 +21,8 @@ import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;
-import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
+import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.include.data.IncludeInputData;
import org.eclipse.emf.ecore.resource.Resource;
import org.junit.Test;
@@ -83,7 +84,7 @@ public class AddIncludeTest extends AbstractUMLTest {
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> addExtendDescription = null;
Predicate<? super Diff> changeRefExtendedCaseInExtendDescription = null;
@@ -116,28 +117,28 @@ public class AddIncludeTest extends AbstractUMLTest {
instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLExtend);
- assertSame(Integer.valueOf(2), Integer.valueOf(addUMLExtend.getRefinedBy().size()));
+ assertEquals(2, addUMLExtend.getRefinedBy().size());
assertTrue(addUMLExtend.getRefinedBy().contains(addRefExtendedCaseInExtend));
assertTrue(addUMLExtend.getRefinedBy().contains(addExtend));
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(1), Integer.valueOf(addRefExtendedCaseInExtend.getRequires().size()));
+ assertEquals(1, addRefExtendedCaseInExtend.getRequires().size());
assertTrue(addRefExtendedCaseInExtend.getRequires().contains(addExtend));
- assertSame(Integer.valueOf(0), Integer.valueOf(addExtend.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLExtend.getRequires().size()));
+ assertEquals(0, addExtend.getRequires().size());
+ assertEquals(0, addUMLExtend.getRequires().size());
} else {
- assertSame(Integer.valueOf(0), Integer.valueOf(addRefExtendedCaseInExtend.getRequires().size()));
+ assertEquals(0, addRefExtendedCaseInExtend.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addExtend.getRequires().size()));
+ assertEquals(1, addExtend.getRequires().size());
assertTrue(addExtend.getRequires().contains(addRefExtendedCaseInExtend));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLExtend.getRequires().size()));
+ assertEquals(0, addUMLExtend.getRequires().size());
}
// CHECK EQUIVALENCE
- assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ assertEquals(0, comparison.getEquivalences().size());
testIntersections(comparison);
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java
index f49998838..a44e04a74 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java
@@ -28,8 +28,8 @@ import org.eclipse.emf.compare.scope.DefaultComparisonScope;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.uml2.internal.UMLDiff;
import org.eclipse.emf.compare.uml2.internal.merge.UMLMerger;
-import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
+import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.association.data.AssociationInputData;
import org.eclipse.emf.ecore.resource.Resource;
import org.junit.Test;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/message/AddMessageTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/message/AddMessageTest.java
index 10fda6a52..93a368d4b 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/message/AddMessageTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/message/AddMessageTest.java
@@ -3,16 +3,17 @@ package org.eclipse.emf.compare.uml2.tests.message;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.instanceOf;
import static com.google.common.base.Predicates.not;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;
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.ofKind;
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.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
@@ -26,8 +27,8 @@ import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.uml2.internal.MessageChange;
-import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
+import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.message.data.MessageInputData;
import org.eclipse.emf.ecore.resource.Resource;
import org.junit.Test;
@@ -233,7 +234,7 @@ public class AddMessageTest extends AbstractUMLTest {
final 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> addMessageDescription = null;
Predicate<? super Diff> addCoveredInMessage0Send0Description = null;
@@ -332,7 +333,7 @@ public class AddMessageTest extends AbstractUMLTest {
ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLMessage);
- assertSame(Integer.valueOf(11), Integer.valueOf(addUMLMessage.getRefinedBy().size()));
+ assertEquals(11, addUMLMessage.getRefinedBy().size());
assertTrue(addUMLMessage.getRefinedBy().contains(addReceiveEventInMessage));
assertTrue(addUMLMessage.getRefinedBy().contains(addSendEventInMessage));
assertTrue(addUMLMessage.getRefinedBy().contains(addCoveredInMessage0Recv0));
@@ -350,70 +351,70 @@ public class AddMessageTest extends AbstractUMLTest {
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(0), Integer.valueOf(addMessage.getRequires().size()));
+ assertEquals(0, addMessage.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredInMessage0Send0.getRequires().size()));
+ assertEquals(1, addCoveredInMessage0Send0.getRequires().size());
assertTrue(addCoveredInMessage0Send0.getRequires().contains(addMessageSend));
- assertSame(Integer.valueOf(2), Integer.valueOf(addMessageInMessage0Send0.getRequires().size()));
+ assertEquals(2, addMessageInMessage0Send0.getRequires().size());
assertTrue(addMessageInMessage0Send0.getRequires().contains(addMessageSend));
assertTrue(addMessageInMessage0Send0.getRequires().contains(addMessage));
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredInMessage0Recv0.getRequires().size()));
+ assertEquals(1, addCoveredInMessage0Recv0.getRequires().size());
assertTrue(addCoveredInMessage0Recv0.getRequires().contains(addMessageRecv));
- assertSame(Integer.valueOf(2), Integer.valueOf(addMessageInMessage0Recv0.getRequires().size()));
+ assertEquals(2, addMessageInMessage0Recv0.getRequires().size());
assertTrue(addMessageInMessage0Recv0.getRequires().contains(addMessageRecv));
assertTrue(addMessageInMessage0Recv0.getRequires().contains(addMessage));
- assertSame(Integer.valueOf(2), Integer.valueOf(addReceiveEventInMessage.getRequires().size()));
+ assertEquals(2, addReceiveEventInMessage.getRequires().size());
assertTrue(addReceiveEventInMessage.getRequires().contains(addMessage));
assertTrue(addReceiveEventInMessage.getRequires().contains(addMessageRecv));
- assertSame(Integer.valueOf(2), Integer.valueOf(addSendEventInMessage.getRequires().size()));
+ assertEquals(2, addSendEventInMessage.getRequires().size());
assertTrue(addSendEventInMessage.getRequires().contains(addMessage));
assertTrue(addSendEventInMessage.getRequires().contains(addMessageSend));
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredByInLifeline0.getRequires().size()));
+ assertEquals(1, addCoveredByInLifeline0.getRequires().size());
assertTrue(addCoveredByInLifeline0.getRequires().contains(addMessageSend));
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredByInLifeline1.getRequires().size()));
+ assertEquals(1, addCoveredByInLifeline1.getRequires().size());
assertTrue(addCoveredByInLifeline1.getRequires().contains(addMessageRecv));
- assertSame(Integer.valueOf(0), Integer.valueOf(addMessageSend.getRequires().size()));
+ assertEquals(0, addMessageSend.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addMessageRecv.getRequires().size()));
+ assertEquals(0, addMessageRecv.getRequires().size());
} else {
- assertSame(Integer.valueOf(4), Integer.valueOf(addMessage.getRequires().size()));
+ assertEquals(4, addMessage.getRequires().size());
assertTrue(addMessage.getRequires().contains(addReceiveEventInMessage));
assertTrue(addMessage.getRequires().contains(addSendEventInMessage));
assertTrue(addMessage.getRequires().contains(addMessageInMessage0Recv0));
assertTrue(addMessage.getRequires().contains(addMessageInMessage0Send0));
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredInMessage0Send0.getRequires().size()));
+ assertEquals(0, addCoveredInMessage0Send0.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addMessageInMessage0Send0.getRequires().size()));
+ assertEquals(0, addMessageInMessage0Send0.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredInMessage0Recv0.getRequires().size()));
+ assertEquals(0, addCoveredInMessage0Recv0.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addMessageInMessage0Recv0.getRequires().size()));
+ assertEquals(0, addMessageInMessage0Recv0.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addReceiveEventInMessage.getRequires().size()));
+ assertEquals(0, addReceiveEventInMessage.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addSendEventInMessage.getRequires().size()));
+ assertEquals(0, addSendEventInMessage.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredByInLifeline0.getRequires().size()));
+ assertEquals(0, addCoveredByInLifeline0.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredByInLifeline1.getRequires().size()));
+ assertEquals(0, addCoveredByInLifeline1.getRequires().size());
- assertSame(Integer.valueOf(4), Integer.valueOf(addMessageSend.getRequires().size()));
+ assertEquals(4, addMessageSend.getRequires().size());
assertTrue(addMessageSend.getRequires().contains(addSendEventInMessage));
assertTrue(addMessageSend.getRequires().contains(addCoveredByInLifeline0));
assertTrue(addMessageSend.getRequires().contains(addCoveredInMessage0Send0));
assertTrue(addMessageSend.getRequires().contains(addMessageInMessage0Send0));
- assertSame(Integer.valueOf(4), Integer.valueOf(addMessageRecv.getRequires().size()));
+ assertEquals(4, addMessageRecv.getRequires().size());
assertTrue(addMessageRecv.getRequires().contains(addReceiveEventInMessage));
assertTrue(addMessageRecv.getRequires().contains(addCoveredByInLifeline1));
assertTrue(addMessageRecv.getRequires().contains(addCoveredInMessage0Recv0));
@@ -421,7 +422,7 @@ public class AddMessageTest extends AbstractUMLTest {
}
// CHECK EQUIVALENCE
- assertSame(Integer.valueOf(2), Integer.valueOf(comparison.getEquivalences().size()));
+ assertEquals(2, comparison.getEquivalences().size());
assertNotNull(addCoveredInMessage0Send0.getEquivalence());
assertSame(Integer.valueOf(2), Integer.valueOf(addCoveredInMessage0Send0.getEquivalence()
@@ -455,7 +456,7 @@ public class AddMessageTest extends AbstractUMLTest {
useFullDiffs.add(diff);
}
- assertSame(Integer.valueOf(7), Integer.valueOf(useFullDiffs.size()));
+ assertEquals(7, useFullDiffs.size());
Predicate<? super Diff> addMessageDescription = null;
Predicate<? super Diff> addCoveredInMessage0Recv0Description = null;
@@ -517,7 +518,7 @@ public class AddMessageTest extends AbstractUMLTest {
ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLMessage);
- assertSame(Integer.valueOf(6), Integer.valueOf(addUMLMessage.getRefinedBy().size()));
+ assertEquals(6, addUMLMessage.getRefinedBy().size());
assertTrue(addUMLMessage.getRefinedBy().contains(addReceiveEventInMessage));
assertTrue(addUMLMessage.getRefinedBy().contains(addCoveredInMessage0Recv0));
assertTrue(addUMLMessage.getRefinedBy().contains(addMessageRecv));
@@ -528,38 +529,38 @@ public class AddMessageTest extends AbstractUMLTest {
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(0), Integer.valueOf(addMessage.getRequires().size()));
+ assertEquals(0, addMessage.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredInMessage0Recv0.getRequires().size()));
+ assertEquals(1, addCoveredInMessage0Recv0.getRequires().size());
assertTrue(addCoveredInMessage0Recv0.getRequires().contains(addMessageRecv));
- assertSame(Integer.valueOf(2), Integer.valueOf(addMessageInMessage0Recv0.getRequires().size()));
+ assertEquals(2, addMessageInMessage0Recv0.getRequires().size());
assertTrue(addMessageInMessage0Recv0.getRequires().contains(addMessageRecv));
assertTrue(addMessageInMessage0Recv0.getRequires().contains(addMessage));
- assertSame(Integer.valueOf(2), Integer.valueOf(addReceiveEventInMessage.getRequires().size()));
+ assertEquals(2, addReceiveEventInMessage.getRequires().size());
assertTrue(addReceiveEventInMessage.getRequires().contains(addMessage));
assertTrue(addReceiveEventInMessage.getRequires().contains(addMessageRecv));
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredByInLifeline0.getRequires().size()));
+ assertEquals(1, addCoveredByInLifeline0.getRequires().size());
assertTrue(addCoveredByInLifeline0.getRequires().contains(addMessageRecv));
- assertSame(Integer.valueOf(0), Integer.valueOf(addMessageRecv.getRequires().size()));
+ assertEquals(0, addMessageRecv.getRequires().size());
} else {
- assertSame(Integer.valueOf(2), Integer.valueOf(addMessage.getRequires().size()));
+ assertEquals(2, addMessage.getRequires().size());
assertTrue(addMessage.getRequires().contains(addReceiveEventInMessage));
assertTrue(addMessage.getRequires().contains(addMessageInMessage0Recv0));
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredInMessage0Recv0.getRequires().size()));
+ assertEquals(0, addCoveredInMessage0Recv0.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addMessageInMessage0Recv0.getRequires().size()));
+ assertEquals(0, addMessageInMessage0Recv0.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addReceiveEventInMessage.getRequires().size()));
+ assertEquals(0, addReceiveEventInMessage.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredByInLifeline0.getRequires().size()));
+ assertEquals(0, addCoveredByInLifeline0.getRequires().size());
- assertSame(Integer.valueOf(4), Integer.valueOf(addMessageRecv.getRequires().size()));
+ assertEquals(4, addMessageRecv.getRequires().size());
assertTrue(addMessageRecv.getRequires().contains(addReceiveEventInMessage));
assertTrue(addMessageRecv.getRequires().contains(addCoveredInMessage0Recv0));
assertTrue(addMessageRecv.getRequires().contains(addMessageInMessage0Recv0));
@@ -567,7 +568,7 @@ public class AddMessageTest extends AbstractUMLTest {
}
// CHECK EQUIVALENCE
- assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getEquivalences().size()));
+ assertEquals(1, comparison.getEquivalences().size());
assertNotNull(addCoveredInMessage0Recv0.getEquivalence());
assertSame(Integer.valueOf(2), Integer.valueOf(addCoveredInMessage0Recv0.getEquivalence()
@@ -595,7 +596,7 @@ public class AddMessageTest extends AbstractUMLTest {
useFullDiffs.add(diff);
}
- assertSame(Integer.valueOf(7), Integer.valueOf(useFullDiffs.size()));
+ assertEquals(7, useFullDiffs.size());
Predicate<? super Diff> addMessageDescription = null;
Predicate<? super Diff> addCoveredInMessage0Recv0Description = null;
@@ -657,7 +658,7 @@ public class AddMessageTest extends AbstractUMLTest {
ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLMessage);
- assertSame(Integer.valueOf(6), Integer.valueOf(addUMLMessage.getRefinedBy().size()));
+ assertEquals(6, addUMLMessage.getRefinedBy().size());
assertTrue(addUMLMessage.getRefinedBy().contains(addReceiveEventInMessage));
assertTrue(addUMLMessage.getRefinedBy().contains(addCoveredInMessage0Recv0));
assertTrue(addUMLMessage.getRefinedBy().contains(addMessageRecv));
@@ -668,38 +669,38 @@ public class AddMessageTest extends AbstractUMLTest {
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(0), Integer.valueOf(addMessage.getRequires().size()));
+ assertEquals(0, addMessage.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredInMessage0Recv0.getRequires().size()));
+ assertEquals(1, addCoveredInMessage0Recv0.getRequires().size());
assertTrue(addCoveredInMessage0Recv0.getRequires().contains(addMessageRecv));
- assertSame(Integer.valueOf(2), Integer.valueOf(addMessageInMessage0Recv0.getRequires().size()));
+ assertEquals(2, addMessageInMessage0Recv0.getRequires().size());
assertTrue(addMessageInMessage0Recv0.getRequires().contains(addMessageRecv));
assertTrue(addMessageInMessage0Recv0.getRequires().contains(addMessage));
- assertSame(Integer.valueOf(2), Integer.valueOf(addReceiveEventInMessage.getRequires().size()));
+ assertEquals(2, addReceiveEventInMessage.getRequires().size());
assertTrue(addReceiveEventInMessage.getRequires().contains(addMessage));
assertTrue(addReceiveEventInMessage.getRequires().contains(addMessageRecv));
- assertSame(Integer.valueOf(1), Integer.valueOf(addCoveredByInLifeline0.getRequires().size()));
+ assertEquals(1, addCoveredByInLifeline0.getRequires().size());
assertTrue(addCoveredByInLifeline0.getRequires().contains(addMessageRecv));
- assertSame(Integer.valueOf(0), Integer.valueOf(addMessageRecv.getRequires().size()));
+ assertEquals(0, addMessageRecv.getRequires().size());
} else {
- assertSame(Integer.valueOf(2), Integer.valueOf(addMessage.getRequires().size()));
+ assertEquals(2, addMessage.getRequires().size());
assertTrue(addMessage.getRequires().contains(addReceiveEventInMessage));
assertTrue(addMessage.getRequires().contains(addMessageInMessage0Recv0));
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredInMessage0Recv0.getRequires().size()));
+ assertEquals(0, addCoveredInMessage0Recv0.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addMessageInMessage0Recv0.getRequires().size()));
+ assertEquals(0, addMessageInMessage0Recv0.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addReceiveEventInMessage.getRequires().size()));
+ assertEquals(0, addReceiveEventInMessage.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addCoveredByInLifeline0.getRequires().size()));
+ assertEquals(0, addCoveredByInLifeline0.getRequires().size());
- assertSame(Integer.valueOf(4), Integer.valueOf(addMessageRecv.getRequires().size()));
+ assertEquals(4, addMessageRecv.getRequires().size());
assertTrue(addMessageRecv.getRequires().contains(addReceiveEventInMessage));
assertTrue(addMessageRecv.getRequires().contains(addCoveredInMessage0Recv0));
assertTrue(addMessageRecv.getRequires().contains(addMessageInMessage0Recv0));
@@ -707,7 +708,7 @@ public class AddMessageTest extends AbstractUMLTest {
}
// CHECK EQUIVALENCE
- assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getEquivalences().size()));
+ assertEquals(1, comparison.getEquivalences().size());
assertNotNull(addCoveredInMessage0Recv0.getEquivalence());
assertSame(Integer.valueOf(2), Integer.valueOf(addCoveredInMessage0Recv0.getEquivalence()
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/DynamicProfileTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/DynamicProfileTest.java
index ee6d02c88..5fabc3b2b 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/DynamicProfileTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/DynamicProfileTest.java
@@ -2,11 +2,12 @@ package org.eclipse.emf.compare.uml2.tests.profiles;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.instanceOf;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.onFeature;
+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;
import com.google.common.collect.Iterators;
@@ -146,7 +147,7 @@ public class DynamicProfileTest extends AbstractDynamicProfileTest {
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> addProfileApplicationDescription = null;
Predicate<? super Diff> addAppliedProfileInProfileApplicationDescription = null;
@@ -213,37 +214,37 @@ public class DynamicProfileTest extends AbstractDynamicProfileTest {
instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLProfileApplication);
- assertSame(Integer.valueOf(4), Integer.valueOf(addUMLProfileApplication.getRefinedBy().size()));
+ assertEquals(4, addUMLProfileApplication.getRefinedBy().size());
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addReferencesInUMLAnnotation));
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addAppliedProfileInProfileApplication));
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addProfileApplication));
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addUMLAnnotation));
// CHECK REQUIREMENT
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLProfileApplication.getRequires().size()));
+ assertEquals(0, addUMLProfileApplication.getRequires().size());
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(0), Integer.valueOf(addProfileApplication.getRequires().size()));
+ assertEquals(0, addProfileApplication.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLAnnotation.getRequires().size()));
+ assertEquals(1, addUMLAnnotation.getRequires().size());
assertTrue(addUMLAnnotation.getRequires().contains(addProfileApplication));
- assertSame(Integer.valueOf(1), Integer.valueOf(addReferencesInUMLAnnotation.getRequires().size()));
+ assertEquals(1, addReferencesInUMLAnnotation.getRequires().size());
assertTrue(addReferencesInUMLAnnotation.getRequires().contains(addUMLAnnotation));
} else {
- assertSame(Integer.valueOf(2), Integer.valueOf(addProfileApplication.getRequires().size()));
+ assertEquals(2, addProfileApplication.getRequires().size());
assertTrue(addProfileApplication.getRequires().contains(addAppliedProfileInProfileApplication));
assertTrue(addProfileApplication.getRequires().contains(addUMLAnnotation));
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLAnnotation.getRequires().size()));
+ assertEquals(1, addUMLAnnotation.getRequires().size());
assertTrue(addUMLAnnotation.getRequires().contains(addReferencesInUMLAnnotation));
- assertSame(Integer.valueOf(0), Integer.valueOf(addReferencesInUMLAnnotation.getRequires().size()));
+ assertEquals(0, addReferencesInUMLAnnotation.getRequires().size());
}
// CHECK EQUIVALENCE
- assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ assertEquals(0, comparison.getEquivalences().size());
testIntersections(comparison);
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/StaticProfileTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/StaticProfileTest.java
index 7eed33413..2389518e0 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/StaticProfileTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/StaticProfileTest.java
@@ -2,11 +2,12 @@ package org.eclipse.emf.compare.uml2.tests.profiles;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.instanceOf;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.onFeature;
+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;
import com.google.common.collect.Iterators;
@@ -136,7 +137,7 @@ public class StaticProfileTest extends AbstractStaticProfileTest {
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> addProfileApplicationDescription = null;
Predicate<? super Diff> addAppliedProfileInProfileApplicationDescription = null;
@@ -203,37 +204,37 @@ public class StaticProfileTest extends AbstractStaticProfileTest {
instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLProfileApplication);
- assertSame(Integer.valueOf(4), Integer.valueOf(addUMLProfileApplication.getRefinedBy().size()));
+ assertEquals(4, addUMLProfileApplication.getRefinedBy().size());
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addReferencesInUMLAnnotation));
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addAppliedProfileInProfileApplication));
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addProfileApplication));
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addUMLAnnotation));
// CHECK REQUIREMENT
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLProfileApplication.getRequires().size()));
+ assertEquals(0, addUMLProfileApplication.getRequires().size());
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(0), Integer.valueOf(addProfileApplication.getRequires().size()));
+ assertEquals(0, addProfileApplication.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLAnnotation.getRequires().size()));
+ assertEquals(1, addUMLAnnotation.getRequires().size());
assertTrue(addUMLAnnotation.getRequires().contains(addProfileApplication));
- assertSame(Integer.valueOf(1), Integer.valueOf(addReferencesInUMLAnnotation.getRequires().size()));
+ assertEquals(1, addReferencesInUMLAnnotation.getRequires().size());
assertTrue(addReferencesInUMLAnnotation.getRequires().contains(addUMLAnnotation));
} else {
- assertSame(Integer.valueOf(2), Integer.valueOf(addProfileApplication.getRequires().size()));
+ assertEquals(2, addProfileApplication.getRequires().size());
assertTrue(addProfileApplication.getRequires().contains(addAppliedProfileInProfileApplication));
assertTrue(addProfileApplication.getRequires().contains(addUMLAnnotation));
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLAnnotation.getRequires().size()));
+ assertEquals(1, addUMLAnnotation.getRequires().size());
assertTrue(addUMLAnnotation.getRequires().contains(addReferencesInUMLAnnotation));
- assertSame(Integer.valueOf(0), Integer.valueOf(addReferencesInUMLAnnotation.getRequires().size()));
+ assertEquals(0, addReferencesInUMLAnnotation.getRequires().size());
}
// CHECK EQUIVALENCE
- assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ assertEquals(0, comparison.getEquivalences().size());
testIntersections(comparison);
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java
index 77af352b0..3a634fe9d 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java
@@ -12,15 +12,16 @@ package org.eclipse.emf.compare.uml2.tests.stereotypes;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.instanceOf;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.onFeature;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.removed;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.valueIs;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.valueNameMatches;
+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;
import com.google.common.collect.Iterators;
@@ -549,7 +550,7 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
final List<Diff> differences = comparison.getDifferences();
// We should have no less and no more than 6 differences
- assertSame(Integer.valueOf(8), Integer.valueOf(differences.size()));
+ assertEquals(8, differences.size());
Predicate<? super Diff> addProfileApplicationDescription = null;
Predicate<? super Diff> addAppliedProfileInProfileApplicationDescription = null;
@@ -633,52 +634,52 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLProfileApplication);
- assertSame(Integer.valueOf(4), Integer.valueOf(addUMLProfileApplication.getRefinedBy().size()));
+ assertEquals(4, addUMLProfileApplication.getRefinedBy().size());
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addReferencesInUMLAnnotation));
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addAppliedProfileInProfileApplication));
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addProfileApplication));
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addUMLAnnotation));
assertNotNull(addUMLStereotypeApplication);
- assertSame(Integer.valueOf(2), Integer.valueOf(addUMLStereotypeApplication.getRefinedBy().size()));
+ assertEquals(2, addUMLStereotypeApplication.getRefinedBy().size());
assertTrue(addUMLStereotypeApplication.getRefinedBy().contains(addStereotypeApplication));
assertTrue(addUMLStereotypeApplication.getRefinedBy().contains(addRefBaseClass));
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(0), Integer.valueOf(addProfileApplication.getRequires().size()));
+ assertEquals(0, addProfileApplication.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLAnnotation.getRequires().size()));
+ assertEquals(1, addUMLAnnotation.getRequires().size());
assertTrue(addUMLAnnotation.getRequires().contains(addProfileApplication));
- assertSame(Integer.valueOf(1), Integer.valueOf(addReferencesInUMLAnnotation.getRequires().size()));
+ assertEquals(1, addReferencesInUMLAnnotation.getRequires().size());
assertTrue(addReferencesInUMLAnnotation.getRequires().contains(addUMLAnnotation));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLProfileApplication.getRequires().size()));
+ assertEquals(0, addUMLProfileApplication.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLStereotypeApplication.getRequires().size()));
+ assertEquals(1, addUMLStereotypeApplication.getRequires().size());
assertTrue(addUMLStereotypeApplication.getRequires().contains(addUMLProfileApplication));
} else {
- assertSame(Integer.valueOf(2), Integer.valueOf(addProfileApplication.getRequires().size()));
+ assertEquals(2, addProfileApplication.getRequires().size());
assertTrue(addProfileApplication.getRequires().contains(addAppliedProfileInProfileApplication));
assertTrue(addProfileApplication.getRequires().contains(addUMLAnnotation));
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLAnnotation.getRequires().size()));
+ assertEquals(1, addUMLAnnotation.getRequires().size());
assertTrue(addUMLAnnotation.getRequires().contains(addReferencesInUMLAnnotation));
- assertSame(Integer.valueOf(0), Integer.valueOf(addReferencesInUMLAnnotation.getRequires().size()));
+ assertEquals(0, addReferencesInUMLAnnotation.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLProfileApplication.getRequires().size()));
+ assertEquals(1, addUMLProfileApplication.getRequires().size());
assertTrue(addUMLProfileApplication.getRequires().contains(addUMLStereotypeApplication));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLStereotypeApplication.getRequires().size()));
+ assertEquals(0, addUMLStereotypeApplication.getRequires().size());
}
// CHECK EQUIVALENCE
- assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ assertEquals(0, comparison.getEquivalences().size());
testIntersections(comparison);
@@ -688,7 +689,7 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
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> addAttributeDescription = null;
@@ -710,7 +711,7 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
private void testAB3(TestKind kind, final Comparison comparison) {
final List<Diff> differences = comparison.getDifferences();
- assertSame(Integer.valueOf(10), Integer.valueOf(differences.size()));
+ assertEquals(10, differences.size());
Predicate<? super Diff> addProfileApplicationDescription = null;
Predicate<? super Diff> addAppliedProfileInProfileApplicationDescription = null;
@@ -805,53 +806,53 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLProfileApplication);
- assertSame(Integer.valueOf(4), Integer.valueOf(addUMLProfileApplication.getRefinedBy().size()));
+ assertEquals(4, addUMLProfileApplication.getRefinedBy().size());
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addReferencesInUMLAnnotation));
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addAppliedProfileInProfileApplication));
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addProfileApplication));
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addUMLAnnotation));
assertNotNull(addUMLStereotypeApplication);
- assertSame(Integer.valueOf(2), Integer.valueOf(addUMLStereotypeApplication.getRefinedBy().size()));
+ assertEquals(2, addUMLStereotypeApplication.getRefinedBy().size());
assertTrue(addUMLStereotypeApplication.getRefinedBy().contains(addStereotypeApplication));
assertTrue(addUMLStereotypeApplication.getRefinedBy().contains(addRefBaseClass));
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(1), Integer.valueOf(addProfileApplication.getRequires().size()));
+ assertEquals(1, addProfileApplication.getRequires().size());
assertTrue(addProfileApplication.getRequires().contains(addModel));
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLAnnotation.getRequires().size()));
+ assertEquals(1, addUMLAnnotation.getRequires().size());
assertTrue(addUMLAnnotation.getRequires().contains(addProfileApplication));
- assertSame(Integer.valueOf(1), Integer.valueOf(addReferencesInUMLAnnotation.getRequires().size()));
+ assertEquals(1, addReferencesInUMLAnnotation.getRequires().size());
assertTrue(addReferencesInUMLAnnotation.getRequires().contains(addUMLAnnotation));
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLProfileApplication.getRequires().size()));
+ assertEquals(1, addUMLProfileApplication.getRequires().size());
- assertSame(Integer.valueOf(2), Integer.valueOf(addUMLStereotypeApplication.getRequires().size()));
+ assertEquals(2, addUMLStereotypeApplication.getRequires().size());
assertTrue(addUMLStereotypeApplication.getRequires().contains(addUMLProfileApplication));
} else {
- assertSame(Integer.valueOf(2), Integer.valueOf(addProfileApplication.getRequires().size()));
+ assertEquals(2, addProfileApplication.getRequires().size());
assertTrue(addProfileApplication.getRequires().contains(addAppliedProfileInProfileApplication));
assertTrue(addProfileApplication.getRequires().contains(addUMLAnnotation));
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLAnnotation.getRequires().size()));
+ assertEquals(1, addUMLAnnotation.getRequires().size());
assertTrue(addUMLAnnotation.getRequires().contains(addReferencesInUMLAnnotation));
- assertSame(Integer.valueOf(0), Integer.valueOf(addReferencesInUMLAnnotation.getRequires().size()));
+ assertEquals(0, addReferencesInUMLAnnotation.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLProfileApplication.getRequires().size()));
+ assertEquals(1, addUMLProfileApplication.getRequires().size());
assertTrue(addUMLProfileApplication.getRequires().contains(addUMLStereotypeApplication));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLStereotypeApplication.getRequires().size()));
+ assertEquals(0, addUMLStereotypeApplication.getRequires().size());
}
// CHECK EQUIVALENCE
- assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ assertEquals(0, comparison.getEquivalences().size());
testIntersections(comparison);
}
@@ -860,7 +861,7 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
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> addStereotypeApplicationDescription = null;
Predicate<? super Diff> addClassDescription = null;
@@ -891,7 +892,7 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
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> changeAttributeDescription1 = null;
Predicate<? super Diff> changeAttributeDescription2 = null;
@@ -916,9 +917,9 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
assertNotNull(changeUMLStereotypeProperty1);
assertNotNull(changeUMLStereotypeProperty2);
- assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotypeProperty1.getRefinedBy().size()));
+ assertEquals(1, changeUMLStereotypeProperty1.getRefinedBy().size());
assertTrue(changeUMLStereotypeProperty1.getRefinedBy().contains(changeAttribute1));
- assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotypeProperty2.getRefinedBy().size()));
+ assertEquals(1, changeUMLStereotypeProperty2.getRefinedBy().size());
assertTrue(changeUMLStereotypeProperty2.getRefinedBy().contains(changeAttribute2));
testIntersections(comparison);
@@ -929,7 +930,7 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
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> addStereotypeRefDescription = null;
Predicate<? super Diff> changeUMLStereotypeDescription = null;
@@ -951,7 +952,7 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
assertNotNull(addStereotypeRef);
assertNotNull(changeUMLStereotype);
- assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
+ assertEquals(1, changeUMLStereotype.getRefinedBy().size());
assertTrue(changeUMLStereotype.getRefinedBy().contains(addStereotypeRef));
testIntersections(comparison);
@@ -962,7 +963,7 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
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> moveStereotypeRefDescription = null;
Predicate<? super Diff> changeUMLStereotypeDescription = null;
@@ -979,7 +980,7 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
assertNotNull(moveStereotypeRef);
assertNotNull(changeUMLStereotype);
- assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
+ assertEquals(1, changeUMLStereotype.getRefinedBy().size());
assertTrue(changeUMLStereotype.getRefinedBy().contains(moveStereotypeRef));
testIntersections(comparison);
@@ -990,7 +991,7 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
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> changeStereotypeRefDescription = null;
Predicate<? super Diff> changeUMLStereotypeDescription = null;
@@ -1015,7 +1016,7 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
assertNotNull(changeStereotypeRef);
assertNotNull(changeUMLStereotype);
- assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
+ assertEquals(1, changeUMLStereotype.getRefinedBy().size());
assertTrue(changeUMLStereotype.getRefinedBy().contains(changeStereotypeRef));
testIntersections(comparison);
@@ -1025,7 +1026,7 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
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> changeStereotypeRefDescription = null;
Predicate<? super Diff> changeUMLStereotypeDescription = null;
@@ -1044,7 +1045,7 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
assertNotNull(changeStereotypeRef);
assertNotNull(changeUMLStereotype);
- assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
+ assertEquals(1, changeUMLStereotype.getRefinedBy().size());
assertTrue(changeUMLStereotype.getRefinedBy().contains(changeStereotypeRef));
testIntersections(comparison);
@@ -1054,7 +1055,7 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
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> changeStereotypeRefDescription = null;
Predicate<? super Diff> changeUMLStereotypeDescription = null;
@@ -1078,7 +1079,7 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
assertNotNull(changeStereotypeRef);
assertNotNull(changeUMLStereotype);
- assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
+ assertEquals(1, changeUMLStereotype.getRefinedBy().size());
assertTrue(changeUMLStereotype.getRefinedBy().contains(changeStereotypeRef));
testIntersections(comparison);
@@ -1087,7 +1088,7 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
private void testAB11(final Comparison comparison) {
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> changeStereotypeRefDescription = null;
Predicate<? super Diff> changeUMLStereotypeDescription = null;
@@ -1104,7 +1105,7 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
assertNotNull(changeStereotypeRef);
assertNotNull(changeUMLStereotype);
- assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
+ assertEquals(1, changeUMLStereotype.getRefinedBy().size());
assertTrue(changeUMLStereotype.getRefinedBy().contains(changeStereotypeRef));
testIntersections(comparison);
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java
index 8c2ee790c..f9944d9fb 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java
@@ -12,15 +12,16 @@ package org.eclipse.emf.compare.uml2.tests.stereotypes;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.instanceOf;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.onFeature;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.removed;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.valueIs;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.valueNameMatches;
+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;
import com.google.common.collect.Iterators;
@@ -692,7 +693,7 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
final List<Diff> differences = comparison.getDifferences();
// We should have no less and no more than 6 differences
- assertSame(Integer.valueOf(8), Integer.valueOf(differences.size()));
+ assertEquals(8, differences.size());
Predicate<? super Diff> addProfileApplicationDescription = null;
Predicate<? super Diff> addAppliedProfileInProfileApplicationDescription = null;
@@ -776,52 +777,52 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLProfileApplication);
- assertSame(Integer.valueOf(4), Integer.valueOf(addUMLProfileApplication.getRefinedBy().size()));
+ assertEquals(4, addUMLProfileApplication.getRefinedBy().size());
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addReferencesInUMLAnnotation));
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addAppliedProfileInProfileApplication));
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addProfileApplication));
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addUMLAnnotation));
assertNotNull(addUMLStereotypeApplication);
- assertSame(Integer.valueOf(2), Integer.valueOf(addUMLStereotypeApplication.getRefinedBy().size()));
+ assertEquals(2, addUMLStereotypeApplication.getRefinedBy().size());
assertTrue(addUMLStereotypeApplication.getRefinedBy().contains(addStereotypeApplication));
assertTrue(addUMLStereotypeApplication.getRefinedBy().contains(addRefBaseClass));
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(0), Integer.valueOf(addProfileApplication.getRequires().size()));
+ assertEquals(0, addProfileApplication.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLAnnotation.getRequires().size()));
+ assertEquals(1, addUMLAnnotation.getRequires().size());
assertTrue(addUMLAnnotation.getRequires().contains(addProfileApplication));
- assertSame(Integer.valueOf(1), Integer.valueOf(addReferencesInUMLAnnotation.getRequires().size()));
+ assertEquals(1, addReferencesInUMLAnnotation.getRequires().size());
assertTrue(addReferencesInUMLAnnotation.getRequires().contains(addUMLAnnotation));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLProfileApplication.getRequires().size()));
+ assertEquals(0, addUMLProfileApplication.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLStereotypeApplication.getRequires().size()));
+ assertEquals(1, addUMLStereotypeApplication.getRequires().size());
assertTrue(addUMLStereotypeApplication.getRequires().contains(addUMLProfileApplication));
} else {
- assertSame(Integer.valueOf(2), Integer.valueOf(addProfileApplication.getRequires().size()));
+ assertEquals(2, addProfileApplication.getRequires().size());
assertTrue(addProfileApplication.getRequires().contains(addAppliedProfileInProfileApplication));
assertTrue(addProfileApplication.getRequires().contains(addUMLAnnotation));
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLAnnotation.getRequires().size()));
+ assertEquals(1, addUMLAnnotation.getRequires().size());
assertTrue(addUMLAnnotation.getRequires().contains(addReferencesInUMLAnnotation));
- assertSame(Integer.valueOf(0), Integer.valueOf(addReferencesInUMLAnnotation.getRequires().size()));
+ assertEquals(0, addReferencesInUMLAnnotation.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLProfileApplication.getRequires().size()));
+ assertEquals(1, addUMLProfileApplication.getRequires().size());
assertTrue(addUMLProfileApplication.getRequires().contains(addUMLStereotypeApplication));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLStereotypeApplication.getRequires().size()));
+ assertEquals(0, addUMLStereotypeApplication.getRequires().size());
}
// CHECK EQUIVALENCE
- assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ assertEquals(0, comparison.getEquivalences().size());
testIntersections(comparison);
@@ -831,7 +832,7 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
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> addAttributeDescription = null;
@@ -853,7 +854,7 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
private void testAB3(TestKind kind, final Comparison comparison) {
final List<Diff> differences = comparison.getDifferences();
- assertSame(Integer.valueOf(10), Integer.valueOf(differences.size()));
+ assertEquals(10, differences.size());
Predicate<? super Diff> addProfileApplicationDescription = null;
Predicate<? super Diff> addAppliedProfileInProfileApplicationDescription = null;
@@ -948,53 +949,53 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLProfileApplication);
- assertSame(Integer.valueOf(4), Integer.valueOf(addUMLProfileApplication.getRefinedBy().size()));
+ assertEquals(4, addUMLProfileApplication.getRefinedBy().size());
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addReferencesInUMLAnnotation));
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addAppliedProfileInProfileApplication));
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addProfileApplication));
assertTrue(addUMLProfileApplication.getRefinedBy().contains(addUMLAnnotation));
assertNotNull(addUMLStereotypeApplication);
- assertSame(Integer.valueOf(2), Integer.valueOf(addUMLStereotypeApplication.getRefinedBy().size()));
+ assertEquals(2, addUMLStereotypeApplication.getRefinedBy().size());
assertTrue(addUMLStereotypeApplication.getRefinedBy().contains(addStereotypeApplication));
assertTrue(addUMLStereotypeApplication.getRefinedBy().contains(addRefBaseClass));
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(1), Integer.valueOf(addProfileApplication.getRequires().size()));
+ assertEquals(1, addProfileApplication.getRequires().size());
assertTrue(addProfileApplication.getRequires().contains(addModel));
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLAnnotation.getRequires().size()));
+ assertEquals(1, addUMLAnnotation.getRequires().size());
assertTrue(addUMLAnnotation.getRequires().contains(addProfileApplication));
- assertSame(Integer.valueOf(1), Integer.valueOf(addReferencesInUMLAnnotation.getRequires().size()));
+ assertEquals(1, addReferencesInUMLAnnotation.getRequires().size());
assertTrue(addReferencesInUMLAnnotation.getRequires().contains(addUMLAnnotation));
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLProfileApplication.getRequires().size()));
+ assertEquals(1, addUMLProfileApplication.getRequires().size());
- assertSame(Integer.valueOf(2), Integer.valueOf(addUMLStereotypeApplication.getRequires().size()));
+ assertEquals(2, addUMLStereotypeApplication.getRequires().size());
assertTrue(addUMLStereotypeApplication.getRequires().contains(addUMLProfileApplication));
} else {
- assertSame(Integer.valueOf(2), Integer.valueOf(addProfileApplication.getRequires().size()));
+ assertEquals(2, addProfileApplication.getRequires().size());
assertTrue(addProfileApplication.getRequires().contains(addAppliedProfileInProfileApplication));
assertTrue(addProfileApplication.getRequires().contains(addUMLAnnotation));
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLAnnotation.getRequires().size()));
+ assertEquals(1, addUMLAnnotation.getRequires().size());
assertTrue(addUMLAnnotation.getRequires().contains(addReferencesInUMLAnnotation));
- assertSame(Integer.valueOf(0), Integer.valueOf(addReferencesInUMLAnnotation.getRequires().size()));
+ assertEquals(0, addReferencesInUMLAnnotation.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLProfileApplication.getRequires().size()));
+ assertEquals(1, addUMLProfileApplication.getRequires().size());
assertTrue(addUMLProfileApplication.getRequires().contains(addUMLStereotypeApplication));
- assertSame(Integer.valueOf(0), Integer.valueOf(addUMLStereotypeApplication.getRequires().size()));
+ assertEquals(0, addUMLStereotypeApplication.getRequires().size());
}
// CHECK EQUIVALENCE
- assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ assertEquals(0, comparison.getEquivalences().size());
testIntersections(comparison);
}
@@ -1003,7 +1004,7 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
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> addStereotypeApplicationDescription = null;
Predicate<? super Diff> addClassDescription = null;
@@ -1035,7 +1036,7 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
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> changeAttributeDescription1 = null;
Predicate<? super Diff> changeAttributeDescription2 = null;
@@ -1060,9 +1061,9 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
assertNotNull(changeUMLStereotypeProperty1);
assertNotNull(changeUMLStereotypeProperty2);
- assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotypeProperty1.getRefinedBy().size()));
+ assertEquals(1, changeUMLStereotypeProperty1.getRefinedBy().size());
assertTrue(changeUMLStereotypeProperty1.getRefinedBy().contains(changeAttribute1));
- assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotypeProperty2.getRefinedBy().size()));
+ assertEquals(1, changeUMLStereotypeProperty2.getRefinedBy().size());
assertTrue(changeUMLStereotypeProperty2.getRefinedBy().contains(changeAttribute2));
testIntersections(comparison);
@@ -1073,7 +1074,7 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
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> addStereotypeRefDescription = null;
Predicate<? super Diff> changeUMLStereotypeDescription = null;
@@ -1095,7 +1096,7 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
assertNotNull(addStereotypeRef);
assertNotNull(changeUMLStereotype);
- assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
+ assertEquals(1, changeUMLStereotype.getRefinedBy().size());
assertTrue(changeUMLStereotype.getRefinedBy().contains(addStereotypeRef));
testIntersections(comparison);
@@ -1105,7 +1106,7 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
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> moveStereotypeRefDescription = null;
Predicate<? super Diff> changeUMLStereotypeDescription = null;
@@ -1122,7 +1123,7 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
assertNotNull(moveStereotypeRef);
assertNotNull(changeUMLStereotype);
- assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
+ assertEquals(1, changeUMLStereotype.getRefinedBy().size());
assertTrue(changeUMLStereotype.getRefinedBy().contains(moveStereotypeRef));
testIntersections(comparison);
@@ -1132,7 +1133,7 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
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> changeStereotypeRefDescription = null;
Predicate<? super Diff> changeUMLStereotypeDescription = null;
@@ -1157,7 +1158,7 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
assertNotNull(changeStereotypeRef);
assertNotNull(changeUMLStereotype);
- assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
+ assertEquals(1, changeUMLStereotype.getRefinedBy().size());
assertTrue(changeUMLStereotype.getRefinedBy().contains(changeStereotypeRef));
testIntersections(comparison);
@@ -1167,7 +1168,7 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
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> changeStereotypeRefDescription = null;
Predicate<? super Diff> changeUMLStereotypeDescription = null;
@@ -1186,7 +1187,7 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
assertNotNull(changeStereotypeRef);
assertNotNull(changeUMLStereotype);
- assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
+ assertEquals(1, changeUMLStereotype.getRefinedBy().size());
assertTrue(changeUMLStereotype.getRefinedBy().contains(changeStereotypeRef));
testIntersections(comparison);
@@ -1196,7 +1197,7 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
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> changeStereotypeRefDescription = null;
Predicate<? super Diff> changeUMLStereotypeDescription = null;
@@ -1220,7 +1221,7 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
assertNotNull(changeStereotypeRef);
assertNotNull(changeUMLStereotype);
- assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
+ assertEquals(1, changeUMLStereotype.getRefinedBy().size());
assertTrue(changeUMLStereotype.getRefinedBy().contains(changeStereotypeRef));
testIntersections(comparison);
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/timeConstraint/AddTimeConstraintTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/timeConstraint/AddTimeConstraintTest.java
index 8d4e526e3..29da910a5 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/timeConstraint/AddTimeConstraintTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/timeConstraint/AddTimeConstraintTest.java
@@ -2,15 +2,16 @@ package org.eclipse.emf.compare.uml2.tests.timeConstraint;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.instanceOf;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;
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.ofKind;
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;
import com.google.common.collect.Iterators;
@@ -22,8 +23,8 @@ import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange;
-import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
+import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
import org.eclipse.emf.compare.uml2.tests.timeConstraint.data.TimeConstraintInputData;
import org.eclipse.emf.ecore.resource.Resource;
import org.junit.Test;
@@ -85,7 +86,7 @@ public class AddTimeConstraintTest extends AbstractUMLTest {
final List<Diff> differences = comparison.getDifferences();
// We should have no less and no more than 10 differences
- assertSame(Integer.valueOf(10), Integer.valueOf(differences.size()));
+ assertEquals(10, differences.size());
Predicate<? super Diff> addTimeConstraintDescription = null;
Predicate<? super Diff> addTimeIntervalDescription = null;
@@ -163,7 +164,7 @@ public class AddTimeConstraintTest extends AbstractUMLTest {
instanceOf(IntervalConstraintChange.class), ofKind(DifferenceKind.DELETE)));
}
assertNotNull(addUMLMessage);
- assertSame(Integer.valueOf(9), Integer.valueOf(addUMLMessage.getRefinedBy().size()));
+ assertEquals(9, addUMLMessage.getRefinedBy().size());
assertTrue(addUMLMessage.getRefinedBy().contains(addConstrainedElementInTimeConstraint));
assertTrue(addUMLMessage.getRefinedBy().contains(addTimeInterval));
assertTrue(addUMLMessage.getRefinedBy().contains(addMinInTimeInterval));
@@ -177,63 +178,63 @@ public class AddTimeConstraintTest extends AbstractUMLTest {
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
- assertSame(Integer.valueOf(0), Integer.valueOf(addTimeConstraint.getRequires().size()));
+ assertEquals(0, addTimeConstraint.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addTimeInterval.getRequires().size()));
+ assertEquals(1, addTimeInterval.getRequires().size());
assertTrue(addTimeInterval.getRequires().contains(addTimeConstraint));
- assertSame(Integer.valueOf(0), Integer.valueOf(addTimeExpressionMin.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addTimeExpressionMax.getRequires().size()));
+ assertEquals(0, addTimeExpressionMin.getRequires().size());
+ assertEquals(0, addTimeExpressionMax.getRequires().size());
- assertSame(Integer.valueOf(1), Integer.valueOf(addMinValue.getRequires().size()));
+ assertEquals(1, addMinValue.getRequires().size());
assertTrue(addMinValue.getRequires().contains(addTimeExpressionMin));
- assertSame(Integer.valueOf(1), Integer.valueOf(addMaxValue.getRequires().size()));
+ assertEquals(1, addMaxValue.getRequires().size());
assertTrue(addMaxValue.getRequires().contains(addTimeExpressionMax));
assertSame(Integer.valueOf(1), Integer.valueOf(addConstrainedElementInTimeConstraint
.getRequires().size()));
assertTrue(addTimeInterval.getRequires().contains(addTimeConstraint));
- assertSame(Integer.valueOf(2), Integer.valueOf(addMinInTimeInterval.getRequires().size()));
+ assertEquals(2, addMinInTimeInterval.getRequires().size());
assertTrue(addMinInTimeInterval.getRequires().contains(addTimeInterval));
assertTrue(addMinInTimeInterval.getRequires().contains(addTimeExpressionMin));
- assertSame(Integer.valueOf(2), Integer.valueOf(addMaxInTimeInterval.getRequires().size()));
+ assertEquals(2, addMaxInTimeInterval.getRequires().size());
assertTrue(addMaxInTimeInterval.getRequires().contains(addTimeInterval));
assertTrue(addMaxInTimeInterval.getRequires().contains(addTimeExpressionMax));
} else {
- assertSame(Integer.valueOf(2), Integer.valueOf(addTimeConstraint.getRequires().size()));
+ assertEquals(2, addTimeConstraint.getRequires().size());
assertTrue(addTimeConstraint.getRequires().contains(addConstrainedElementInTimeConstraint));
assertTrue(addTimeConstraint.getRequires().contains(addTimeInterval));
- assertSame(Integer.valueOf(2), Integer.valueOf(addTimeInterval.getRequires().size()));
+ assertEquals(2, addTimeInterval.getRequires().size());
assertTrue(addTimeInterval.getRequires().contains(addMinInTimeInterval));
assertTrue(addTimeInterval.getRequires().contains(addMaxInTimeInterval));
- assertSame(Integer.valueOf(2), Integer.valueOf(addTimeExpressionMin.getRequires().size()));
+ assertEquals(2, addTimeExpressionMin.getRequires().size());
assertTrue(addTimeExpressionMin.getRequires().contains(addMinValue));
assertTrue(addTimeExpressionMin.getRequires().contains(addMinInTimeInterval));
- assertSame(Integer.valueOf(2), Integer.valueOf(addTimeExpressionMax.getRequires().size()));
+ assertEquals(2, addTimeExpressionMax.getRequires().size());
assertTrue(addTimeExpressionMax.getRequires().contains(addMaxValue));
assertTrue(addTimeExpressionMax.getRequires().contains(addMaxInTimeInterval));
- assertSame(Integer.valueOf(0), Integer.valueOf(addMinValue.getRequires().size()));
+ assertEquals(0, addMinValue.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addMaxValue.getRequires().size()));
+ assertEquals(0, addMaxValue.getRequires().size());
assertSame(Integer.valueOf(0), Integer.valueOf(addConstrainedElementInTimeConstraint
.getRequires().size()));
- assertSame(Integer.valueOf(0), Integer.valueOf(addMinInTimeInterval.getRequires().size()));
+ assertEquals(0, addMinInTimeInterval.getRequires().size());
- assertSame(Integer.valueOf(0), Integer.valueOf(addMaxInTimeInterval.getRequires().size()));
+ assertEquals(0, addMaxInTimeInterval.getRequires().size());
}
// CHECK EQUIVALENCE
- assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ assertEquals(0, comparison.getEquivalences().size());
testIntersections(comparison);

Back to the top