Skip to content
Snippets Groups Projects
Commit 8e2c0366 authored by Christian Wulf's avatar Christian Wulf
Browse files

Merge branch 'abort-init' into 'master'

Abort init

fixes #170

See merge request !51
parents 4f9044eb 1ee2e6fc
No related branches found
No related tags found
No related merge requests found
...@@ -40,12 +40,8 @@ public class RunnableProducerStageTest { ...@@ -40,12 +40,8 @@ public class RunnableProducerStageTest {
thread.start(); thread.start();
// Not running and not initialized
assertFalse(testStage.executed && testStage.initialized);
runnable.triggerInitializingSignal();
// Not running, but initialized // Not running, but initialized
assertFalse(testStage.executed && !testStage.initialized); assertFalse(testStage.executed);
runnable.triggerStartingSignal(); runnable.triggerStartingSignal();
thread.join(); thread.join();
......
...@@ -25,10 +25,4 @@ class RunnableTestStage extends AbstractProducerStage<Object> { ...@@ -25,10 +25,4 @@ class RunnableTestStage extends AbstractProducerStage<Object> {
this.terminate(); this.terminate();
} }
@Override
public void onInitializing() throws Exception {
super.onInitializing();
initialized = true;
}
} }
...@@ -27,7 +27,6 @@ import teetime.framework.AbstractInterThreadPipe; ...@@ -27,7 +27,6 @@ import teetime.framework.AbstractInterThreadPipe;
import teetime.framework.InputPort; import teetime.framework.InputPort;
import teetime.framework.OutputPort; import teetime.framework.OutputPort;
import teetime.framework.signal.ISignal; import teetime.framework.signal.ISignal;
import teetime.framework.signal.InitializingSignal;
import teetime.framework.signal.StartingSignal; import teetime.framework.signal.StartingSignal;
import teetime.framework.signal.TerminatingSignal; import teetime.framework.signal.TerminatingSignal;
import teetime.framework.signal.ValidatingSignal; import teetime.framework.signal.ValidatingSignal;
...@@ -47,14 +46,11 @@ public class SpScPipeTest { ...@@ -47,14 +46,11 @@ public class SpScPipeTest {
List<ISignal> signals = new ArrayList<ISignal>(); List<ISignal> signals = new ArrayList<ISignal>();
signals.add(new StartingSignal()); signals.add(new StartingSignal());
signals.add(new TerminatingSignal()); signals.add(new TerminatingSignal());
signals.add(new InitializingSignal());
signals.add(new ValidatingSignal()); signals.add(new ValidatingSignal());
signals.add(new StartingSignal()); signals.add(new StartingSignal());
signals.add(new TerminatingSignal()); signals.add(new TerminatingSignal());
signals.add(new InitializingSignal());
signals.add(new ValidatingSignal()); signals.add(new ValidatingSignal());
signals.add(new StartingSignal()); signals.add(new StartingSignal());
signals.add(new InitializingSignal());
signals.add(new TerminatingSignal()); signals.add(new TerminatingSignal());
signals.add(new ValidatingSignal()); signals.add(new ValidatingSignal());
......
...@@ -107,9 +107,6 @@ class MergerTestingPipe implements IPipe { ...@@ -107,9 +107,6 @@ class MergerTestingPipe implements IPipe {
@Override @Override
public void waitForStartSignal() throws InterruptedException {} public void waitForStartSignal() throws InterruptedException {}
@Override
public void waitForInitializingSignal() throws InterruptedException {}
@Override @Override
public void close() {} public void close() {}
......
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