From 75f899117a47b8d510d7e42ad444b3847771e251 Mon Sep 17 00:00:00 2001
From: Alexander Belyaev <32522095+pifon2a@users.noreply.github.com>
Date: Mon, 16 Apr 2018 12:47:11 +0200
Subject: [PATCH] Move  to testing/. (#1067)

---
 cartographer/cloud/internal/client_server_test.cc           | 2 +-
 cartographer/mapping/internal/3d/pose_graph_3d_test.cc      | 2 +-
 cartographer/mapping/internal/{ => testing}/test_helpers.cc | 2 +-
 cartographer/mapping/internal/{ => testing}/test_helpers.h  | 6 +++---
 cartographer/mapping/map_builder_test.cc                    | 2 +-
 cartographer/mapping/pose_graph_test.cc                     | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename cartographer/mapping/internal/{ => testing}/test_helpers.cc (99%)
 rename cartographer/mapping/internal/{ => testing}/test_helpers.h (92%)

diff --git a/cartographer/cloud/internal/client_server_test.cc b/cartographer/cloud/internal/client_server_test.cc
index c91f95d..7912b97 100644
--- a/cartographer/cloud/internal/client_server_test.cc
+++ b/cartographer/cloud/internal/client_server_test.cc
@@ -20,9 +20,9 @@
 #include "cartographer/cloud/client/map_builder_stub.h"
 #include "cartographer/cloud/internal/map_builder_server.h"
 #include "cartographer/cloud/map_builder_server_options.h"
-#include "cartographer/mapping/internal/test_helpers.h"
 #include "cartographer/mapping/internal/testing/mock_map_builder.h"
 #include "cartographer/mapping/internal/testing/mock_trajectory_builder.h"
+#include "cartographer/mapping/internal/testing/test_helpers.h"
 #include "cartographer/mapping/local_slam_result_data.h"
 #include "glog/logging.h"
 #include "gmock/gmock.h"
diff --git a/cartographer/mapping/internal/3d/pose_graph_3d_test.cc b/cartographer/mapping/internal/3d/pose_graph_3d_test.cc
index 4b89900..c94f72a 100644
--- a/cartographer/mapping/internal/3d/pose_graph_3d_test.cc
+++ b/cartographer/mapping/internal/3d/pose_graph_3d_test.cc
@@ -16,7 +16,7 @@
 
 #include "cartographer/mapping/internal/3d/pose_graph_3d.h"
 
-#include "cartographer/mapping/internal/test_helpers.h"
+#include "cartographer/mapping/internal/testing/test_helpers.h"
 #include "cartographer/mapping/proto/serialization.pb.h"
 #include "cartographer/transform/rigid_transform.h"
 #include "cartographer/transform/rigid_transform_test_helpers.h"
diff --git a/cartographer/mapping/internal/test_helpers.cc b/cartographer/mapping/internal/testing/test_helpers.cc
similarity index 99%
rename from cartographer/mapping/internal/test_helpers.cc
rename to cartographer/mapping/internal/testing/test_helpers.cc
index 3a3234c..5890e7a 100644
--- a/cartographer/mapping/internal/test_helpers.cc
+++ b/cartographer/mapping/internal/testing/test_helpers.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "cartographer/mapping/internal/test_helpers.h"
+#include "cartographer/mapping/internal/testing/test_helpers.h"
 
 #include "cartographer/common/config.h"
 #include "cartographer/common/configuration_file_resolver.h"
diff --git a/cartographer/mapping/internal/test_helpers.h b/cartographer/mapping/internal/testing/test_helpers.h
similarity index 92%
rename from cartographer/mapping/internal/test_helpers.h
rename to cartographer/mapping/internal/testing/test_helpers.h
index 9f966ff..255e9b0 100644
--- a/cartographer/mapping/internal/test_helpers.h
+++ b/cartographer/mapping/internal/testing/test_helpers.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef CARTOGRAPHER_MAPPING_INTERNAL_TEST_HELPERS_H_
-#define CARTOGRAPHER_MAPPING_INTERNAL_TEST_HELPERS_H_
+#ifndef CARTOGRAPHER_MAPPING_INTERNAL_TESTING_TEST_HELPERS_H_
+#define CARTOGRAPHER_MAPPING_INTERNAL_TESTING_TEST_HELPERS_H_
 
 #include <memory>
 
@@ -62,4 +62,4 @@ void AddToProtoGraph(const proto::PoseGraph::Landmark& landmark_node,
 }  // namespace mapping
 }  // namespace cartographer
 
-#endif  // CARTOGRAPHER_MAPPING_INTERNAL_TEST_HELPERS_H_
+#endif  // CARTOGRAPHER_MAPPING_INTERNAL_TESTING_TEST_HELPERS_H_
diff --git a/cartographer/mapping/map_builder_test.cc b/cartographer/mapping/map_builder_test.cc
index 5922ca1..bc45243 100644
--- a/cartographer/mapping/map_builder_test.cc
+++ b/cartographer/mapping/map_builder_test.cc
@@ -17,7 +17,7 @@
 #include "cartographer/mapping/map_builder.h"
 
 #include "cartographer/common/config.h"
-#include "cartographer/mapping/internal/test_helpers.h"
+#include "cartographer/mapping/internal/testing/test_helpers.h"
 #include "gtest/gtest.h"
 
 namespace cartographer {
diff --git a/cartographer/mapping/pose_graph_test.cc b/cartographer/mapping/pose_graph_test.cc
index 85da2a2..6172867 100644
--- a/cartographer/mapping/pose_graph_test.cc
+++ b/cartographer/mapping/pose_graph_test.cc
@@ -16,7 +16,7 @@
 
 #include "cartographer/mapping/pose_graph.h"
 
-#include "cartographer/mapping/internal/test_helpers.h"
+#include "cartographer/mapping/internal/testing/test_helpers.h"
 #include "cartographer/mapping/trajectory_builder_interface.h"
 #include "cartographer/transform/transform.h"
 #include "google/protobuf/util/message_differencer.h"