UI 3d mode, ConfigManager bugfixes (#103)

* stupid bugs I guess idk where else to put this commit

* Run spotless

* Fix config file loading

Splits load into own method

* Run spotless
This commit is contained in:
Matt
2020-08-26 10:03:56 -07:00
committed by GitHub
parent fea72e18bf
commit 9f0e89ea29
13 changed files with 105 additions and 36 deletions

View File

@@ -34,10 +34,6 @@ import org.photonvision.vision.target.TargetModel;
public class ConfigTest {
static {
TestUtils.loadLibraries();
}
private static ConfigManager configMgr;
private static final CameraConfiguration cameraConfig =
new CameraConfiguration("TestCamera", "/dev/video420");
@@ -48,6 +44,7 @@ public class ConfigTest {
public static void init() {
TestUtils.loadLibraries();
configMgr = new ConfigManager(Path.of("testconfigdir"));
configMgr.load();
Logger.setLevel(LogGroup.General, LogLevel.TRACE);
REFLECTIVE_PIPELINE_SETTINGS = new ReflectivePipelineSettings();
@@ -65,7 +62,7 @@ public class ConfigTest {
@Test
@Order(1)
public void serializeConfig() throws IOException {
public void serializeConfig() {
TestUtils.loadLibraries();
Logger.setLevel(LogGroup.General, LogLevel.TRACE);

View File

@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.List;
import org.junit.jupiter.api.*;
import org.photonvision.common.configuration.CameraConfiguration;
import org.photonvision.common.configuration.ConfigManager;
import org.photonvision.common.dataflow.CVPipelineResultConsumer;
import org.photonvision.common.util.TestUtils;
import org.photonvision.vision.frame.FrameProvider;
@@ -103,6 +104,7 @@ public class VisionModuleManagerTest {
@Test
public void setupManager() {
ConfigManager.getInstance().load();
var sources = new HashMap<VisionSource, List<CVPipelineSettings>>();
sources.put(
new TestSource(