Directory renaming part [12/12]: test/

eglaysher · Mar 10, 2014 · 79e02eb · 79e02eb
1 parent 34160b5
commit 79e02eb
Show file tree

Hide file tree

Showing 30 changed files with 52 additions and 51 deletions.
diff --git a/SConscript.luarlvm b/SConscript.luarlvm
@@ -55,7 +55,7 @@ if env['BUILD_LUA_TESTS'] == True:
   # Build our included copy of luabind.
   test_env.BuildSubcomponent("luabind")
 
-  test_env.RlvmProgram("luaRlvm", ['test/luaRlvm.cpp', script_machine_files],
+  test_env.RlvmProgram("lua_rlvm", ['test/lua_rlvm.cc', script_machine_files],
                        use_lib_set = ["SDL", "LUA"],
                        rlvm_libs = ["system_sdl", "rlvm"])
-  test_env.Install('$OUTPUT_DIR', 'luaRlvm')
+  test_env.Install('$OUTPUT_DIR', 'lua_rlvm')
diff --git a/SConscript.test b/SConscript.test
@@ -30,34 +30,34 @@ test_case_files = [
   "test/test_system/test_machine.cc",
 
   "test/notification_service_unittest.cc",
-  "test/testUtils.cpp",
-  "test/gameexe_test.cpp",
-  "test/rlmachine_test.cpp",
-  "test/lazy_array_test.cpp",
-  "test/graphics_object_test.cpp",
-  "test/rloperation_test.cpp",
-  "test/regressions_test.cpp",
-  "test/text_system_test.cpp",
-  "test/expression_test.cpp",
-  "test/sound_system_test.cpp",
-  "test/text_window_test.cpp",
-  "test/effect_test.cpp",
-  "test/rlbabel_test.cpp",
-  "test/utilities_test.cpp",
-  "test/test_index_series.cpp",
-  "test/rect_test.cpp",
+  "test/test_utils.cc",
+  "test/gameexe_test.cc",
+  "test/rlmachine_test.cc",
+  "test/lazy_array_test.cc",
+  "test/graphics_object_test.cc",
+  "test/rloperation_test.cc",
+  "test/regressions_test.cc",
+  "test/text_system_test.cc",
+  "test/expression_test.cc",
+  "test/sound_system_test.cc",
+  "test/text_window_test.cc",
+  "test/effect_test.cc",
+  "test/rlbabel_test.cc",
+  "test/utilities_test.cc",
+  "test/test_index_series.cc",
+  "test/rect_test.cc",
 
   # medium tests
-  "test/medium_eventloop_test.cpp",
-  "test/medium_msg_test.cpp",
-  "test/medium_object_promotion.cpp",
-  "test/medium_grp_test.cpp",
+  "test/medium_eventloop_test.cc",
+  "test/medium_msg_test.cc",
+  "test/medium_object_promotion.cc",
+  "test/medium_grp_test.cc",
 
   # large tests
-  "test/large_sys_test.cpp",
-  "test/large_str_test.cpp",
-  "test/large_mem_test.cpp",
-  "test/large_jmp_test.cpp"
+  "test/large_sys_test.cc",
+  "test/large_str_test.cc",
+  "test/large_mem_test.cc",
+  "test/large_jmp_test.cc"
 ]
 
 null_system_files = [
@@ -71,8 +71,9 @@ null_system_files = [
   "test/test_system/mock_text_window.cc"
 ]
 
-test_env.RlvmProgram('rlvmTests', ["test/rlvmTest.cpp", null_system_files,
-                                   test_case_files],
+test_env.RlvmProgram('rlvm_unittests',
+                     ["test/rlvm_unittests.cc", null_system_files,
+                      test_case_files],
                      use_lib_set = ["TEST"],
                      rlvm_libs = ["rlvm"])
-test_env.Install('$OUTPUT_DIR', 'rlvmTests')
+test_env.Install('$OUTPUT_DIR', 'rlvm_unittests')
diff --git a/test/effect_test.cpp → test/effect_test.cc b/test/effect_test.cpp → test/effect_test.cc
@@ -35,7 +35,7 @@
 #include "test_system/test_event_system.h"
 #include "test_system/test_system.h"
 
-#include "testUtils.hpp"
+#include "test_utils.h"
 
 #include <boost/shared_ptr.hpp>
 

diff --git a/test/expression_test.cpp → test/expression_test.cc b/test/expression_test.cpp → test/expression_test.cc
@@ -34,7 +34,7 @@
 #include "modules/module_jmp.h"
 #include "test_system/test_system.h"
 
-#include "testUtils.hpp"
+#include "test_utils.h"
 
 using namespace std;
 using namespace libreallive;

diff --git a/test/gameexe_test.cpp → test/gameexe_test.cc b/test/gameexe_test.cpp → test/gameexe_test.cc
@@ -29,7 +29,7 @@
 
 #include "gtest/gtest.h"
 
-#include "testUtils.hpp"
+#include "test_utils.h"
 
 #include <string>
 #include <vector>

diff --git a/test/graphics_object_test.cpp → test/graphics_object_test.cc b/test/graphics_object_test.cpp → test/graphics_object_test.cc
@@ -53,7 +53,7 @@
 #include "test_system/test_system.h"
 #include "utilities/exception.h"
 
-#include "testUtils.hpp"
+#include "test_utils.h"
 #include <iostream>
 
 using namespace boost;

diff --git a/test/large_jmp_test.cpp → test/large_jmp_test.cc b/test/large_jmp_test.cpp → test/large_jmp_test.cc
@@ -35,7 +35,7 @@
 #include "modules/module_str.h"
 #include "test_system/test_system.h"
 
-#include "testUtils.hpp"
+#include "test_utils.h"
 
 #include <iostream>
 using namespace std;

diff --git a/test/large_mem_test.cpp → test/large_mem_test.cc b/test/large_mem_test.cpp → test/large_mem_test.cc
@@ -34,7 +34,7 @@
 
 #include "test_system/test_system.h"
 
-#include "testUtils.hpp"
+#include "test_utils.h"
 
 #include <iostream>
 using namespace std;

diff --git a/test/large_str_test.cpp → test/large_str_test.cc b/test/large_str_test.cpp → test/large_str_test.cc
@@ -35,7 +35,7 @@
 
 #include "test_system/test_system.h"
 
-#include "testUtils.hpp"
+#include "test_utils.h"
 
 #include <string>
 #include <iostream>

diff --git a/test/large_sys_test.cpp → test/large_sys_test.cc b/test/large_sys_test.cpp → test/large_sys_test.cc
@@ -34,7 +34,7 @@
 #include "modules/module_sys.h"
 #include "test_system/test_system.h"
 
-#include "testUtils.hpp"
+#include "test_utils.h"
 
 #include <iostream>
 using namespace std;

diff --git a/test/lazy_array_test.cpp → test/lazy_array_test.cc b/test/lazy_array_test.cpp → test/lazy_array_test.cc
@@ -34,7 +34,7 @@
 
 #include "utilities/lazy_array.h"
 
-#include "testUtils.hpp"
+#include "test_utils.h"
 
 #include <iostream>
 #include <algorithm>

diff --git a/test/luaRlvm.cpp → test/lua_rlvm.cc b/test/luaRlvm.cpp → test/lua_rlvm.cc
diff --git a/test/medium_eventloop_test.cpp → test/medium_eventloop_test.cc b/test/medium_eventloop_test.cpp → test/medium_eventloop_test.cc
@@ -29,7 +29,7 @@
 #include "machine/rlmachine.h"
 #include "modules/module_event_loop.h"
 
-#include "testUtils.hpp"
+#include "test_utils.h"
 
 class MediumEventLoopTest : public FullSystemTest {
  protected:

diff --git a/test/medium_grp_test.cpp → test/medium_grp_test.cc b/test/medium_grp_test.cpp → test/medium_grp_test.cc
@@ -31,7 +31,7 @@
 #include "systems/base/colour.h"
 #include "test_system/mock_surface.h"
 
-#include "testUtils.hpp"
+#include "test_utils.h"
 
 class MediumGrpTest : public FullSystemTest {
  protected:

diff --git a/test/medium_msg_test.cpp → test/medium_msg_test.cc b/test/medium_msg_test.cpp → test/medium_msg_test.cc
@@ -32,7 +32,7 @@
 #include "test_system/test_machine.h"
 #include "test_system/test_system.h"
 
-#include "testUtils.hpp"
+#include "test_utils.h"
 
 class MediumMsgLoopTest : public FullSystemTest {
  protected:

diff --git a/test/medium_object_promotion.cpp → test/medium_object_promotion.cc b/test/medium_object_promotion.cpp → test/medium_object_promotion.cc
@@ -40,7 +40,7 @@
 #include "test_system/test_machine.h"
 #include "test_system/test_system.h"
 
-#include "testUtils.hpp"
+#include "test_utils.h"
 
 using namespace boost;
 

diff --git a/test/rect_test.cpp → test/rect_test.cc b/test/rect_test.cpp → test/rect_test.cc
diff --git a/test/regressions_test.cpp → test/regressions_test.cc b/test/regressions_test.cpp → test/regressions_test.cc
diff --git a/test/rlbabel_test.cpp → test/rlbabel_test.cc b/test/rlbabel_test.cpp → test/rlbabel_test.cc
@@ -32,7 +32,7 @@
 #include "libreallive/intmemref.h"
 #include "machine/rlmachine.h"
 #include "systems/base/rlbabel_dll.h"
-#include "testUtils.hpp"
+#include "test_utils.h"
 #include "test_system/test_system.h"
 #include "utilities/exception.h"
 

diff --git a/test/rlmachine_test.cpp → test/rlmachine_test.cc b/test/rlmachine_test.cpp → test/rlmachine_test.cc
@@ -39,7 +39,7 @@
 #include "modules/module_str.h"
 #include "utilities/exception.h"
 #include "libreallive/intmemref.h"
-#include "testUtils.hpp"
+#include "test_utils.h"
 
 using namespace std;
 using namespace libreallive;

diff --git a/test/rloperation_test.cpp → test/rloperation_test.cc b/test/rloperation_test.cpp → test/rloperation_test.cc
@@ -41,7 +41,7 @@
 #include "machine/rloperation/references.h"
 #include "test_system/test_system.h"
 
-#include "testUtils.hpp"
+#include "test_utils.h"
 
 using namespace std;
 using namespace std::placeholders;

diff --git a/test/rlvmTest.cpp → test/rlvm_unittests.cc b/test/rlvmTest.cpp → test/rlvm_unittests.cc
diff --git a/test/sound_system_test.cpp → test/sound_system_test.cc b/test/sound_system_test.cpp → test/sound_system_test.cc
@@ -29,7 +29,7 @@
 #include <boost/archive/text_iarchive.hpp>
 #include <boost/archive/text_oarchive.hpp>
 
-#include "testUtils.hpp"
+#include "test_utils.h"
 
 #include "test_system/test_system.h"
 #include "test_system/test_sound_system.h"

diff --git a/test/test_index_series.cpp → test/test_index_series.cc b/test/test_index_series.cpp → test/test_index_series.cc
@@ -28,7 +28,7 @@
 
 #include <tuple>
 
-#include "testUtils.hpp"
+#include "test_utils.h"
 #include "modules/module_sys_index_series.h"
 
 using std::get;

diff --git a/test/test_system/test_system.cc b/test/test_system/test_system.cc
@@ -30,7 +30,7 @@
 #include <string>
 
 #include "systems/base/system_error.h"
-#include "testUtils.hpp"
+#include "test_utils.h"
 
 // -----------------------------------------------------------------------
 // TestSystem

diff --git a/test/testUtils.cpp → test/test_utils.cc b/test/testUtils.cpp → test/test_utils.cc
@@ -25,7 +25,7 @@
 //
 // -----------------------------------------------------------------------
 
-#include "testUtils.hpp"
+#include "test_utils.h"
 #include <vector>
 #include <boost/filesystem/operations.hpp>
 #include <stdexcept>

diff --git a/test/testUtils.hpp → test/test_utils.h b/test/testUtils.hpp → test/test_utils.h
diff --git a/test/text_system_test.cpp → test/text_system_test.cc b/test/text_system_test.cpp → test/text_system_test.cc
@@ -36,7 +36,7 @@
 #include "test_system/mock_text_window.h"
 #include "test_system/test_system.h"
 
-#include "testUtils.hpp"
+#include "test_utils.h"
 
 #include <string>
 #include <memory>

diff --git a/test/text_window_test.cpp → test/text_window_test.cc b/test/text_window_test.cpp → test/text_window_test.cc
@@ -36,7 +36,7 @@
 #include "test_system/test_text_window.h"
 #include "utilities/string_utilities.h"
 
-#include "testUtils.hpp"
+#include "test_utils.h"
 
 #include <boost/algorithm/string.hpp>
 

diff --git a/test/utilities_test.cpp → test/utilities_test.cc b/test/utilities_test.cpp → test/utilities_test.cc