Skip to content

Migrate ConformanceTestSuite and dependencies to JUnit 5 #3658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vogella wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate ConformanceTestSuite and dependencies to JUnit 5 #3658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 22 additions & 26 deletions ...rc/org/eclipse/jface/databinding/conformance/MutableObservableCollectionContractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.
Expand All @@ -58,7 +58,7 @@ public MutableObservableCollectionContractTest(
}

@Override
@Before
@BeforeEach
public void setUp() throws Exception {
super.setUp();
collection = (IObservableCollection) super.getObservable();
Expand Down Expand Up @@ -160,9 +160,8 @@ public void testRemoveAll_ChangeEventFiredAfterElementsAreRemoved()
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
Expand Down Expand Up @@ -205,20 +204,18 @@ public void testRetainAll_ChangeEventFiredAfterElementsAreRetained()
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
Expand Down Expand Up @@ -253,12 +250,11 @@ public void testClear_ChangeEventFiredAfterElementIsRemoved()
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."));
}

/**
Expand All @@ -277,11 +273,11 @@ public void testClear_ChangeEventFiredAfterElementIsRemoved()
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()));
}

/**
Expand All @@ -299,11 +295,11 @@ public void testClear_ChangeEventFiredAfterElementIsRemoved()
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 {
Expand Down
73 changes: 34 additions & 39 deletions ...ance/src/org/eclipse/jface/databinding/conformance/MutableObservableListContractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.
Expand Down Expand Up @@ -60,7 +59,7 @@ public MutableObservableListContractTest(
}

@Override
@Before
@BeforeEach
public void setUp() throws Exception {
super.setUp();
list = (IObservableList) getObservable();
Expand Down Expand Up @@ -186,7 +185,7 @@ public void testSet_ListChangeEvent() throws Exception {
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 }));
}

Expand All @@ -196,7 +195,7 @@ public void testSet_ChangeEventFiredAfterElementIsSet() throws Exception {
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);
}

Expand Down Expand Up @@ -229,13 +228,11 @@ public void testMove_NoChangeEventAtSameIndex() throws Exception {

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
Expand All @@ -245,7 +242,7 @@ public void testMove_ListChangeEvent() throws Exception {
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 }));
}

Expand Down Expand Up @@ -398,9 +395,9 @@ public void testClear_ListDiffEntry() throws Exception {
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,
Expand All @@ -416,32 +413,30 @@ private void assertListChangeEventFired(Runnable runnable,

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"));

}
}
60 changes: 29 additions & 31 deletions ...mance/src/org/eclipse/jface/databinding/conformance/MutableObservableSetContractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand All @@ -46,7 +46,7 @@ public MutableObservableSetContractTest(
}

@Override
@Before
@BeforeEach
public void setUp() throws Exception {
super.setUp();
set = (IObservableSet) getObservable();
Expand Down Expand Up @@ -206,22 +206,20 @@ private void assertSetChangeEventFired(Runnable runnable,

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."));
}

/**
Expand All @@ -235,12 +233,12 @@ private void assertAddDiffEntry(Runnable runnable, String methodName,
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."));
}

/**
Expand All @@ -254,11 +252,11 @@ private void assertRemoveDiffEntry(Runnable runnable, String methodName,
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."));
}
}
Loading
Loading