Merge pull request #4173 from haritha-j/indicesTestCommon

[test] Replace usage of `std::vector<int>` with `Indices` in common module tests

Author: SergioRAgostinho

test/common/test_centroid.cpp

@@ -58,7 +58,7 @@ pcl::PCLPointCloud2 cloud_blob;
 TEST (PCL, compute3DCentroidFloat)
 {
   pcl::PointIndices pindices;
-  std::vector<int> indices;
+  Indices indices;
   PointXYZ point;
   PointCloud<PointXYZ> cloud;
   Eigen::Vector4f centroid;
@@ -164,7 +164,7 @@ TEST (PCL, compute3DCentroidFloat)
 TEST (PCL, compute3DCentroidDouble)
 {
   pcl::PointIndices pindices;
-  std::vector<int> indices;
+  Indices indices;
   PointXYZ point;
   PointCloud<PointXYZ> cloud;
   Eigen::Vector4d centroid;
@@ -269,7 +269,7 @@ TEST (PCL, compute3DCentroidDouble)
 TEST (PCL, compute3DCentroidCloudIterator)
 {
   pcl::PointIndices pindices;
-  std::vector<int> indices;
+  Indices indices;
   PointXYZ point;
   PointCloud<PointXYZ> cloud;
   Eigen::Vector4f centroid_f;
@@ -333,7 +333,7 @@ TEST (PCL, computeCovarianceMatrix)
 {
   PointCloud<PointXYZ> cloud;
   PointXYZ point;
-  std::vector <int> indices;
+  Indices indices;
   Eigen::Vector4f centroid;
   Eigen::Matrix3f covariance_matrix;
 
@@ -449,7 +449,7 @@ TEST (PCL, computeCovarianceMatrixNormalized)
 {
   PointCloud<PointXYZ> cloud;
   PointXYZ point;
-  std::vector <int> indices;
+  Indices indices;
   Eigen::Vector4f centroid;
   Eigen::Matrix3f covariance_matrix;
 
@@ -567,7 +567,7 @@ TEST (PCL, computeDemeanedCovariance)
 {
   PointCloud<PointXYZ> cloud;
   PointXYZ point;
-  std::vector <int> indices;
+  Indices indices;
   Eigen::Matrix3f covariance_matrix;
 
   // test empty cloud which is dense
@@ -673,7 +673,7 @@ TEST (PCL, computeMeanAndCovariance)
 {
   PointCloud<PointXYZ> cloud;
   PointXYZ point;
-  std::vector <int> indices;
+  Indices indices;
   Eigen::Matrix3f covariance_matrix;
   Eigen::Vector4f centroid;
 
@@ -931,7 +931,7 @@ TEST (PCL, CentroidPoint)
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 TEST (PCL, computeCentroid)
 {
-  std::vector<int> indices;
+  Indices indices;
   PointXYZI point;
   PointCloud<PointXYZI> cloud;
   PointXYZINormal centroid;
@@ -1057,7 +1057,7 @@ TEST (PCL, demeanPointCloud)
   EXPECT_XYZ_NEAR (cloud_demean[0], PointXYZ (0.034503, 0.010837, 0.013447), 1e-4);
   EXPECT_XYZ_NEAR (cloud_demean[cloud_demean.size () - 1], PointXYZ (-0.048849, 0.072507, -0.071702), 1e-4);
 
-  std::vector<int> indices (cloud.size ());
+  Indices indices (cloud.size ());
   for (int i = 0; i < static_cast<int> (indices.size ()); ++i) { indices[i] = i; }
 
   // Check standard demean w/ indices

test/common/test_common.cpp

@@ -552,7 +552,7 @@ TEST (PCL, GetMaxDistance)
   test::EXPECT_EQ_VECTORS (max_exp_pt, max_pt);
 
   // Specifying indices
-  std::vector<int> idx (2);
+  Indices idx (2);
   idx[0] = 1; idx[1] = 2;
   max_exp_pt = cloud[2].getVector4fMap ();
   getMaxDistance (cloud, idx, pivot_pt, max_pt);

test/common/test_io.cpp

@@ -96,7 +96,7 @@ TEST (PCL, copyPointCloud)
     EXPECT_EQ (cloud_xyz_rgba[i].rgba, cloud_xyz_rgb_normal[i].rgba);
   }
 
-  std::vector<int> indices;
+  Indices indices;
   indices.push_back (0); indices.push_back (1); 
   pcl::copyPointCloud (cloud_xyz_rgba, indices, cloud_xyz_rgb_normal);
   ASSERT_EQ (int (cloud_xyz_rgb_normal.size ()), 2);
@@ -107,7 +107,7 @@ TEST (PCL, copyPointCloud)
     EXPECT_EQ (cloud_xyz_rgba[i].rgba, cloud_xyz_rgb_normal[i].rgba);
   }
 
-  std::vector<int, Eigen::aligned_allocator<int> > indices_aligned;
+  IndicesAllocator< Eigen::aligned_allocator<int> > indices_aligned;
   indices_aligned.push_back (1); indices_aligned.push_back (2); indices_aligned.push_back (3); 
   pcl::copyPointCloud (cloud_xyz_rgba, indices_aligned, cloud_xyz_rgb_normal);
   ASSERT_EQ (int (cloud_xyz_rgb_normal.size ()), 3);
@@ -440,7 +440,7 @@ TEST (PCL, CopyPointCloudWithIndicesAndRGBToRGBA)
   CloudXYZRGB cloud_xyz_rgb;
   CloudXYZRGBA cloud_xyz_rgba (5, 1, pt_xyz_rgba);
 
-  std::vector<int> indices;
+  Indices indices;
   indices.push_back (2);
   indices.push_back (3);
 

test/common/test_transforms.cpp

@@ -103,7 +103,7 @@ class Transforms : public ::testing::Test
   pcl::PointCloud<pcl::PointXYZRGBNormal> p_xyz_normal, p_xyz_normal_trans;
 
   // Indices, every second point
-  std::vector<int> indices;
+  Indices indices;
 
   PCL_MAKE_ALIGNED_OPERATOR_NEW;
 };
@@ -266,7 +266,7 @@ TEST (PCL, Matrix4Affine3Transform)
 
   affine = transformation;
 
-  std::vector<int> indices (1); indices[0] = 0;
+  Indices indices (1); indices[0] = 0;
 
   pcl::transformPointCloud (c, indices, ct, affine);
   EXPECT_NEAR (pt.x, ct[0].x, 1e-4);