From 1cc52611de62ef9c280fc29692ea3dee712cfe23 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Thu, 31 Jan 2013 06:39:31 -0800
Subject: [PATCH] Rearrange the tests files

---
 aegisub/build/tests/tests.vcxproj             | 45 +++++++++---------
 aegisub/build/tests/tests.vcxproj.filters     | 44 ++++++++---------
 aegisub/tests/Makefile                        | 47 +++++++++----------
 aegisub/tests/{ => support}/main.cpp          |  0
 aegisub/tests/{ => support}/main.h            |  0
 aegisub/tests/{ => support}/util.cpp          |  0
 aegisub/tests/{ => support}/util.h            |  0
 aegisub/tests/{ => support}/util_unix.cpp     |  0
 aegisub/tests/{ => support}/util_windows.cpp  |  0
 .../access.cpp}                               |  0
 .../{libaegisub_cajun.cpp => tests/cajun.cpp} |  0
 .../{libaegisub_color.cpp => tests/color.cpp} |  0
 .../dialogue_lexer.cpp}                       |  0
 .../hotkey.cpp}                               |  0
 .../{libaegisub_iconv.cpp => tests/iconv.cpp} |  0
 .../keyframe.cpp}                             |  0
 .../line_iterator.cpp}                        |  0
 .../line_wrap.cpp}                            |  0
 .../{libaegisub_mru.cpp => tests/mru.cpp}     |  0
 .../option.cpp}                               |  0
 .../{libaegisub_path.cpp => tests/path.cpp}   |  0
 .../signals.cpp}                              |  0
 .../syntax_highlight.cpp}                     |  0
 .../thesaurus.cpp}                            |  0
 .../{libaegisub_util.cpp => tests/util.cpp}   |  2 +-
 .../{libaegisub_vfr.cpp => tests/vfr.cpp}     |  0
 .../word_split.cpp}                           |  0
 27 files changed, 69 insertions(+), 69 deletions(-)
 rename aegisub/tests/{ => support}/main.cpp (100%)
 rename aegisub/tests/{ => support}/main.h (100%)
 rename aegisub/tests/{ => support}/util.cpp (100%)
 rename aegisub/tests/{ => support}/util.h (100%)
 rename aegisub/tests/{ => support}/util_unix.cpp (100%)
 rename aegisub/tests/{ => support}/util_windows.cpp (100%)
 rename aegisub/tests/{libaegisub_access.cpp => tests/access.cpp} (100%)
 rename aegisub/tests/{libaegisub_cajun.cpp => tests/cajun.cpp} (100%)
 rename aegisub/tests/{libaegisub_color.cpp => tests/color.cpp} (100%)
 rename aegisub/tests/{libaegisub_dialogue_lexer.cpp => tests/dialogue_lexer.cpp} (100%)
 rename aegisub/tests/{libaegisub_hotkey.cpp => tests/hotkey.cpp} (100%)
 rename aegisub/tests/{libaegisub_iconv.cpp => tests/iconv.cpp} (100%)
 rename aegisub/tests/{libaegisub_keyframe.cpp => tests/keyframe.cpp} (100%)
 rename aegisub/tests/{libaegisub_line_iterator.cpp => tests/line_iterator.cpp} (100%)
 rename aegisub/tests/{libaegisub_line_wrap.cpp => tests/line_wrap.cpp} (100%)
 rename aegisub/tests/{libaegisub_mru.cpp => tests/mru.cpp} (100%)
 rename aegisub/tests/{libaegisub_option.cpp => tests/option.cpp} (100%)
 rename aegisub/tests/{libaegisub_path.cpp => tests/path.cpp} (100%)
 rename aegisub/tests/{libaegisub_signals.cpp => tests/signals.cpp} (100%)
 rename aegisub/tests/{libaegisub_syntax_highlight.cpp => tests/syntax_highlight.cpp} (100%)
 rename aegisub/tests/{libaegisub_thesaurus.cpp => tests/thesaurus.cpp} (100%)
 rename aegisub/tests/{libaegisub_util.cpp => tests/util.cpp} (97%)
 rename aegisub/tests/{libaegisub_vfr.cpp => tests/vfr.cpp} (100%)
 rename aegisub/tests/{libaegisub_word_split.cpp => tests/word_split.cpp} (100%)

diff --git a/aegisub/build/tests/tests.vcxproj b/aegisub/build/tests/tests.vcxproj
index 218823a87..71d734c5f 100644
--- a/aegisub/build/tests/tests.vcxproj
+++ b/aegisub/build/tests/tests.vcxproj
@@ -23,6 +23,7 @@
       </PreprocessorDefinitions>
       <AdditionalIncludeDirectories>
         $(AegisubSourceBase)libaegisub\include;
+        $(SrcDir)support;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
     </ClCompile>
@@ -37,32 +38,32 @@
 
   <!-- Source files -->
   <ItemGroup>
-    <ClCompile Include="$(SrcDir)libaegisub_access.cpp" />
-    <ClCompile Include="$(SrcDir)libaegisub_cajun.cpp" />
-    <ClCompile Include="$(SrcDir)libaegisub_color.cpp" />
-    <ClCompile Include="$(SrcDir)libaegisub_dialogue_lexer.cpp" />
-    <ClCompile Include="$(SrcDir)libaegisub_hotkey.cpp" />
-    <ClCompile Include="$(SrcDir)libaegisub_iconv.cpp" />
-    <ClCompile Include="$(SrcDir)libaegisub_keyframe.cpp" />
-    <ClCompile Include="$(SrcDir)libaegisub_line_iterator.cpp" />
-    <ClCompile Include="$(SrcDir)libaegisub_line_wrap.cpp" />
-    <ClCompile Include="$(SrcDir)libaegisub_mru.cpp" />
-    <ClCompile Include="$(SrcDir)libaegisub_option.cpp" />
-    <ClCompile Include="$(SrcDir)libaegisub_path.cpp" />
-    <ClCompile Include="$(SrcDir)libaegisub_signals.cpp" />
-    <ClCompile Include="$(SrcDir)libaegisub_syntax_highlight.cpp" />
-    <ClCompile Include="$(SrcDir)libaegisub_thesaurus.cpp" />
-    <ClCompile Include="$(SrcDir)libaegisub_util.cpp" />
-    <ClCompile Include="$(SrcDir)libaegisub_vfr.cpp" />
-    <ClCompile Include="$(SrcDir)libaegisub_word_split.cpp">
+    <ClCompile Include="$(SrcDir)tests\access.cpp" />
+    <ClCompile Include="$(SrcDir)tests\cajun.cpp" />
+    <ClCompile Include="$(SrcDir)tests\color.cpp" />
+    <ClCompile Include="$(SrcDir)tests\dialogue_lexer.cpp" />
+    <ClCompile Include="$(SrcDir)tests\hotkey.cpp" />
+    <ClCompile Include="$(SrcDir)tests\iconv.cpp" />
+    <ClCompile Include="$(SrcDir)tests\keyframe.cpp" />
+    <ClCompile Include="$(SrcDir)tests\line_iterator.cpp" />
+    <ClCompile Include="$(SrcDir)tests\line_wrap.cpp" />
+    <ClCompile Include="$(SrcDir)tests\mru.cpp" />
+    <ClCompile Include="$(SrcDir)tests\option.cpp" />
+    <ClCompile Include="$(SrcDir)tests\path.cpp" />
+    <ClCompile Include="$(SrcDir)tests\signals.cpp" />
+    <ClCompile Include="$(SrcDir)tests\syntax_highlight.cpp" />
+    <ClCompile Include="$(SrcDir)tests\thesaurus.cpp" />
+    <ClCompile Include="$(SrcDir)tests\util.cpp" />
+    <ClCompile Include="$(SrcDir)tests\vfr.cpp" />
+    <ClCompile Include="$(SrcDir)tests\word_split.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)main.cpp" />
-    <ClCompile Include="$(SrcDir)util.cpp" />
+    <ClCompile Include="$(SrcDir)support\main.cpp" />
+    <ClCompile Include="$(SrcDir)support\util.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SrcDir)main.h" />
-    <ClInclude Include="$(SrcDir)util.h" />
+    <ClInclude Include="$(SrcDir)support\main.h" />
+    <ClInclude Include="$(SrcDir)support\util.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(SrcDir)setup.bat" />
diff --git a/aegisub/build/tests/tests.vcxproj.filters b/aegisub/build/tests/tests.vcxproj.filters
index 3a6297a12..75aa7e626 100644
--- a/aegisub/build/tests/tests.vcxproj.filters
+++ b/aegisub/build/tests/tests.vcxproj.filters
@@ -11,72 +11,72 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="$(SrcDir)main.cpp">
+    <ClCompile Include="$(SrcDir)support\main.cpp">
       <Filter>Support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)util.cpp">
+    <ClCompile Include="$(SrcDir)support\util.cpp">
       <Filter>Support</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)libaegisub_access.cpp">
