Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Goubet2014-01-30 05:18:27 -0500
committerLaurent Goubet2014-01-30 10:43:15 -0500
commit578f5e206473a3a4286246648b969282bf0a1029 (patch)
treec42e21f7d395e3b90c56264e234424ad19c26d20 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req
parentf6f92566be706f641c0afade7e3ab3dd752927cd (diff)
downloadorg.eclipse.emf.compare-578f5e206473a3a4286246648b969282bf0a1029.tar.gz
org.eclipse.emf.compare-578f5e206473a3a4286246648b969282bf0a1029.tar.xz
org.eclipse.emf.compare-578f5e206473a3a4286246648b969282bf0a1029.zip
Cleanup for version bumping
- Bump versions to reflect minimal BREE change - Fix as many warnings as possible - Make sure our @since reflect the correct versions Change-Id: Ifb30b655f17ef2420ea5ca69c528910bd51e7649
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req')
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/ReqComputingTest.java14
1 files changed, 7 insertions, 7 deletions
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 51cd59067..2115d0f57 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,14 +12,14 @@ package org.eclipse.emf.compare.tests.req;
import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.getOnlyElement;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
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.movedInReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.removed;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromReference;
+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(3, differences.size());
+ assertSame(Integer.valueOf(3), Integer.valueOf(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(0, added1.getRequires().size());
- assertSame(1, added2.getRequires().size());
+ assertSame(Integer.valueOf(0), Integer.valueOf(added1.getRequires().size()));
+ assertSame(Integer.valueOf(1), Integer.valueOf(added2.getRequires().size()));
assertTrue(added2.getRequires().contains(added1));
- assertSame(1, singleChange.getRequires().size());
+ assertSame(Integer.valueOf(1), Integer.valueOf(singleChange.getRequires().size()));
assertTrue(singleChange.getRequires().contains(added2));
}

Back to the top