Fix tests (that I broke :D)

opensim-org · Dec 15, 2023 · cff100e · cff100e
1 parent bf522b6
commit cff100e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/OpenSim/Common/Component.cpp b/OpenSim/Common/Component.cpp
@@ -171,7 +171,8 @@ void Component::prependComponentPathToConnecteePath(
             // available in the root component. For list sockets, we assume that
             // checking the first connectee path is sufficient, since all
             // connectees in the list must be from the same component.
-            if (!root.hasComponent(it.second->getConnecteePath(0))) {
+            if (it.second->getNumConnectees() &&
+                    !root.hasComponent(it.second->getConnecteePath(0))) {
                 it.second->prependComponentPathToConnecteePath(compPath);
             }
         }

diff --git a/OpenSim/Common/Component.h b/OpenSim/Common/Component.h
@@ -3461,6 +3461,7 @@ void Socket<C>::finalizeConnection(const Component& root) {
                     connecteePath.getSubcomponentNameAtLevel(0) == "..")
                 connecteePath = connectee->getAbsolutePath();
 
+            // appendConnecteePath(connecteePath.toString());
             if (isListSocket()) {
                 updConnecteePathProp().appendValue(connecteePath.toString());
             } else {
@@ -3569,7 +3570,7 @@ void Input<T>::finalizeConnection(const Component& root) {
                                                 chan->getChannelName() :
                                                 "",
                                                 _aliases[i]);
-
+            // appendConnecteePath(pathStr);
             if (isListSocket())
                 updConnecteePathProp().appendValue(pathStr);
             else

diff --git a/OpenSim/Common/Test/testComponentInterface.cpp b/OpenSim/Common/Test/testComponentInterface.cpp
@@ -992,8 +992,7 @@ TEST_CASE("Component Interface Sockets")
     theWorld.add(&bar);
 
     SECTION("Sockets not connected") {
-        CHECK_THROWS_WITH(theWorld.connect(),
-            Catch::Matchers::Contains("Socket childFoo of type Foo"));
+        CHECK_THROWS(theWorld.connect());
     }
 
     // Connect the single-object sockets.