Update tests to use SendableChooserSim

wpilibsuite · Jun 22, 2024 · f28b76f · f28b76f
1 parent 362747b
commit f28b76f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 22 deletions.
diff --git a/wpilibc/src/test/native/cpp/smartdashboard/SendableChooserTest.cpp b/wpilibc/src/test/native/cpp/smartdashboard/SendableChooserTest.cpp
@@ -59,6 +59,8 @@ TEST(SendableChooserTest,
 
 TEST(SendableChooserTest, ChangeListener) {
   frc::SendableChooser<int> chooser;
+  frc::sim::SendableChooserSim chooserSim = frc::sim::SendableChooserSim{
+      fmt::format("/SmartDashboard/ChangeListenerChooser/", GetParam())};
 
   for (int i = 1; i <= 3; i++) {
     chooser.AddOption(std::to_string(i), i);
@@ -68,7 +70,7 @@ TEST(SendableChooserTest, ChangeListener) {
 
   frc::SmartDashboard::PutData("ChangeListenerChooser", &chooser);
   frc::SmartDashboard::UpdateValues();
-  frc::SmartDashboard::PutString("ChangeListenerChooser/selected", "3");
+  chooserSim.SetSelected("3");
   frc::SmartDashboard::UpdateValues();
 
   EXPECT_EQ(3, currentVal);

diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/smartdashboard/SendableChooserTest.java b/wpilibj/src/test/java/edu/wpi/first/wpilibj/smartdashboard/SendableChooserTest.java
@@ -70,7 +70,8 @@ void nullIsReturnedOnNoSelectAndNoDefault() {
 
   @Test
   void testChangeListener() {
-    try (var chooser = new SendableChooser<Integer>()) {
+    try (var chooser = new SendableChooser<Integer>();
+        var chooserSim = new SendableChooserSim(m_inst, "/SmartDashboard/changeListenerChooser/")) {
       for (int i = 1; i <= 3; i++) {
         chooser.addOption(String.valueOf(i), i);
       }
@@ -79,31 +80,12 @@ void testChangeListener() {
 
       SmartDashboard.putData("changeListenerChooser", chooser);
       SmartDashboard.updateValues();
-      SmartDashboard.putString("changeListenerChooser/selected", "3");
+      chooserSim.setSelected("3");
       SmartDashboard.updateValues();
       assertEquals(3, currentVal.get());
     }
   }
 
-  @ValueSource(ints = {0, 1, 2, 3})
-  @ParameterizedTest
-  void testSendableChooserSim(int toSelect) {
-    try (var chooser = new SendableChooser<Integer>();
-        var chooserSim =
-            new SendableChooserSim(m_inst, "/SmartDashboard/SendableChooserSim" + toSelect + "/")) {
-      for (int i = 1; i <= 3; i++) {
-        chooser.addOption(String.valueOf(i), i);
-      }
-      chooser.setDefaultOption(String.valueOf(0), 0);
-
-      SmartDashboard.putData("SendableChooserSim" + toSelect, chooser);
-      SmartDashboard.updateValues();
-      chooserSim.setSelected(String.valueOf(toSelect));
-      SmartDashboard.updateValues();
-      assertEquals(toSelect, chooser.getSelected());
-    }
-  }
-
   @AfterEach
   void tearDown() {
     m_inst.close();