+    <ClCompile Include="$(SrcDir)tests\access.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)libaegisub_cajun.cpp">
+    <ClCompile Include="$(SrcDir)tests\cajun.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)libaegisub_color.cpp">
+    <ClCompile Include="$(SrcDir)tests\color.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)libaegisub_dialogue_lexer.cpp">
+    <ClCompile Include="$(SrcDir)tests\dialogue_lexer.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)libaegisub_hotkey.cpp">
+    <ClCompile Include="$(SrcDir)tests\hotkey.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)libaegisub_iconv.cpp">
+    <ClCompile Include="$(SrcDir)tests\iconv.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)libaegisub_keyframe.cpp">
+    <ClCompile Include="$(SrcDir)tests\keyframe.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)libaegisub_line_iterator.cpp">
+    <ClCompile Include="$(SrcDir)tests\line_iterator.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)libaegisub_line_wrap.cpp">
+    <ClCompile Include="$(SrcDir)tests\line_wrap.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)libaegisub_mru.cpp">
+    <ClCompile Include="$(SrcDir)tests\mru.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)libaegisub_option.cpp">
+    <ClCompile Include="$(SrcDir)tests\option.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)libaegisub_path.cpp">
+    <ClCompile Include="$(SrcDir)tests\path.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)libaegisub_signals.cpp">
+    <ClCompile Include="$(SrcDir)tests\signals.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)libaegisub_syntax_highlight.cpp">
+    <ClCompile Include="$(SrcDir)tests\syntax_highlight.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)libaegisub_thesaurus.cpp">
+    <ClCompile Include="$(SrcDir)tests\thesaurus.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)libaegisub_util.cpp">
+    <ClCompile Include="$(SrcDir)tests\util.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)libaegisub_vfr.cpp">
+    <ClCompile Include="$(SrcDir)tests\vfr.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)libaegisub_word_split.cpp">
+    <ClCompile Include="$(SrcDir)tests\word_split.cpp">
       <Filter>Tests</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SrcDir)main.h">
+    <ClInclude Include="$(SrcDir)support\main.h">
       <Filter>Support</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)util.h">
+    <ClInclude Include="$(SrcDir)support\util.h">
       <Filter>Support</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/aegisub/tests/Makefile b/aegisub/tests/Makefile
index 06041676a..076a21d09 100644
--- a/aegisub/tests/Makefile
+++ b/aegisub/tests/Makefile
@@ -6,7 +6,7 @@ PROGRAM = run
 LIBS += -L../libaegisub -laegisub -L../universalchardet -luniversalchardet
 LDFLAGS += -Wl,-rpath $(CURDIR)/../libaegisub $(LDFLAGS_ICONV)
 
-CPPFLAGS += -I../src/include -I../libaegisub/include $(CFLAGS_ICONV) -I${GTEST_ROOT} -I${GTEST_ROOT}/include
+CPPFLAGS += -I../src/include -I../libaegisub/include $(CFLAGS_ICONV) -I${GTEST_ROOT} -I${GTEST_ROOT}/include -I./support
 CXXFLAGS += -Wno-unused-value
 
 ifeq (yes, $(BUILD_DARWIN))
@@ -14,30 +14,29 @@ LDFLAGS += -framework ApplicationServices -framework Foundation
 endif
 
 SRC = \
-		main.cpp \
-		util.cpp \
-		util_unix.cpp \
-		libaegisub_access.cpp \
-		libaegisub_cajun.cpp \
-		libaegisub_color.cpp \
-		libaegisub_dialogue_lexer.cpp \
-		libaegisub_hotkey.cpp \
-		libaegisub_iconv.cpp \
-		libaegisub_keyframe.cpp \
-		libaegisub_line_iterator.cpp \
-		libaegisub_line_wrap.cpp \
-		libaegisub_mru.cpp \
-		libaegisub_option.cpp \
-		libaegisub_path.cpp \
-		libaegisub_signals.cpp \
-		libaegisub_syntax_highlight.cpp \
-		libaegisub_thesaurus.cpp \
-		libaegisub_util.cpp \
-		libaegisub_vfr.cpp \
-		libaegisub_word_split.cpp \
+		support/main.cpp \
+		support/util.cpp \
+		support/util_unix.cpp \
+		tests/access.cpp \
+		tests/cajun.cpp \
+		tests/color.cpp \
+		tests/dialogue_lexer.cpp \
+		tests/hotkey.cpp \
+		tests/iconv.cpp \
+		tests/keyframe.cpp \
+		tests/line_iterator.cpp \
+		tests/line_wrap.cpp \
+		tests/mru.cpp \
+		tests/option.cpp \
+		tests/path.cpp \
+		tests/signals.cpp \
+		tests/syntax_highlight.cpp \
+		tests/thesaurus.cpp \
+		tests/util.cpp \
+		tests/vfr.cpp \
+		tests/word_split.cpp \
 		${GTEST_ROOT}/src/gtest-all.cc
 
