Skip to content

Commit 6e5b331

Browse files
SamCarlbergJLLeitschuh
authored andcommitted
FIx project serialization tests (#626)
1 parent b15bb29 commit 6e5b331

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

core/src/test/java/edu/wpi/grip/core/ManualPipelineRunner.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package edu.wpi.grip.core;
22

33
import com.google.common.eventbus.EventBus;
4+
import com.google.inject.Inject;
45

56
/*
67
* Do not extend this class. The object is registered in the constructor
78
*/
89
public final class ManualPipelineRunner extends PipelineRunner {
910

11+
@Inject
1012
public ManualPipelineRunner(EventBus eventBus, Pipeline pipeline) {
1113
super(eventBus, () -> pipeline);
1214
// This is fine because it is in a test
@@ -15,7 +17,8 @@ public ManualPipelineRunner(EventBus eventBus, Pipeline pipeline) {
1517

1618
@Override
1719
public PipelineRunner startAsync() {
18-
throw new UnsupportedOperationException();
20+
// NOPE
21+
return this;
1922
}
2023

2124
public void runPipeline() {

core/src/test/java/edu/wpi/grip/core/serialization/ProjectTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import edu.wpi.grip.core.ManualPipelineRunner;
77
import edu.wpi.grip.core.OperationMetaData;
88
import edu.wpi.grip.core.Pipeline;
9+
import edu.wpi.grip.core.PipelineRunner;
910
import edu.wpi.grip.core.Step;
1011
import edu.wpi.grip.core.events.ConnectionAddedEvent;
1112
import edu.wpi.grip.core.events.OperationAddedEvent;
@@ -77,7 +78,7 @@ public void setUp() throws Exception {
7778

7879
pipeline = injector.getInstance(Pipeline.class);
7980

80-
pipelineRunner = new ManualPipelineRunner(eventBus, pipeline);
81+
pipelineRunner = (ManualPipelineRunner) injector.getInstance(PipelineRunner.class);
8182

8283

8384
additionOperation = new OperationMetaData(AdditionOperation.DESCRIPTION, () -> new

core/src/test/java/edu/wpi/grip/util/GripCoreTestModule.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
import edu.wpi.grip.core.FileManager;
55
import edu.wpi.grip.core.GripCoreModule;
6+
import edu.wpi.grip.core.ManualPipelineRunner;
7+
import edu.wpi.grip.core.PipelineRunner;
68
import edu.wpi.grip.core.http.GripServer;
79
import edu.wpi.grip.core.http.GripServerTest;
810
import edu.wpi.grip.core.sources.CameraSource;
@@ -82,6 +84,7 @@ protected void configure() {
8284
// HTTP server injection bindings
8385
bind(GripServer.JettyServerFactory.class).to(GripServerTest.TestServerFactory.class);
8486
bind(GripServer.class).asEagerSingleton();
87+
bind(PipelineRunner.class).to(ManualPipelineRunner.class);
8588
}
8689

8790
@Override

0 commit comments

Comments
 (0)