Skip to content
Snippets Groups Projects
Commit b6b7ab62 authored by Torsten Grote's avatar Torsten Grote
Browse files

Merge branch 'fix-plugin-manager-test' into 'master'

Fix test expectations

See merge request !651
parents 5d528fce 55e67462
No related branches found
No related tags found
No related merge requests found
...@@ -3,6 +3,7 @@ package org.briarproject.bramble.plugin; ...@@ -3,6 +3,7 @@ package org.briarproject.bramble.plugin;
import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventBus;
import org.briarproject.bramble.api.plugin.ConnectionManager; import org.briarproject.bramble.api.plugin.ConnectionManager;
import org.briarproject.bramble.api.plugin.PluginConfig; import org.briarproject.bramble.api.plugin.PluginConfig;
import org.briarproject.bramble.api.plugin.PluginException;
import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.TransportId;
import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback; import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
...@@ -79,7 +80,6 @@ public class PluginManagerImplTest extends BrambleTestCase { ...@@ -79,7 +80,6 @@ public class PluginManagerImplTest extends BrambleTestCase {
SimplexPluginCallback.class))); SimplexPluginCallback.class)));
will(returnValue(simplexPlugin)); // Created will(returnValue(simplexPlugin)); // Created
oneOf(simplexPlugin).start(); oneOf(simplexPlugin).start();
will(returnValue(true)); // Started
// Second simplex plugin // Second simplex plugin
oneOf(simplexFailFactory).getId(); oneOf(simplexFailFactory).getId();
will(returnValue(simplexFailId)); will(returnValue(simplexFailId));
...@@ -87,7 +87,7 @@ public class PluginManagerImplTest extends BrambleTestCase { ...@@ -87,7 +87,7 @@ public class PluginManagerImplTest extends BrambleTestCase {
SimplexPluginCallback.class))); SimplexPluginCallback.class)));
will(returnValue(simplexFailPlugin)); // Created will(returnValue(simplexFailPlugin)); // Created
oneOf(simplexFailPlugin).start(); oneOf(simplexFailPlugin).start();
will(returnValue(false)); // Failed to start will(throwException(new PluginException()));
// First duplex plugin // First duplex plugin
oneOf(pluginConfig).getDuplexFactories(); oneOf(pluginConfig).getDuplexFactories();
will(returnValue(Arrays.asList(duplexFactory, duplexFailFactory))); will(returnValue(Arrays.asList(duplexFactory, duplexFailFactory)));
...@@ -97,7 +97,6 @@ public class PluginManagerImplTest extends BrambleTestCase { ...@@ -97,7 +97,6 @@ public class PluginManagerImplTest extends BrambleTestCase {
DuplexPluginCallback.class))); DuplexPluginCallback.class)));
will(returnValue(duplexPlugin)); // Created will(returnValue(duplexPlugin)); // Created
oneOf(duplexPlugin).start(); oneOf(duplexPlugin).start();
will(returnValue(true)); // Started
// Second duplex plugin // Second duplex plugin
oneOf(duplexFailFactory).getId(); oneOf(duplexFailFactory).getId();
will(returnValue(duplexFailId)); will(returnValue(duplexFailId));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment