[ros-rospack] 07/07: Fix unit tests

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch patch-queue/master
in repository ros-rospack.

commit fcc753b8d357c47adfe179bb8975318b360e48d6
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Jul 26 17:35:53 2016 +0200

    Fix unit tests
    
    Different to OSRF we have catkin, cmake_modules and roslang installed in
    our ROS workspace.
---
 test/test/utest.cpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/test/test/utest.cpp b/test/test/utest.cpp
index 76b64a7..3f79357 100644
--- a/test/test/utest.cpp
+++ b/test/test/utest.cpp
@@ -57,13 +57,13 @@ TEST(rospack, reentrant)
   output = rp.getOutput();
   boost::trim(output);
   boost::split(output_list, output, boost::is_any_of("\n"));
-  ASSERT_EQ((int)output_list.size(), 4);
+  ASSERT_EQ((int)output_list.size(), 6);
   ret = rp.run(std::string("list"));
   ASSERT_EQ(ret, 0);
   output = rp.getOutput();
   boost::trim(output);
   boost::split(output_list, output, boost::is_any_of("\n"));
-  ASSERT_EQ((int)output_list.size(), 4);
+  ASSERT_EQ((int)output_list.size(), 6);
   std::vector<std::string> path_name;
   boost::split(path_name, output_list[0], boost::is_any_of(" "));
   ASSERT_EQ((int)path_name.size(), 2);
@@ -83,13 +83,13 @@ TEST(rospack, multiple_rospack_objects)
   output = rp.getOutput();
   boost::trim(output);
   boost::split(output_list, output, boost::is_any_of("\n"));
-  ASSERT_EQ((int)output_list.size(), 4);
+  ASSERT_EQ((int)output_list.size(), 6);
   ret = rp.run(std::string("list"));
   ASSERT_EQ(ret, 0);
   output = rp.getOutput();
   boost::trim(output);
   boost::split(output_list, output, boost::is_any_of("\n"));
-  ASSERT_EQ((int)output_list.size(), 4);
+  ASSERT_EQ((int)output_list.size(), 6);
   std::vector<std::string> path_name;
   boost::split(path_name, output_list[0], boost::is_any_of(" "));
   ASSERT_EQ((int)path_name.size(), 2);
@@ -105,13 +105,13 @@ TEST(rospack, multiple_rospack_objects)
   output = rp2.getOutput();
   boost::trim(output);
   boost::split(output_list, output, boost::is_any_of("\n"));
-  ASSERT_EQ((int)output_list.size(), 4);
+  ASSERT_EQ((int)output_list.size(), 6);
   ret = rp2.run(std::string("list"));
   ASSERT_EQ(ret, 0);
   output = rp2.getOutput();
   boost::trim(output);
   boost::split(output_list, output, boost::is_any_of("\n"));
-  ASSERT_EQ((int)output_list.size(), 4);
+  ASSERT_EQ((int)output_list.size(), 6);
   path_name.clear();
   boost::split(path_name, output_list[0], boost::is_any_of(" "));
   ASSERT_EQ((int)path_name.size(), 2);
@@ -138,6 +138,8 @@ TEST(rospack, env_change)
   std::string rr = std::string(getcwd(buf, sizeof(buf))) + "/test2";
   setenv("ROS_PACKAGE_PATH", rr.c_str(), 1);
   std::vector<std::string> test_pkgs;
+  test_pkgs.push_back("catkin");
+  test_pkgs.push_back("cmake_modules");
   test_pkgs.push_back("precedence1");
   test_pkgs.push_back("precedence2");
   test_pkgs.push_back("precedence3");
@@ -174,9 +176,12 @@ TEST(rospack, env_change)
   rr = std::string(getcwd(buf, sizeof(buf))) + "/test3";
   setenv("ROS_PACKAGE_PATH", rr.c_str(), 1);
   test_pkgs.clear();
+  test_pkgs.push_back("catkin");
+  test_pkgs.push_back("cmake_modules");
   test_pkgs.push_back("precedence1");
   test_pkgs.push_back("precedence2");
   test_pkgs.push_back("precedence3");
+  test_pkgs.push_back("roslang");
   ret = rp.run(std::string("list-names"));
   EXPECT_EQ(ret, 0);
   output_list.clear();
@@ -211,7 +216,7 @@ TEST(rospack, env_change)
   EXPECT_EQ(ret, 0);
   output = rp.getOutput();
   boost::trim(output);
-  EXPECT_EQ(output, std::string());
+  EXPECT_EQ(output, "catkin\ncmake_modules\nroslang");
 
   // Reset old path, for other tests
   setenv("ROS_PACKAGE_PATH", oldrpp, 1);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-rospack.git