From 4a2493ff2ed857093a7a4029a74771f4a10674bc Mon Sep 17 00:00:00 2001 From: Banks T Date: Tue, 23 Feb 2021 14:37:01 -0500 Subject: [PATCH] Remove spamy CSCore prints in unit tests (#255) --- .../vision/processes/VisionSourceManager.java | 9 +++++++++ .../vision/processes/VisionSourceManagerTest.java | 6 ++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/photon-core/src/main/java/org/photonvision/vision/processes/VisionSourceManager.java b/photon-core/src/main/java/org/photonvision/vision/processes/VisionSourceManager.java index 6cdc5e9e4..f8c8568c5 100644 --- a/photon-core/src/main/java/org/photonvision/vision/processes/VisionSourceManager.java +++ b/photon-core/src/main/java/org/photonvision/vision/processes/VisionSourceManager.java @@ -89,6 +89,10 @@ public class VisionSourceManager { } protected List tryMatchUSBCamImpl() { + return tryMatchUSBCamImpl(true); + } + + protected List tryMatchUSBCamImpl(boolean createSources) { // Detect cameras using CSCore List connectedCameras = new ArrayList<>(filterAllowedDevices(cameraInfoSupplier.get())); @@ -151,6 +155,11 @@ public class VisionSourceManager { } if (matchedCameras.isEmpty()) return null; + // for unit tests only! + if (!createSources) { + return List.of(); + } + // Turn these camera configs into vision sources var sources = loadVisionSourcesFromCamConfigs(matchedCameras); diff --git a/photon-core/src/test/java/org/photonvision/vision/processes/VisionSourceManagerTest.java b/photon-core/src/test/java/org/photonvision/vision/processes/VisionSourceManagerTest.java index efed80d14..af6831a3a 100644 --- a/photon-core/src/test/java/org/photonvision/vision/processes/VisionSourceManagerTest.java +++ b/photon-core/src/test/java/org/photonvision/vision/processes/VisionSourceManagerTest.java @@ -47,8 +47,7 @@ public class VisionSourceManagerTest { infoList.add(info1); inst.registerLoadedConfigs(config); - inst.tryMatchUSBCamImpl(); - inst.tryMatchUSBCamImpl(); + var sources = inst.tryMatchUSBCamImpl(false); assertTrue(inst.knownUsbCameras.contains(info1)); assertEquals(1, inst.unmatchedLoadedConfigs.size()); @@ -56,8 +55,7 @@ public class VisionSourceManagerTest { UsbCameraInfo info2 = new UsbCameraInfo(0, "dev/video1", "secondTestVideo", new String[0], 2, 1); infoList.add(info2); - - inst.tryMatchUSBCamImpl(); + inst.tryMatchUSBCamImpl(false); assertTrue(inst.knownUsbCameras.contains(info2)); assertEquals(2, inst.knownUsbCameras.size());