From 2945b273cf0f868822c27b29680a17604035f604 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Sun, 19 Mar 2017 12:30:37 -0400 Subject: [PATCH] Use gtest_main (#856) --- unittests/CMakeLists.txt | 8 +++- unittests/comprehensive/test_Building.cpp | 7 ---- unittests/comprehensive/test_Collision.cpp | 8 ---- unittests/comprehensive/test_Common.cpp | 8 ---- unittests/comprehensive/test_Concurrency.cpp | 7 ---- unittests/comprehensive/test_Constraint.cpp | 8 ---- unittests/comprehensive/test_Distance.cpp | 7 ---- unittests/comprehensive/test_Dynamics.cpp | 7 ---- .../comprehensive/test_ForwardKinematics.cpp | 7 ---- unittests/comprehensive/test_Frames.cpp | 8 ---- .../comprehensive/test_InverseKinematics.cpp | 7 ---- unittests/comprehensive/test_Joints.cpp | 8 ---- .../comprehensive/test_NameManagement.cpp | 7 ---- unittests/comprehensive/test_Skeleton.cpp | 6 --- unittests/comprehensive/test_SoftDynamics.cpp | 7 ---- unittests/comprehensive/test_World.cpp | 7 ---- .../regression/test_Issue000Template.cpp | 7 ---- unittests/unit/CMakeLists.txt | 1 - unittests/unit/test_Aspect.cpp | 6 --- .../unit/test_CompositeResourceRetriever.cpp | 6 --- unittests/unit/test_ContactConstraint.cpp | 7 ---- unittests/unit/test_DartLoader.cpp | 6 --- unittests/unit/test_FileInfoWorld.cpp | 7 ---- unittests/unit/test_GenericJoints.cpp | 7 ---- unittests/unit/test_Geometry.cpp | 9 ---- .../unit/test_LocalResourceRetriever.cpp | 6 --- unittests/unit/test_Math.cpp | 7 ---- unittests/unit/test_NearestNeighbor.cpp | 6 --- unittests/unit/test_Optimizer.cpp | 7 ---- .../unit/test_PackageResourceRetriever.cpp | 6 --- unittests/unit/test_ScrewJoint.cpp | 8 ---- unittests/unit/test_SdfParser.cpp | 7 ---- unittests/unit/test_Signal.cpp | 8 ---- unittests/unit/test_SkelParser.cpp | 7 ---- unittests/unit/test_Subscriptions.cpp | 6 --- unittests/unit/test_Uri.cpp | 6 --- unittests/unit/test_Utilities.cpp | 41 ------------------- unittests/unit/test_VskParser.cpp | 7 ---- 38 files changed, 6 insertions(+), 289 deletions(-) delete mode 100644 unittests/unit/test_Utilities.cpp diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index cfee56e4f7362..65db1e7f5e683 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -71,9 +71,13 @@ function(dart_add_test test_type target_name) # ARGN for source files "${DART_TEST_OUT_DIR}/${test_type}/${target_name}") if(MSVC) - target_link_libraries(${target_name} dart optimized gtest debug gtestd) + target_link_libraries(${target_name} + dart + optimized gtest debug gtestd + optimized gtest_main debug gtest_maind + ) else() - target_link_libraries(${target_name} dart gtest) + target_link_libraries(${target_name} dart gtest gtest_main) endif() set_target_properties( diff --git a/unittests/comprehensive/test_Building.cpp b/unittests/comprehensive/test_Building.cpp index b513a75a7aad2..e2775092c8685 100644 --- a/unittests/comprehensive/test_Building.cpp +++ b/unittests/comprehensive/test_Building.cpp @@ -107,10 +107,3 @@ TEST(BUILDING, BASIC) for (int i = 0; i < nSteps; ++i) world->step(); } - -/******************************************************************************/ -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/comprehensive/test_Collision.cpp b/unittests/comprehensive/test_Collision.cpp index 1080e879d6825..e66bd3e55b6ac 100644 --- a/unittests/comprehensive/test_Collision.cpp +++ b/unittests/comprehensive/test_Collision.cpp @@ -1174,11 +1174,3 @@ TEST_F(COLLISION, CollisionOfPrescribedJoints) EXPECT_NEAR(joint6->getAcceleration(0), 0.0, tol); } } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} - diff --git a/unittests/comprehensive/test_Common.cpp b/unittests/comprehensive/test_Common.cpp index b9af598acad1a..f49c78347bcc2 100644 --- a/unittests/comprehensive/test_Common.cpp +++ b/unittests/comprehensive/test_Common.cpp @@ -68,11 +68,3 @@ TEST(Common, Timer) EXPECT_GE(timer2.getTotalElapsedTime(), 2.0); #endif } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} - diff --git a/unittests/comprehensive/test_Concurrency.cpp b/unittests/comprehensive/test_Concurrency.cpp index c6a6373089f2a..a440db0d3457e 100644 --- a/unittests/comprehensive/test_Concurrency.cpp +++ b/unittests/comprehensive/test_Concurrency.cpp @@ -76,10 +76,3 @@ TEST(Concurrency, FrameDeletion) EXPECT_EQ(Frame::World()->getNumChildEntities(), 0); EXPECT_EQ(Frame::World()->getNumChildFrames(), 0); } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/comprehensive/test_Constraint.cpp b/unittests/comprehensive/test_Constraint.cpp index c2eea40afb930..ba7a08513514d 100644 --- a/unittests/comprehensive/test_Constraint.cpp +++ b/unittests/comprehensive/test_Constraint.cpp @@ -229,11 +229,3 @@ TEST_F(ConstraintTest, SingleContactTest) SingleContactTest(getList()[0]); } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} - diff --git a/unittests/comprehensive/test_Distance.cpp b/unittests/comprehensive/test_Distance.cpp index 8e0d1cad717d8..85545e113942f 100644 --- a/unittests/comprehensive/test_Distance.cpp +++ b/unittests/comprehensive/test_Distance.cpp @@ -289,10 +289,3 @@ TEST(Distance, SphereSphere) auto dart = DARTCollisionDetector::create(); testSphereSphere(dart); } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/comprehensive/test_Dynamics.cpp b/unittests/comprehensive/test_Dynamics.cpp index 3ffe290f7cd1a..b6fea9aaf8bf9 100644 --- a/unittests/comprehensive/test_Dynamics.cpp +++ b/unittests/comprehensive/test_Dynamics.cpp @@ -2129,10 +2129,3 @@ TEST_F(DynamicsTest, HybridDynamics) EXPECT_NEAR(command(i,4), output(i,4), tol); } } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/comprehensive/test_ForwardKinematics.cpp b/unittests/comprehensive/test_ForwardKinematics.cpp index 2ee818d085df6..030a70f497ea3 100644 --- a/unittests/comprehensive/test_ForwardKinematics.cpp +++ b/unittests/comprehensive/test_ForwardKinematics.cpp @@ -247,10 +247,3 @@ TEST(FORWARD_KINEMATICS, JACOBIAN_END_EFFECTOR_CHANGE) EXPECT_TRUE((fd_J - J).norm() < tolerance); } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/comprehensive/test_Frames.cpp b/unittests/comprehensive/test_Frames.cpp index 5cd2fce54e6fe..0a5a915b0205e 100644 --- a/unittests/comprehensive/test_Frames.cpp +++ b/unittests/comprehensive/test_Frames.cpp @@ -737,11 +737,3 @@ TEST(FRAMES, CHILDHOOD) EXPECT_TRUE(F1.getNumChildFrames() == 1); } - -int main(int argc, char* argv[]) -{ - srand(271828); // Seed with an arbitrary fixed integer. Don't seed with time, - // because it will produce different numbers between runs. - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/comprehensive/test_InverseKinematics.cpp b/unittests/comprehensive/test_InverseKinematics.cpp index 4864271446973..dc674362aeebc 100644 --- a/unittests/comprehensive/test_InverseKinematics.cpp +++ b/unittests/comprehensive/test_InverseKinematics.cpp @@ -247,10 +247,3 @@ SkeletonPtr createFreeFloatingTwoLinkRobot(Vector3d dim1, // } //} #endif - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/comprehensive/test_Joints.cpp b/unittests/comprehensive/test_Joints.cpp index dee3a8acc1554..70411c21fbb5e 100644 --- a/unittests/comprehensive/test_Joints.cpp +++ b/unittests/comprehensive/test_Joints.cpp @@ -1299,11 +1299,3 @@ TEST_F(JOINTS, FREE_JOINT_RELATIVE_TRANSFORM_VELOCITY_ACCELERATION) } } } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} - diff --git a/unittests/comprehensive/test_NameManagement.cpp b/unittests/comprehensive/test_NameManagement.cpp index 853af82c68859..1dea42a4f65b2 100644 --- a/unittests/comprehensive/test_NameManagement.cpp +++ b/unittests/comprehensive/test_NameManagement.cpp @@ -417,10 +417,3 @@ TEST(NameManagement, JointDegreeOfFreedom) EXPECT_TRUE( joint->getDof(1)->getName() == "j_bicep_left_y" ); EXPECT_TRUE( joint->getDof(2)->getName() == "j_bicep_left_z" ); } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/comprehensive/test_Skeleton.cpp b/unittests/comprehensive/test_Skeleton.cpp index a488b4c09bf33..53301df62fbf9 100644 --- a/unittests/comprehensive/test_Skeleton.cpp +++ b/unittests/comprehensive/test_Skeleton.cpp @@ -1288,9 +1288,3 @@ TEST(Skeleton, Updating) EXPECT_FALSE(originalMass == newMass); EXPECT_TRUE(newMass == originalMass - removedMass); } - -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/comprehensive/test_SoftDynamics.cpp b/unittests/comprehensive/test_SoftDynamics.cpp index 20f0a1b06f905..9fc71086613a7 100644 --- a/unittests/comprehensive/test_SoftDynamics.cpp +++ b/unittests/comprehensive/test_SoftDynamics.cpp @@ -457,10 +457,3 @@ TEST_F(SoftDynamicsTest, compareEquationsOfMotion) // compareEquationsOfMotion(getList()[i]); // } } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/comprehensive/test_World.cpp b/unittests/comprehensive/test_World.cpp index d8ad3f9333e8c..f484960978c08 100644 --- a/unittests/comprehensive/test_World.cpp +++ b/unittests/comprehensive/test_World.cpp @@ -302,10 +302,3 @@ TEST(World, ValidatingClones) } } } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/regression/test_Issue000Template.cpp b/unittests/regression/test_Issue000Template.cpp index 7c96b3895652b..95f8d334aeb29 100644 --- a/unittests/regression/test_Issue000Template.cpp +++ b/unittests/regression/test_Issue000Template.cpp @@ -40,10 +40,3 @@ TEST(Issue000Template, Basic) { // Add test code here } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/unit/CMakeLists.txt b/unittests/unit/CMakeLists.txt index 1eedfbccc479c..89597c32a0ea9 100644 --- a/unittests/unit/CMakeLists.txt +++ b/unittests/unit/CMakeLists.txt @@ -9,7 +9,6 @@ dart_add_test("unit" test_ScrewJoint) dart_add_test("unit" test_Signal) dart_add_test("unit" test_Subscriptions) dart_add_test("unit" test_Uri) -dart_add_test("unit" test_Utilities) if(TARGET dart-optimizer-ipopt) target_link_libraries(test_Optimizer dart-optimizer-ipopt) diff --git a/unittests/unit/test_Aspect.cpp b/unittests/unit/test_Aspect.cpp index 9988284d94518..717305446da19 100644 --- a/unittests/unit/test_Aspect.cpp +++ b/unittests/unit/test_Aspect.cpp @@ -977,9 +977,3 @@ TEST(Aspect, Embedded) EmbeddedStateComposite s_constructed(state); EXPECT_EQ(s_constructed.get()->getState(), state); } - -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/unit/test_CompositeResourceRetriever.cpp b/unittests/unit/test_CompositeResourceRetriever.cpp index e177360eeb773..c444c0e73e297 100644 --- a/unittests/unit/test_CompositeResourceRetriever.cpp +++ b/unittests/unit/test_CompositeResourceRetriever.cpp @@ -185,9 +185,3 @@ TEST(CompositeResourceRetriever, retrieve_DefaultResourceRetrieverSucceeds_Retur EXPECT_TRUE(retriever3->mExists.empty()); EXPECT_TRUE(retriever3->mRetrieve.empty()); } - -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/unit/test_ContactConstraint.cpp b/unittests/unit/test_ContactConstraint.cpp index bbf34ceba9938..76daea602ffdf 100644 --- a/unittests/unit/test_ContactConstraint.cpp +++ b/unittests/unit/test_ContactConstraint.cpp @@ -83,10 +83,3 @@ TEST(ContactConstraint, ContactWithKinematicJoint) EXPECT_NEAR(bodyNode2->getLinearVelocity()[0], 0.1, 1e-6); } } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/unit/test_DartLoader.cpp b/unittests/unit/test_DartLoader.cpp index 0356103f61e2e..da6ef0888044b 100644 --- a/unittests/unit/test_DartLoader.cpp +++ b/unittests/unit/test_DartLoader.cpp @@ -84,9 +84,3 @@ TEST(DartLoader, parseWorld) EXPECT_TRUE(nullptr != loader.parseWorld(DART_DATA_PATH"urdf/test/testWorld.urdf")); } - -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/unit/test_FileInfoWorld.cpp b/unittests/unit/test_FileInfoWorld.cpp index 663adbba13795..a67099922bc5d 100644 --- a/unittests/unit/test_FileInfoWorld.cpp +++ b/unittests/unit/test_FileInfoWorld.cpp @@ -129,10 +129,3 @@ TEST(FileInfoWorld, Basic) } } } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/unit/test_GenericJoints.cpp b/unittests/unit/test_GenericJoints.cpp index c00686391ffcd..30398cdf2d513 100644 --- a/unittests/unit/test_GenericJoints.cpp +++ b/unittests/unit/test_GenericJoints.cpp @@ -214,10 +214,3 @@ TEST(GenericJoint, Basic) MultiDofJointTest genericJoint; SO3JointTest so3Joint; } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/unit/test_Geometry.cpp b/unittests/unit/test_Geometry.cpp index 1830be24f6309..246ab2da4c8d0 100644 --- a/unittests/unit/test_Geometry.cpp +++ b/unittests/unit/test_Geometry.cpp @@ -593,12 +593,3 @@ TEST(LIE_GROUP_OPERATORS, ADJOINT_MAPPINGS) EXPECT_NEAR(dad_V_F(j), dadV_Matrix_F(j), LIE_GROUP_OPT_TOL); } } - -/******************************************************************************/ -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} - - diff --git a/unittests/unit/test_LocalResourceRetriever.cpp b/unittests/unit/test_LocalResourceRetriever.cpp index 4107ff7b58f3e..07166e0092a00 100644 --- a/unittests/unit/test_LocalResourceRetriever.cpp +++ b/unittests/unit/test_LocalResourceRetriever.cpp @@ -155,9 +155,3 @@ TEST(LocalResourceRetriever, retrieve_ResourceOperations) ASSERT_EQ(1u, resource->read(buffer.data(), content.size(), 1)); EXPECT_STREQ(content.c_str(), buffer.data()); } - -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/unit/test_Math.cpp b/unittests/unit/test_Math.cpp index 56c022ee9f961..a4d2f92176978 100644 --- a/unittests/unit/test_Math.cpp +++ b/unittests/unit/test_Math.cpp @@ -1293,10 +1293,3 @@ TEST(MATH, PerformanceComparisonOfAdTJac) // Note: The best function for dynamic size Jacobian is AdTJac2, and the best // function for fixed size Jacobian is AdTJac3 } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/unit/test_NearestNeighbor.cpp b/unittests/unit/test_NearestNeighbor.cpp index ce30b4ffb1b49..5449f66fef350 100644 --- a/unittests/unit/test_NearestNeighbor.cpp +++ b/unittests/unit/test_NearestNeighbor.cpp @@ -49,9 +49,3 @@ TEST(NEAREST_NEIGHBOR, 2D) { EXPECT_TRUE(equality); } #endif // HAVE_FLANN - -/* ********************************************************************************************* */ -int main(int argc, char* argv[]) { - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/unit/test_Optimizer.cpp b/unittests/unit/test_Optimizer.cpp index ec717f55fd1d6..2dbedc3fc98d0 100644 --- a/unittests/unit/test_Optimizer.cpp +++ b/unittests/unit/test_Optimizer.cpp @@ -299,10 +299,3 @@ TEST(Optimizer, OutStream) std::remove(outputFile.c_str()); } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/unit/test_PackageResourceRetriever.cpp b/unittests/unit/test_PackageResourceRetriever.cpp index 05ed4f778cc91..1eb5253945d43 100644 --- a/unittests/unit/test_PackageResourceRetriever.cpp +++ b/unittests/unit/test_PackageResourceRetriever.cpp @@ -236,9 +236,3 @@ TEST(PackageResourceRetriever, retrieve_FallsBackOnSecondUri) EXPECT_EQ(expected1, mockRetriever->mRetrieve[0]); EXPECT_EQ(expected2, mockRetriever->mRetrieve[1]); } - -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/unit/test_ScrewJoint.cpp b/unittests/unit/test_ScrewJoint.cpp index 0e3a10cbbfe12..c3fbae16f3a0c 100644 --- a/unittests/unit/test_ScrewJoint.cpp +++ b/unittests/unit/test_ScrewJoint.cpp @@ -70,11 +70,3 @@ TEST(ScrewJoint, ThreadPitch) expectedDiff = axis*pitch*angle/2.0_pi; EXPECT_TRUE(diff.isApprox(expectedDiff)); } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} - diff --git a/unittests/unit/test_SdfParser.cpp b/unittests/unit/test_SdfParser.cpp index 03785b4098f63..77872735668bc 100644 --- a/unittests/unit/test_SdfParser.cpp +++ b/unittests/unit/test_SdfParser.cpp @@ -136,10 +136,3 @@ TEST(SdfParser, ReadMaterial) } } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/unit/test_Signal.cpp b/unittests/unit/test_Signal.cpp index e731e35c2749d..64ae6bc3ac44b 100644 --- a/unittests/unit/test_Signal.cpp +++ b/unittests/unit/test_Signal.cpp @@ -326,11 +326,3 @@ TEST(Signal, FrameSignals) F3.setParentFrame(&F1); } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} - diff --git a/unittests/unit/test_SkelParser.cpp b/unittests/unit/test_SkelParser.cpp index 5deb2ff5986b5..7247e3bec6084 100644 --- a/unittests/unit/test_SkelParser.cpp +++ b/unittests/unit/test_SkelParser.cpp @@ -525,10 +525,3 @@ TEST(SkelParser, Shapes) skel = world->getSkeleton("mesh skeleton"); EXPECT_NE(skel, nullptr); } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/unit/test_Subscriptions.cpp b/unittests/unit/test_Subscriptions.cpp index 6b84c77784bca..d82cf1c12ae21 100644 --- a/unittests/unit/test_Subscriptions.cpp +++ b/unittests/unit/test_Subscriptions.cpp @@ -71,9 +71,3 @@ TEST(Subjects, ImplicitConversion) delete entity_ptr; } - -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/unit/test_Uri.cpp b/unittests/unit/test_Uri.cpp index 1c5a6f34f8b5a..4944511b099e6 100644 --- a/unittests/unit/test_Uri.cpp +++ b/unittests/unit/test_Uri.cpp @@ -334,9 +334,3 @@ TEST(UriHelpers, getRelativeUri) EXPECT_EQ("http://a/b/c/g", mergedUri.toString()); #endif } - -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/unittests/unit/test_Utilities.cpp b/unittests/unit/test_Utilities.cpp deleted file mode 100644 index 594ee665d922c..0000000000000 --- a/unittests/unit/test_Utilities.cpp +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2011-2016, Humanoid Lab, Georgia Tech Research Corporation - * Copyright (c) 2011-2017, Graphics Lab, Georgia Tech Research Corporation - * Copyright (c) 2016-2017, Personal Robotics Lab, Carnegie Mellon University - * All rights reserved. - * - * This file is provided under the following "BSD-style" License: - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include - -/* ********************************************************************************************* */ -int main(int argc, char* argv[]) { - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} -/* ********************************************************************************************* */ diff --git a/unittests/unit/test_VskParser.cpp b/unittests/unit/test_VskParser.cpp index 635d3f86b55b3..bfa4697a035d8 100644 --- a/unittests/unit/test_VskParser.cpp +++ b/unittests/unit/test_VskParser.cpp @@ -99,10 +99,3 @@ TEST(VskParser, SingleStepSimulations) EXPECT_EQ(world->getNumSkeletons(), 1u); world->step(); } - -//============================================================================== -int main(int argc, char* argv[]) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -}