Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPierre-Charles David2016-10-12 09:44:31 +0000
committerStephane Begaudeau2016-10-13 12:24:12 +0000
commit31c139c4e0933943f16ae5fb0b9d0dab5f125397 (patch)
tree257c871e417aecde39ff70e5dcfc1daadb317146 /tests
parent884e4c55a8d9d4b65b302e9aea8985d870147139 (diff)
downloadorg.eclipse.eef-31c139c4e0933943f16ae5fb0b9d0dab5f125397.tar.gz
org.eclipse.eef-31c139c4e0933943f16ae5fb0b9d0dab5f125397.tar.xz
org.eclipse.eef-31c139c4e0933943f16ae5fb0b9d0dab5f125397.zip
Revert "[496011] Defer the evaluation of select candidates"v1.7.1_RC1v1.7.1
This reverts commit efa5ed85bf4a038c35f769f579290cb1bc5094f3. Change-Id: Id9c7ced9f557dc8b5774bbf69cc8612642c5b730 Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.eef.tests/src/org/eclipse/eef/tests/internal/controllers/AbstractEEFControllerTests.java18
-rw-r--r--tests/org.eclipse.eef.tests/src/org/eclipse/eef/tests/internal/controllers/EEFSelectControllerTests.java3
2 files changed, 1 insertions, 20 deletions
diff --git a/tests/org.eclipse.eef.tests/src/org/eclipse/eef/tests/internal/controllers/AbstractEEFControllerTests.java b/tests/org.eclipse.eef.tests/src/org/eclipse/eef/tests/internal/controllers/AbstractEEFControllerTests.java
index d8b377e45..d1a1ca6b6 100644
--- a/tests/org.eclipse.eef.tests/src/org/eclipse/eef/tests/internal/controllers/AbstractEEFControllerTests.java
+++ b/tests/org.eclipse.eef.tests/src/org/eclipse/eef/tests/internal/controllers/AbstractEEFControllerTests.java
@@ -21,7 +21,6 @@ import org.eclipse.eef.EEFWidgetDescription;
import org.eclipse.eef.EefPackage;
import org.eclipse.eef.core.api.EEFExpressionUtils;
import org.eclipse.eef.core.api.EditingContextAdapter;
-import org.eclipse.eef.core.api.controllers.IEEFSelectController;
import org.eclipse.eef.core.api.controllers.IEEFWidgetController;
import org.eclipse.eef.tests.internal.AQLInterpreter;
import org.eclipse.eef.tests.internal.EEFDataTests;
@@ -40,6 +39,7 @@ import org.junit.Before;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsNull.notNullValue;
+
import static org.junit.Assert.assertTrue;
@@ -126,14 +126,6 @@ public abstract class AbstractEEFControllerTests {
assertThat(label, is(expectedLabel));
atomicBoolean.set(true);
});
- if (controller instanceof IEEFSelectController) {
- ((IEEFSelectController) controller).onNewCandidates(candidates -> {
- // do nothing
- });
- ((IEEFSelectController) controller).onNewValue(value -> {
- // do nothing
- });
- }
controller.refresh();
assertTrue(atomicBoolean.get());
}
@@ -145,14 +137,6 @@ public abstract class AbstractEEFControllerTests {
atomicBoolean.set(true);
});
controller.computeHelp();
- if (controller instanceof IEEFSelectController) {
- ((IEEFSelectController) controller).onNewCandidates(candidates -> {
- // do nothing
- });
- ((IEEFSelectController) controller).onNewValue(value -> {
- // do nothing
- });
- }
controller.refresh();
assertTrue(atomicBoolean.get());
}
diff --git a/tests/org.eclipse.eef.tests/src/org/eclipse/eef/tests/internal/controllers/EEFSelectControllerTests.java b/tests/org.eclipse.eef.tests/src/org/eclipse/eef/tests/internal/controllers/EEFSelectControllerTests.java
index c51151977..78e0a22bf 100644
--- a/tests/org.eclipse.eef.tests/src/org/eclipse/eef/tests/internal/controllers/EEFSelectControllerTests.java
+++ b/tests/org.eclipse.eef.tests/src/org/eclipse/eef/tests/internal/controllers/EEFSelectControllerTests.java
@@ -56,9 +56,6 @@ public class EEFSelectControllerTests extends AbstractEEFControllerTests {
public void testValue() {
AtomicBoolean atomicBoolean = new AtomicBoolean(false);
IEEFSelectController controller = this.selectController(EEFDataTests.EEFSELECTCONTROLLERTESTS_VALUE);
- controller.onNewCandidates(candidates -> {
- // do nothing
- });
controller.onNewValue(value -> {
assertThat(value, is("public")); //$NON-NLS-1$
atomicBoolean.set(true);

Back to the top