diff --git a/photon-core/src/main/java/org/photonvision/common/util/TestUtils.java b/photon-core/src/main/java/org/photonvision/common/util/TestUtils.java index 4e18ef8e1..b752f5067 100644 --- a/photon-core/src/main/java/org/photonvision/common/util/TestUtils.java +++ b/photon-core/src/main/java/org/photonvision/common/util/TestUtils.java @@ -135,7 +135,8 @@ public class TestUtils { } private static Path getResourcesFolderPath(boolean testMode) { - return Path.of("src", (testMode ? "main" : "test"), "resources").toAbsolutePath(); + return Path.of((testMode ? "photon-server/src/main" : "src/test"), "resources") + .toAbsolutePath(); } public static Path getTestMode2019ImagePath() { diff --git a/photon-core/src/test/java/org/photonvision/vision/pipeline/CirclePNPTest.java b/photon-core/src/test/java/org/photonvision/vision/pipeline/CirclePNPTest.java index cd264575c..d982ce508 100644 --- a/photon-core/src/test/java/org/photonvision/vision/pipeline/CirclePNPTest.java +++ b/photon-core/src/test/java/org/photonvision/vision/pipeline/CirclePNPTest.java @@ -58,7 +58,7 @@ public class CirclePNPTest { } private CameraCalibrationCoefficients getCoeffs(String filename) { - var cameraCalibration = TestUtils.getCoeffs(filename, true); + var cameraCalibration = TestUtils.getCoeffs(filename, false); checkCameraCoefficients(cameraCalibration); return cameraCalibration; } diff --git a/photon-core/src/test/java/org/photonvision/vision/pipeline/SolvePNPTest.java b/photon-core/src/test/java/org/photonvision/vision/pipeline/SolvePNPTest.java index 25f4717fb..5b5c61ace 100644 --- a/photon-core/src/test/java/org/photonvision/vision/pipeline/SolvePNPTest.java +++ b/photon-core/src/test/java/org/photonvision/vision/pipeline/SolvePNPTest.java @@ -61,7 +61,7 @@ public class SolvePNPTest { } private CameraCalibrationCoefficients getCoeffs(String filename) { - var cameraCalibration = TestUtils.getCoeffs(filename, true); + var cameraCalibration = TestUtils.getCoeffs(filename, false); checkCameraCoefficients(cameraCalibration); return cameraCalibration; } @@ -106,7 +106,7 @@ public class SolvePNPTest { TestUtils.getWPIImagePath(TestUtils.WPI2019Image.kCargoStraightDark48in, false), TestUtils.WPI2019Image.FOV, new Rotation2d(), - TestUtils.get2019LifeCamCoeffs(true)); + TestUtils.get2019LifeCamCoeffs(false)); CVPipelineResult pipelineResult; @@ -141,7 +141,7 @@ public class SolvePNPTest { TestUtils.getWPIImagePath(TestUtils.WPI2020Image.kBlueGoal_224in_Left, false), TestUtils.WPI2020Image.FOV, new Rotation2d(), - TestUtils.get2020LifeCamCoeffs(true)); + TestUtils.get2020LifeCamCoeffs(false)); CVPipelineResult pipelineResult = pipeline.run(frameProvider.get(), QuirkyCamera.DefaultCamera); printTestResults(pipelineResult); diff --git a/photon-core/src/main/resources/calibration/lifecam240p.json b/photon-core/src/test/resources/calibration/lifecam240p.json similarity index 100% rename from photon-core/src/main/resources/calibration/lifecam240p.json rename to photon-core/src/test/resources/calibration/lifecam240p.json diff --git a/photon-core/src/main/resources/calibration/lifecam480p.json b/photon-core/src/test/resources/calibration/lifecam480p.json similarity index 100% rename from photon-core/src/main/resources/calibration/lifecam480p.json rename to photon-core/src/test/resources/calibration/lifecam480p.json diff --git a/photon-server/src/main/java/org/photonvision/Main.java b/photon-server/src/main/java/org/photonvision/Main.java index a706319d4..03e4416ab 100644 --- a/photon-server/src/main/java/org/photonvision/Main.java +++ b/photon-server/src/main/java/org/photonvision/Main.java @@ -57,13 +57,11 @@ public class Main { final var options = new Options(); options.addOption("d", "debug", false, "Enable debug logging prints"); options.addOption("h", "help", false, "Show this help text and exit"); - if (!isRelease) { - options.addOption( - "t", - "test-mode", - false, - "Run in test mode with 2019 and 2020 WPI field images in place of cameras"); - } + options.addOption( + "t", + "test-mode", + false, + "Run in test mode with 2019 and 2020 WPI field images in place of cameras"); CommandLineParser parser = new DefaultParser(); CommandLine cmd = parser.parse(options, args);