Migrate ConformanceTestSuite and dependencies to JUnit 5

tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableCollectionContractTest.java

@@ -16,9 +16,9 @@
 
 package org.eclipse.jface.databinding.conformance;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -30,8 +30,8 @@
 import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;
 import org.eclipse.jface.databinding.conformance.util.CurrentRealm;
 import org.eclipse.jface.databinding.conformance.util.RealmTester;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Mutability tests for IObservableCollection.
@@ -58,46 +58,46 @@
 	}
 
 	@Override
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 		super.setUp();
 		collection = (IObservableCollection) super.getObservable();
 	}
 
 	@Test
 	public void testAdd_ChangeEvent() throws Exception {
 		assertChangeEventFired(() -> collection.add(delegate.createElement(collection)), "Collection.add(Object)",
 				collection);
 	}
 
 	@Test
 	public void testAdd_RealmCheck() throws Exception {
 		RealmTester.exerciseCurrent(() -> collection.add(delegate.createElement(collection)),
 				(CurrentRealm) collection.getRealm());
 	}
 
 	@Test
 	public void testAdd_ChangeEventFiredAfterElementIsAdded() throws Exception {
 		final Object element = delegate.createElement(collection);
 
 		assertContainsDuringChangeEvent(() -> collection.add(element), "Collection.add(Object)", collection, element);
 	}
 
 	@Test
 	public void testAddAll_ChangeEvent() throws Exception {
 		assertChangeEventFired(
 				() -> collection.addAll(Arrays.asList(new Object[] { delegate.createElement(collection) })),
 				"Collection.addAll(Collection)", collection);
 	}
 
 	@Test
 	public void testAddAll_RealmCheck() throws Exception {
 		RealmTester.exerciseCurrent(
 				() -> collection.addAll(Arrays.asList(new Object[] { delegate.createElement(collection) })),
 				(CurrentRealm) collection.getRealm());
 	}
 
 	@Test
 	public void testAddAll_ChangeEventFiredAfterElementsAreAdded()
 			throws Exception {
 		final Object element = delegate.createElement(collection);
@@ -106,7 +106,7 @@
 				"Collection.addAll(Collection)", collection, element);
 	}
 
 	@Test
 	public void testRemove_ChangeEvent() throws Exception {
 		final Object element = delegate.createElement(collection);
 		collection.add(element);
@@ -114,13 +114,13 @@
 		assertChangeEventFired(() -> collection.remove(element), "Collection.remove(Object)", collection);
 	}
 
 	@Test
 	public void testRemove_RealmCheck() throws Exception {
 		RealmTester.exerciseCurrent(() -> collection.remove(delegate.createElement(collection)),
 				(CurrentRealm) collection.getRealm());
 	}
 
 	@Test
 	public void testRemove_ChangeEventFiredAfterElementIsRemoved()
 			throws Exception {
 		final Object element = delegate.createElement(collection);
@@ -130,7 +130,7 @@
 				element);
 	}
 
 	@Test
 	public void testRemoveAll_ChangeEvent() throws Exception {
 		final Object element = delegate.createElement(collection);
 		collection.add(element);
@@ -139,14 +139,14 @@
 				"Collection.removeAll(Collection)", collection);
 	}
 
 	@Test
 	public void testRemoveAll_RealmCheck() throws Exception {
 		RealmTester.exerciseCurrent(
 				() -> collection.removeAll(Arrays.asList(new Object[] { delegate.createElement(collection) })),
 				(CurrentRealm) collection.getRealm());
 	}
 
 	@Test
 	public void testRemoveAll_ChangeEventFiredAfterElementsAreRemoved()
 			throws Exception {
 		final Object element = delegate.createElement(collection);
@@ -156,16 +156,15 @@
 				"Collection.removeAll(Collection)", collection, element);
 	}
 
 	@Test
 	public void testRemoveAll_NoChange() throws Exception {
 		ChangeEventTracker tracker = ChangeEventTracker.observe(collection);
 		collection.removeAll(Collections.EMPTY_LIST);
-		assertEquals(
-				"List.removeAll on an empty list should not fire a list change event",
-				0, tracker.count);
+		assertEquals(0, tracker.count,
+				"List.removeAll on an empty list should not fire a list change event");
 	}
 
 	@Test
 	public void testRetainAll_ChangeEvent() throws Exception {
 		final Object element1 = delegate.createElement(collection);
 		collection.add(element1);
@@ -176,13 +175,13 @@
 				"Collection.retainAll(Collection)", collection);
 	}
 
 	@Test
 	public void testRetainAll_RealmCheck() throws Exception {
 		RealmTester.exerciseCurrent(() -> collection.retainAll(Collections.EMPTY_LIST),
 				(CurrentRealm) collection.getRealm());
 	}
 
 	@Test
 	public void testRetainAll_ChangeEventFiredAfterElementsAreRetained()
 			throws Exception {
 		Object element1 = delegate.createElement(collection);
@@ -191,8 +190,8 @@
 		collection.add(element2);
 
 		// precondition
 		assertTrue(collection.contains(element1));
 		assertTrue(collection.contains(element2));
 
 		ContainsListener listener1 = new ContainsListener(collection, element1)
 				.init();
@@ -205,35 +204,33 @@
 		listener2.contains = true;
 
 		collection.retainAll(Arrays.asList(new Object[] { element1 }));
-		assertTrue(
-				formatFail("When Collection.retainAll(...) fires the change event the element should have been retained in the Collection."),
-				listener1.contains);
-		assertFalse(
-				formatFail("When Collection.retainAll(...) fires the change event the element should have been removed from the Collection."),
-				listener2.contains);
+		assertTrue(listener1.contains,
+				formatFail("When Collection.retainAll(...) fires the change event the element should have been retained in the Collection."));
+		assertFalse(listener2.contains,
+				formatFail("When Collection.retainAll(...) fires the change event the element should have been removed from the Collection."));
 	}
 
 	@Test
 	public void testRetainAll_NoChangeFiresNoChangeEvent() throws Exception {
 		ChangeEventTracker tracker = ChangeEventTracker.observe(collection);
 		collection.retainAll(Collections.EMPTY_LIST);
-		assertEquals("List.retainAll should not have fired a change event:", 0,
-				tracker.count);
+		assertEquals(0, tracker.count,
+				"List.retainAll should not have fired a change event:");
 	}
 
 	@Test
 	public void testClear_ChangeEvent() throws Exception {
 		collection.add(delegate.createElement(collection));
 
 		assertChangeEventFired(() -> collection.clear(), "List.clear()", collection);
 	}
 
 	@Test
 	public void testClear_RealmCheck() throws Exception {
 		RealmTester.exerciseCurrent(() -> collection.clear(), (CurrentRealm) collection.getRealm());
 	}
 
 	@Test
 	public void testClear_ChangeEventFiredAfterElementIsRemoved()
 			throws Exception {
 		Object element = delegate.createElement(collection);
@@ -253,12 +250,11 @@
 		ChangeEventTracker listener = ChangeEventTracker.observe(collection);
 		runnable.run();
 
-		assertEquals(formatFail(methodName + " should fire one ChangeEvent."),
-				1, listener.count);
-		assertEquals(
+		assertEquals(1, listener.count,
+				formatFail(methodName + " should fire one ChangeEvent."));
+		assertEquals(collection, listener.event.getObservable(),
 				formatFail(methodName
-						+ "'s change event observable should be the created Collection."),
-				collection, listener.event.getObservable());
+						+ "'s change event observable should be the created Collection."));
 	}
 
 	/**
@@ -271,17 +267,17 @@
 			Object elementNotContained) {
 
 		// precondition
 		assertTrue(collection.contains(elementNotContained));
 
 		ContainsListener listener = new ContainsListener(collection,
 				elementNotContained).init();
 		listener.contains = true;
 		collection.remove(elementNotContained);
-		assertFalse(
+		assertFalse(listener.contains,
 				formatFail(new StringBuilder("When ")
 						.append(methodName)
 						.append(" fires a change event the element should have been removed from the Collection.")
-						.toString()), listener.contains);
+						.toString()));
 	}
 
 	/**
@@ -296,14 +292,14 @@
 				elementContained).init();
 
 		// precondition
 		assertFalse(collection.contains(elementContained));
 		runnable.run();
 
-		assertTrue(
+		assertTrue(listener.contains,
 				formatFail(new StringBuilder("When ")
 						.append(methodName)
 						.append(" fires a change event the element should have been added to the Collection.")
-						.toString()), listener.contains);
+						.toString()));
 	}
 
 	/* package */static class ContainsListener implements IChangeListener {

tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableListContractTest.java

@@ -16,8 +16,8 @@
 
 package org.eclipse.jface.databinding.conformance;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,9 +30,8 @@
 import org.eclipse.jface.databinding.conformance.delegate.IObservableCollectionContractDelegate;
 import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;
 import org.eclipse.jface.databinding.conformance.util.ListChangeEventTracker;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Mutability tests for IObservableList.
@@ -60,20 +59,20 @@
 	}
 
 	@Override
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 		super.setUp();
 		list = (IObservableList) getObservable();
 	}
 
 	@Test
 	public void testAdd_ListChangeEvent() throws Exception {
 		final Object element = delegate.createElement(list);
 		assertListChangeEventFired(() -> list.add(element), "List.add(Object)", list,
 				Collections.singletonList(element));
 	}
 
 	@Test
 	public void testAdd_ListDiffEntry() throws Exception {
 		Object element0 = delegate.createElement(list);
 		list.add(element0);
@@ -83,19 +82,19 @@
 				Arrays.asList(new Object[] { element0, element1 }));
 	}
 
 	@Test
 	public void testAddAtIndex_ChangeEvent() throws Exception {
 		assertChangeEventFired(() -> list.add(0, delegate.createElement(list)), "List.add(int, Object)", list);
 	}
 
 	@Test
 	public void testAddAtIndex_ListChangeEvent() throws Exception {
 		final Object element = delegate.createElement(list);
 		assertListChangeEventFired(() -> list.add(0, element), "List.add(int, Object)", list,
 				Collections.singletonList(element));
 	}
 
 	@Test
 	public void testAddAtIndex_ChangeEventFiredAfterElementIsAdded()
 			throws Exception {
 		final Object element = delegate.createElement(list);
@@ -103,7 +102,7 @@
 		assertContainsDuringChangeEvent(() -> list.add(0, element), "List.add(int, Collection)", list, element);
 	}
 
 	@Test
 	public void testAddAtIndex_ListDiffEntry() throws Exception {
 		Object element0 = delegate.createElement(list);
 		list.add(element0);
@@ -113,14 +112,14 @@
 				Arrays.asList(new Object[] { element0, element1 }));
 	}
 
 	@Test
 	public void testAddAll_ListChangeEvent() throws Exception {
 		final Object element = delegate.createElement(list);
 		assertListChangeEventFired(() -> list.addAll(Collections.singletonList(element)), "List.addAll(Collection",
 				list, Collections.singletonList(element));
 	}
 
 	@Test
 	public void testAddAll_ListDiffEntry() throws Exception {
 		final Object element = delegate.createElement(list);
 
@@ -128,7 +127,7 @@
 				list, Collections.singletonList(element));
 	}
 
 	@Test
 	public void testAddAll_ListDiffEntry2() throws Exception {
 		final Object element0 = delegate.createElement(list);
 		list.add(element0);
@@ -139,13 +138,13 @@
 				Arrays.asList(new Object[] { element0, element1 }));
 	}
 
 	@Test
 	public void testAddAllAtIndex_ChangeEvent() throws Exception {
 		assertChangeEventFired(() -> list.addAll(0, Arrays.asList(new Object[] { delegate.createElement(list) })),
 				"List.addAll(int, Collection)", list);
 	}
 
 	@Test
 	public void testAddAllAtIndex_ListChangeEvent() throws Exception {
 		final Object element = delegate.createElement(list);
 		assertListChangeEventFired(() -> list.addAll(0, Collections.singletonList(element)),
@@ -153,7 +152,7 @@
 				Collections.singletonList(element));
 	}
 
 	@Test
 	public void testAddAllAtIndex_ChangeEventFiredAfterElementIsAdded()
 			throws Exception {
 		final Object element = delegate.createElement(list);
@@ -162,7 +161,7 @@
 				"List.addAll(int, Collection)", list, element);
 	}
 
 	@Test
 	public void testAddAllAtIndex_ListDiffEntry() throws Exception {
 		Object element0 = delegate.createElement(list);
 		list.add(element0);
@@ -173,34 +172,34 @@
 				Arrays.asList(new Object[] { element0, element1 }));
 	}
 
 	@Test
 	public void testSet_ChangeEvent() throws Exception {
 		list.add(delegate.createElement(list));
 
 		assertChangeEventFired(() -> list.set(0, delegate.createElement(list)), "List.set(int, Object)", list);
 	}
 
 	@Test
 	public void testSet_ListChangeEvent() throws Exception {
 		final Object element0 = delegate.createElement(list);
 		list.add(element0);
 		final Object element1 = delegate.createElement(list);
 
-		assertListChangeEventFired(() -> assertSame(element0, list.set(0, element1)), "List.set(int, Object)", list,
+		assertListChangeEventFired(() -> assertSame(element0, list.set(0, element1), "List.set(int, Object)"), "List.set(int, Object)", list,
 				Arrays.asList(new Object[] { element1 }));
 	}
 
 	@Test
 	public void testSet_ChangeEventFiredAfterElementIsSet() throws Exception {
 		final Object element1 = delegate.createElement(list);
 		list.add(element1);
 		final Object element2 = delegate.createElement(list);
 
-		assertContainsDuringChangeEvent(() -> assertSame(element1, list.set(0, element2)), "List.set(int, Object)",
+		assertContainsDuringChangeEvent(() -> assertSame(element1, list.set(0, element2), "List.set(int, Object)"), "List.set(int, Object)",
 				list, element2);
 	}
 
 	@Test
 	public void testSet_ListChangeEvent2() throws Exception {
 		Object element0 = delegate.createElement(list);
 		list.add(element0);
@@ -212,7 +211,7 @@
 				Arrays.asList(new Object[] { element0, newElement1 }));
 	}
 
 	@Test
 	public void testMove_ChangeEvent() throws Exception {
 		list.add(delegate.createElement(list));
 		list.add(delegate.createElement(list));
@@ -220,7 +219,7 @@
 		assertChangeEventFired(() -> list.move(0, 1), "IObservableList.move(int, int)", list);
 	}
 
 	@Test
 	public void testMove_NoChangeEventAtSameIndex() throws Exception {
 		Object element = delegate.createElement(list);
 		list.add(element);
@@ -229,43 +228,41 @@
 
 		final Object movedElement = list.move(0, 0);
 
-		assertEquals(
-				formatFail("IObservableList.move(int,int) should return the moved element"),
-				element, movedElement);
-		assertEquals(
+		assertEquals(element, movedElement,
+				formatFail("IObservableList.move(int,int) should return the moved element"));
+		assertEquals(0, tracker.count,
 				formatFail("IObservableLIst.move(int,int) should not fire a change event"
-						+ "when the old and new indices are the same"), 0,
-				tracker.count);
+						+ "when the old and new indices are the same"));
 	}
 
 	@Test
 	public void testMove_ListChangeEvent() throws Exception {
 		final Object element0 = delegate.createElement(list);
 		list.add(element0);
 		final Object element1 = delegate.createElement(list);
 		list.add(element1);
 
-		assertListChangeEventFired(() -> assertSame(element0, list.move(0, 1)), "IObservableList.move(int, int)", list,
+		assertListChangeEventFired(() -> assertSame(element0, list.move(0, 1), "IObservableList.move(int, int)"), "IObservableList.move(int, int)", list,
 				Arrays.asList(new Object[] { element1, element0 }));
 	}
 
 	@Test
 	public void testMove_ChangeEventFiredAfterElementIsMoved() throws Exception {
 		Object element0 = delegate.createElement(list);
 		Object element1 = delegate.createElement(list);
 		list.add(element0);
 		list.add(element1);
 
 		assertSame(element0, list.get(0));
 		assertSame(element1, list.get(1));
 
 		list.move(0, 1);
 
 		assertSame(element1, list.get(0));
 		assertSame(element0, list.get(1));
 	}
 
 	@Test
 	public void testMove_ListChangeEvent2() {
 		Object element0 = delegate.createElement(list);
 		list.add(element0);
@@ -276,7 +273,7 @@
 				Arrays.asList(new Object[] { element1, element0 }));
 	}
 
 	@Test
 	public void testRemove_ListChangeEvent() throws Exception {
 		final Object element = delegate.createElement(list);
 		list.add(element);
@@ -284,7 +281,7 @@
 		assertListChangeEventFired(() -> list.remove(element), "List.remove(Object)", list, Collections.EMPTY_LIST);
 	}
 
 	@Test
 	public void testRemove_ListDiffEntry() throws Exception {
 		final Object element0 = delegate.createElement(list);
 		list.add(element0);
@@ -295,21 +292,21 @@
 				Collections.singletonList(element0));
 	}
 
 	@Test
 	public void testRemoveAtIndex_ChangeEvent() throws Exception {
 		list.add(delegate.createElement(list));
 
 		assertChangeEventFired(() -> list.remove(0), "List.remove(int)", list);
 	}
 
 	@Test
 	public void testRemoveAtIndex_ListChangeEvent() throws Exception {
 		list.add(delegate.createElement(list));
 
 		assertListChangeEventFired(() -> list.remove(0), "List.remove(int)", list, Collections.EMPTY_LIST);
 	}
 
 	@Test
 	public void testRemoveAtIndex_ChangeEventFiredAfterElementIsRemoved()
 			throws Exception {
 		final Object element = delegate.createElement(list);
@@ -318,7 +315,7 @@
 		assertDoesNotContainDuringChangeEvent(() -> list.remove(0), "List.remove(int)", list, element);
 	}
 
 	@Test
 	public void testRemoveAtIndex_ListDiffEntry() throws Exception {
 		Object element0 = delegate.createElement(list);
 		list.add(element0);
@@ -328,7 +325,7 @@
 		assertListChangeEventFired(() -> list.remove(1), "List.remove(int)", list, Collections.singletonList(element0));
 	}
 
 	@Test
 	public void testRemoveAll_ListChangeEvent() throws Exception {
 		final Object element = delegate.createElement(list);
 		list.add(element);
@@ -337,7 +334,7 @@
 				"List.removeAll(Collection)", list, Collections.EMPTY_LIST);
 	}
 
 	@Test
 	public void testRemoveAll_ListDiffEntry() throws Exception {
 		final Object element = delegate.createElement(list);
 		list.add(element);
@@ -346,7 +343,7 @@
 				"List.removeAll(Collection)", list, Collections.EMPTY_LIST);
 	}
 
 	@Test
 	public void testRemoveAll_ListDiffEntry2() throws Exception {
 		Object element0 = delegate.createElement(list);
 		list.add(element0);
@@ -358,7 +355,7 @@
 				Collections.singletonList(element0));
 	}
 
 	@Test
 	public void testRetainAll_ListChangeEvent() throws Exception {
 		final Object element0 = delegate.createElement(list);
 		list.add(element0);
@@ -369,7 +366,7 @@
 				Collections.singletonList(element0));
 	}
 
 	@Test
 	public void testRetainAll_ListDiffEntry() throws Exception {
 		final Object element = delegate.createElement(list);
 		list.add(element);
@@ -380,27 +377,27 @@
 				Collections.singletonList(element));
 	}
 
 	@Test
 	public void testClear_ListChangeEvent() throws Exception {
 		list.add(delegate.createElement(list));
 
 		assertListChangeEventFired(() -> list.clear(), "List.clear()", list, Collections.EMPTY_LIST);
 	}
 
 	@Test
 	public void testClear_ListDiffEntry() throws Exception {
 		list.add(delegate.createElement(list));
 
 		assertListChangeEventFired(() -> list.clear(), "List.clear()", list, Collections.EMPTY_LIST);
 	}
 
 	@Test
 	public void testClear_ClearsList() {
 		Object element = delegate.createElement(list);
 		list.add(element);
-		Assert.assertEquals(Collections.singletonList(element), list);
+		assertEquals(Collections.singletonList(element), list);
 		list.clear();
-		Assert.assertEquals(Collections.EMPTY_LIST, list);
+		assertEquals(Collections.EMPTY_LIST, list);
 	}
 
 	private void assertListChangeEventFired(Runnable runnable,
@@ -416,32 +413,30 @@
 
 		runnable.run();
 
-		assertEquals(formatFail(methodName
-				+ " should fire one ListChangeEvent."), 1, listListener.count);
-		assertEquals(formatFail(methodName
-				+ "'s change event observable should be the created List."),
-				list, listListener.event.getObservable());
-
-		assertEquals(
-				formatFail("Two notifications should have been received."), 2,
-				queue.size());
-		assertEquals("ChangeEvent of " + methodName
-				+ " should have fired before the ListChangeEvent.",
-				changeListener, queue.get(0));
-		assertEquals("ListChangeEvent of " + methodName
-				+ " should have fired after the ChangeEvent.", listListener,
-				queue.get(1));
-
-		assertEquals(formatFail(methodName
-				+ " did not leave observable list with the expected contents"),
-				newList, list);
+		assertEquals(1, listListener.count, formatFail(methodName
+				+ " should fire one ListChangeEvent."));
+		assertEquals(list, listListener.event.getObservable(),
+				formatFail(methodName
+				+ "'s change event observable should be the created List."));
+
+		assertEquals(2, queue.size(),
+				formatFail("Two notifications should have been received."));
+		assertEquals(changeListener, queue.get(0),
+				"ChangeEvent of " + methodName
+				+ " should have fired before the ListChangeEvent.");
+		assertEquals(listListener, queue.get(1),
+				"ListChangeEvent of " + methodName
+				+ " should have fired after the ChangeEvent.");
+
+		assertEquals(newList, list,
+				formatFail(methodName
+				+ " did not leave observable list with the expected contents"));
 
 		ListDiff diff = listListener.event.diff;
 		diff.applyTo(oldList);
-		assertEquals(
+		assertEquals(newList, oldList,
 				formatFail(methodName
-						+ " fired a diff which does not represent the expected list change"),
-				newList, oldList);
+						+ " fired a diff which does not represent the expected list change"));
 
 	}
 }

tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/MutableObservableSetContractTest.java

@@ -16,8 +16,8 @@
 
 package org.eclipse.jface.databinding.conformance;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,8 +30,8 @@
 import org.eclipse.jface.databinding.conformance.delegate.IObservableCollectionContractDelegate;
 import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;
 import org.eclipse.jface.databinding.conformance.util.SetChangeEventTracker;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class MutableObservableSetContractTest extends
 		MutableObservableCollectionContractTest {
@@ -46,18 +46,18 @@
 	}
 
 	@Override
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 		super.setUp();
 		set = (IObservableSet) getObservable();
 	}
 
 	@Test
 	public void testAdd_SetChangeEvent() throws Exception {
 		assertSetChangeEventFired(() -> set.add(delegate.createElement(set)), "Set.add(Object)", set);
 	}
 
 	@Test
 	public void testAdd_SetDiffEntry() throws Exception {
 		set.add(delegate.createElement(set));
 		final Object element = delegate.createElement(set);
@@ -65,18 +65,18 @@
 		assertAddDiffEntry(() -> set.add(element), "Set.add(Object)", set, element);
 	}
 
 	@Test
 	public void testAdd_GetterCalled() throws Exception {
 		assertGetterCalled(() -> set.add(delegate.createElement(set)), "Set.add(Object)", set);
 	}
 
 	@Test
 	public void testAddAll_SetChangeEvent() throws Exception {
 		assertSetChangeEventFired(() -> set.addAll(Arrays.asList(new Object[] { delegate.createElement(set) })),
 				"Set.addAll(Collection", set);
 	}
 
 	@Test
 	public void testAddAll_SetDiffEntry() throws Exception {
 		final Object element = delegate.createElement(set);
 
@@ -84,13 +84,13 @@
 				element);
 	}
 
 	@Test
 	public void testAddAll_GetterCalled() throws Exception {
 		assertGetterCalled(() -> set.addAll(Collections.singleton(delegate.createElement(set))),
 				"Set.addAll(Collection)", set);
 	}
 
 	@Test
 	public void testRemove_SetChangeEvent() throws Exception {
 		final Object element = delegate.createElement(set);
 		set.add(element);
@@ -98,7 +98,7 @@
 		assertSetChangeEventFired(() -> set.remove(element), "Set.remove(Object)", set);
 	}
 
 	@Test
 	public void testRemove_SetDiffEntry() throws Exception {
 		set.add(delegate.createElement(set));
 		final Object element = delegate.createElement(set);
@@ -107,14 +107,14 @@
 		assertRemoveDiffEntry(() -> set.remove(element), "Set.remove(Object)", set, element);
 	}
 
 	@Test
 	public void testRemove_GetterCalled() throws Exception {
 		final Object element = delegate.createElement(set);
 		set.add(element);
 		assertGetterCalled(() -> set.remove(element), "Set.remove(Object)", set);
 	}
 
 	@Test
 	public void testRemoveAll_SetChangeEvent() throws Exception {
 		final Object element = delegate.createElement(set);
 		set.add(element);
@@ -123,7 +123,7 @@
 				"Set.removeAll(Collection)", set);
 	}
 
 	@Test
 	public void testRemoveAll_SetDiffEntry() throws Exception {
 		final Object element = delegate.createElement(set);
 		set.add(element);
@@ -132,14 +132,14 @@
 				set, element);
 	}
 
 	@Test
 	public void testRemoveAll_GetterCalled() throws Exception {
 		final Object element = delegate.createElement(set);
 		set.add(element);
 		assertGetterCalled(() -> set.removeAll(Collections.singleton(element)), "Set.removeAll(Collection)", set);
 	}
 
 	@Test
 	public void testRetainAll_SetChangeEvent() throws Exception {
 		final Object element1 = delegate.createElement(set);
 		set.add(element1);
@@ -149,7 +149,7 @@
 				"Set.retainAll(Collection", set);
 	}
 
 	@Test
 	public void testRetainAll_SetDiffEntry() throws Exception {
 		final Object element1 = delegate.createElement(set);
 		set.add(element1);
@@ -160,20 +160,20 @@
 				"Set.retainAll(Collection)", set, element2);
 	}
 
 	@Test
 	public void testRetainAll_GetterCalled() throws Exception {
 		set.add(delegate.createElement(set));
 		assertGetterCalled(() -> set.retainAll(Collections.EMPTY_SET), "Set.retainAll(Collection)", set);
 	}
 
 	@Test
 	public void testClear_SetChangeEvent() throws Exception {
 		set.add(delegate.createElement(set));
 
 		assertSetChangeEventFired(() -> set.clear(), "Set.clear()", set);
 	}
 
 	@Test
 	public void testClear_SetDiffEntry() throws Exception {
 		Object element = delegate.createElement(set);
 		set.add(element);
@@ -181,7 +181,7 @@
 		assertRemoveDiffEntry(() -> set.clear(), "Set.clear()", set, element);
 	}
 
 	@Test
 	public void testClear_GetterCalled() throws Exception {
 		set.add(delegate.createElement(set));
 		assertGetterCalled(() -> set.clear(), "Set.clear()", set);
@@ -206,22 +206,20 @@
 
 		runnable.run();
 
-		assertEquals(
-				formatFail(methodName + " should fire one SetChangeEvent."), 1,
-				setListener.count);
-		assertEquals(formatFail(methodName
-				+ "'s change event observable should be the created Set."),
-				set, setListener.event.getObservable());
-
-		assertEquals(
-				formatFail("Two notifications should have been received."), 2,
-				queue.size());
-		assertEquals(formatFail("ChangeEvent of " + methodName
-				+ " should have fired before the SetChangeEvent."),
-				changeListener, queue.get(0));
-		assertEquals(formatFail("SetChangeEvent of " + methodName
-				+ " should have fired after the ChangeEvent."), setListener,
-				queue.get(1));
+		assertEquals(1, setListener.count,
+				formatFail(methodName + " should fire one SetChangeEvent."));
+		assertEquals(set, setListener.event.getObservable(),
+				formatFail(methodName
+				+ "'s change event observable should be the created Set."));
+
+		assertEquals(2, queue.size(),
+				formatFail("Two notifications should have been received."));
+		assertEquals(changeListener, queue.get(0),
+				formatFail("ChangeEvent of " + methodName
+				+ " should have fired before the SetChangeEvent."));
+		assertEquals(setListener, queue.get(1),
+				formatFail("SetChangeEvent of " + methodName
+				+ " should have fired after the ChangeEvent."));
 	}
 
 	/**
@@ -235,12 +233,12 @@
 		runnable.run();
 
 		Set entries = listener.event.diff.getAdditions();
-		assertEquals(formatFail(methodName
-				+ " should result in one diff entry."), 1, entries.size());
+		assertEquals(1, entries.size(), formatFail(methodName
+				+ " should result in one diff entry."));
 
-		assertTrue(formatFail(methodName
-				+ " should result in a diff entry that is an addition."),
-				entries.contains(element));
+		assertTrue(entries.contains(element),
+				formatFail(methodName
+				+ " should result in a diff entry that is an addition."));
 	}
 
 	/**
@@ -254,11 +252,11 @@
 		runnable.run();
 
 		Set entries = listener.event.diff.getRemovals();
-		assertEquals(formatFail(methodName
-				+ " should result in one diff entry."), 1, entries.size());
+		assertEquals(1, entries.size(), formatFail(methodName
+				+ " should result in one diff entry."));
 
-		assertTrue(formatFail(methodName
-				+ " should result in a diff entry that is a removal."),
-				entries.contains(element));
+		assertTrue(entries.contains(element),
+				formatFail(methodName
+				+ " should result in a diff entry that is a removal."));
 	}
 }