Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-28 02:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove spamy CSCore prints in unit tests (#255)

Browse Source
This commit is contained in:
Banks T
2021-02-23 14:37:01 -05:00
committed by GitHub
parent 0b20111824
commit 4a2493ff2e
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
photon-core/src/main/java/org/photonvision/vision/processes/VisionSourceManager.java
View File

@@ -89,6 +89,10 @@ public class VisionSourceManager {
}
protected List<VisionSource> tryMatchUSBCamImpl() {
return tryMatchUSBCamImpl(true);
}
protected List<VisionSource> tryMatchUSBCamImpl(boolean createSources) {
// Detect cameras using CSCore
List<UsbCameraInfo> 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);

6
photon-core/src/test/java/org/photonvision/vision/processes/VisionSourceManagerTest.java
View File

@@ -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());