Skip to content

Commit 40450c5

Browse files
committed
Only use networktables when we need it
1 parent d2e9bd8 commit 40450c5

File tree

4 files changed

+24
-5
lines changed

4 files changed

+24
-5
lines changed

core/src/test/java/edu/wpi/grip/core/operations/network/MockGripNetworkModule.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package edu.wpi.grip.core.operations.network;
22

3-
import edu.wpi.grip.core.operations.network.networktables.TestingNTManager;
43
import edu.wpi.grip.core.operations.network.ros.MockROSManager;
54
import edu.wpi.grip.core.operations.network.ros.ROSNetworkPublisherFactory;
65

@@ -25,6 +24,6 @@ protected void configure() {
2524

2625
bind(MapNetworkReceiverFactory.class)
2726
.annotatedWith(Names.named("ntManager"))
28-
.to(TestingNTManager.class);
27+
.to(MockNetworkReceiver.class);
2928
}
3029
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package edu.wpi.grip.core.operations.network;
2+
3+
public class MockNetworkReceiver implements MapNetworkReceiverFactory {
4+
5+
@Override
6+
public NetworkReceiver create(String path) {
7+
return null;
8+
}
9+
}

core/src/test/java/edu/wpi/grip/core/operations/network/networktables/TestingNTManager.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* This class encapsulates the way we map various settings to the global NetworkTables state.
1313
*/
1414
@Singleton
15-
public class TestingNTManager extends NTManager {
15+
public class TestingNTManager extends NTManager implements AutoCloseable {
1616

1717
private static final Logger logger = Logger.getLogger(TestingNTManager.class.getName());
1818

@@ -33,4 +33,9 @@ public TestingNTManager() {
3333
NetworkTable.initialize();
3434
}
3535

36+
@Override
37+
public void close() {
38+
NetworkTable.shutdown();
39+
}
40+
3641
}

core/src/test/java/edu/wpi/grip/core/sources/NetworkTableEntrySourceTest.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import edu.wpi.first.wpilibj.networktables.NetworkTablesJNI;
1111

1212
import org.junit.After;
13+
import org.junit.Before;
1314
import org.junit.Test;
1415

1516
import static org.junit.Assert.assertEquals;
@@ -20,9 +21,9 @@ public class NetworkTableEntrySourceTest {
2021

2122
private final EventBus eventBus;
2223
private final MockOutputSocketFactory osf;
23-
private final TestingNTManager testingNtManager;
2424

2525
private NetworkTableEntrySource source;
26+
private TestingNTManager testingNtManager;
2627

2728
private static final double TEST_NUMBER = 13.13;
2829
private static final String TEST_STRING = "Some test string";
@@ -33,6 +34,10 @@ public class NetworkTableEntrySourceTest {
3334
public NetworkTableEntrySourceTest() {
3435
eventBus = new EventBus();
3536
osf = new MockOutputSocketFactory(eventBus);
37+
}
38+
39+
@Before
40+
public void setUp() {
3641
testingNtManager = new TestingNTManager();
3742

3843
NetworkTablesJNI.putBoolean(BOOLEAN_PATH, true);
@@ -41,8 +46,9 @@ public NetworkTableEntrySourceTest() {
4146
}
4247

4348
@After
44-
public void cleanup() {
49+
public void tearDown() {
4550
eventBus.post(new SourceRemovedEvent(source));
51+
testingNtManager.close();
4652
}
4753

4854
@Test

0 commit comments

Comments
 (0)