Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtilTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtilTest.java	(revision 11613)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtilTest.java	(revision 11614)
@@ -5,4 +5,5 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
@@ -81,5 +82,5 @@
         tc.add(otherSource); // other source should prevent resolution
         TagConflictResolutionUtil.applyAutomaticTagConflictResolution(tc);
-        assertTrue(tc.getValues("source").size() == 18);
+        assertSame(18, tc.getValues("source").size());
         tc.remove(otherSource);
         TagConflictResolutionUtil.applyAutomaticTagConflictResolution(tc);
@@ -372,12 +373,12 @@
         public void testGroupChoices() {
             Collection<AutomaticChoiceGroup> groups = AutomaticChoiceGroup.groupChoices(Arrays.asList(choiceKey1Group1, choiceKey1Group2));
-            assertTrue(groups.size() == 2);
+            assertSame(2, groups.size());
 
             groups = AutomaticChoiceGroup.groupChoices(Arrays.asList(
                 choiceKey1Group1, choiceKey1Group2, choiceKey2Group1, choiceKey2Group2, choiceEmpty));
-            assertTrue(groups.size() == 5);
+            assertSame(5, groups.size());
 
             groups = AutomaticChoiceGroup.groupChoices(Arrays.asList(choiceKey1Group1, choiceKey1Group1bis));
-            assertTrue(groups.size() == 1);
+            assertSame(1, groups.size());
             AutomaticChoiceGroup group1 = groups.iterator().next();
             assertEquals(group1.key, choiceKey1Group1.key);
@@ -388,5 +389,5 @@
                 choiceKey1Group1, choiceKey1Group1bis, choiceKey1Group2, choiceKey1Group2bis,
                 choiceKey2Group1, choiceKey2Group1bis, choiceKey2Group2, choiceKey2Group2bis));
-            assertTrue(groups.size() == 4);
+            assertSame(4, groups.size());
             for (AutomaticChoiceGroup group: groups) {
                 for (AutomaticChoice choice: group.choices) {