-HEADER = \
-	*.h
+HEADER = support/*.h tests/*.h
 
 include ../Makefile.target
diff --git a/aegisub/tests/main.cpp b/aegisub/tests/support/main.cpp
similarity index 100%
rename from aegisub/tests/main.cpp
rename to aegisub/tests/support/main.cpp
diff --git a/aegisub/tests/main.h b/aegisub/tests/support/main.h
similarity index 100%
rename from aegisub/tests/main.h
rename to aegisub/tests/support/main.h
diff --git a/aegisub/tests/util.cpp b/aegisub/tests/support/util.cpp
similarity index 100%
rename from aegisub/tests/util.cpp
rename to aegisub/tests/support/util.cpp
diff --git a/aegisub/tests/util.h b/aegisub/tests/support/util.h
similarity index 100%
rename from aegisub/tests/util.h
rename to aegisub/tests/support/util.h
diff --git a/aegisub/tests/util_unix.cpp b/aegisub/tests/support/util_unix.cpp
similarity index 100%
rename from aegisub/tests/util_unix.cpp
rename to aegisub/tests/support/util_unix.cpp
diff --git a/aegisub/tests/util_windows.cpp b/aegisub/tests/support/util_windows.cpp
similarity index 100%
rename from aegisub/tests/util_windows.cpp
rename to aegisub/tests/support/util_windows.cpp
diff --git a/aegisub/tests/libaegisub_access.cpp b/aegisub/tests/tests/access.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_access.cpp
rename to aegisub/tests/tests/access.cpp
diff --git a/aegisub/tests/libaegisub_cajun.cpp b/aegisub/tests/tests/cajun.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_cajun.cpp
rename to aegisub/tests/tests/cajun.cpp
diff --git a/aegisub/tests/libaegisub_color.cpp b/aegisub/tests/tests/color.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_color.cpp
rename to aegisub/tests/tests/color.cpp
diff --git a/aegisub/tests/libaegisub_dialogue_lexer.cpp b/aegisub/tests/tests/dialogue_lexer.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_dialogue_lexer.cpp
rename to aegisub/tests/tests/dialogue_lexer.cpp
diff --git a/aegisub/tests/libaegisub_hotkey.cpp b/aegisub/tests/tests/hotkey.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_hotkey.cpp
rename to aegisub/tests/tests/hotkey.cpp
diff --git a/aegisub/tests/libaegisub_iconv.cpp b/aegisub/tests/tests/iconv.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_iconv.cpp
rename to aegisub/tests/tests/iconv.cpp
diff --git a/aegisub/tests/libaegisub_keyframe.cpp b/aegisub/tests/tests/keyframe.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_keyframe.cpp
rename to aegisub/tests/tests/keyframe.cpp
diff --git a/aegisub/tests/libaegisub_line_iterator.cpp b/aegisub/tests/tests/line_iterator.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_line_iterator.cpp
rename to aegisub/tests/tests/line_iterator.cpp
diff --git a/aegisub/tests/libaegisub_line_wrap.cpp b/aegisub/tests/tests/line_wrap.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_line_wrap.cpp
rename to aegisub/tests/tests/line_wrap.cpp
diff --git a/aegisub/tests/libaegisub_mru.cpp b/aegisub/tests/tests/mru.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_mru.cpp
rename to aegisub/tests/tests/mru.cpp
diff --git a/aegisub/tests/libaegisub_option.cpp b/aegisub/tests/tests/option.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_option.cpp
rename to aegisub/tests/tests/option.cpp
diff --git a/aegisub/tests/libaegisub_path.cpp b/aegisub/tests/tests/path.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_path.cpp
rename to aegisub/tests/tests/path.cpp
diff --git a/aegisub/tests/libaegisub_signals.cpp b/aegisub/tests/tests/signals.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_signals.cpp
rename to aegisub/tests/tests/signals.cpp
diff --git a/aegisub/tests/libaegisub_syntax_highlight.cpp b/aegisub/tests/tests/syntax_highlight.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_syntax_highlight.cpp
rename to aegisub/tests/tests/syntax_highlight.cpp
diff --git a/aegisub/tests/libaegisub_thesaurus.cpp b/aegisub/tests/tests/thesaurus.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_thesaurus.cpp
rename to aegisub/tests/tests/thesaurus.cpp
diff --git a/aegisub/tests/libaegisub_util.cpp b/aegisub/tests/tests/util.cpp
similarity index 97%
rename from aegisub/tests/libaegisub_util.cpp
rename to aegisub/tests/tests/util.cpp
index 36935c273..ec9a44f1d 100644
--- a/aegisub/tests/libaegisub_util.cpp
+++ b/aegisub/tests/tests/util.cpp
@@ -14,7 +14,7 @@
 //
 // Aegisub Project http://www.aegisub.org/
 
-#include "../libaegisub/config.h"
+#include "../../libaegisub/config.h"
 
 #include <libaegisub/util.h>
 
diff --git a/aegisub/tests/libaegisub_vfr.cpp b/aegisub/tests/tests/vfr.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_vfr.cpp
rename to aegisub/tests/tests/vfr.cpp
diff --git a/aegisub/tests/libaegisub_word_split.cpp b/aegisub/tests/tests/word_split.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_word_split.cpp
rename to aegisub/tests/tests/word_split.cpp