Skip to content

Commit 324c351

Browse files
committed
test: merge Issue1899 check into existing collision test
1 parent 0400682 commit 324c351

File tree

3 files changed

+3
-134
lines changed

3 files changed

+3
-134
lines changed

tests/integration/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,15 +135,6 @@ if(TARGET dart-utils)
135135
target_link_libraries(test_Collision dart-collision-ode)
136136
endif()
137137

138-
dart_add_test("integration" test_Issue1899)
139-
target_link_libraries(test_Issue1899 dart-utils)
140-
if(TARGET dart-collision-bullet)
141-
target_link_libraries(test_Issue1899 dart-collision-bullet)
142-
endif()
143-
if(TARGET dart-collision-ode)
144-
target_link_libraries(test_Issue1899 dart-collision-ode)
145-
endif()
146-
147138
dart_add_test("integration" test_Dynamics)
148139
target_link_libraries(test_Dynamics dart-utils)
149140

tests/integration/test_Collision.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1586,6 +1586,9 @@ TEST_F(Collision, CollisionOfPrescribedJoints)
15861586
EXPECT_TRUE(joint5->isKinematic());
15871587
EXPECT_NEAR(joint5->getVelocity(0), joint5->getCommand(0), tol);
15881588

1589+
// The PASSIVE joint's command should have been cleared (Issue 1899).
1590+
EXPECT_EQ(joint2->getCommand(0), 0.0);
1591+
15891592
// The velocity and acceleration of locked joint always must be zero.
15901593
EXPECT_TRUE(joint6->isKinematic());
15911594
EXPECT_NEAR(joint6->getVelocity(0), 0.0, tol);

tests/integration/test_Issue1899.cpp

Lines changed: 0 additions & 125 deletions
This file was deleted.

0 commit comments

Comments
 (0)