Skip to content

Commit

Permalink
add config attribute value tests, put them in project files also.
Browse files Browse the repository at this point in the history
  • Loading branch information
cbeck88 committed May 23, 2014
1 parent 49f97ee commit 7cd2058
Show file tree
Hide file tree
Showing 5 changed files with 355 additions and 33 deletions.
24 changes: 13 additions & 11 deletions projectfiles/CodeLite/wesnoth.project
Expand Up @@ -3374,25 +3374,27 @@
<File Name="../../src/tests/utils/predicate.hpp"/>
<File Name="../../src/tests/utils/play_scenario.cpp"/>
</VirtualDirectory>
<File Name="../../src/tests/test_version.cpp"/>
<File Name="../../src/tests/test_sdl_utils.hpp"/>
<File Name="../../src/tests/floating_point_emulation.cpp"/>
<File Name="../../src/tests/test_addons.cpp"/>
<File Name="../../src/tests/test_commandline_options.cpp"/>
<File Name="../../src/tests/test_formula_function.cpp"/>
<File Name="../../src/tests/test_formula_ai.cpp"/>
<File Name="../../src/tests/test_image_modifications.cpp"/>
<File Name="../../src/tests/test_addons.cpp"/>
<File Name="../../src/tests/test_sdl_utils.cpp"/>
<File Name="../../src/tests/create_images.cpp"/>
<File Name="../../src/tests/test_whiteboard_side_actions.cpp"/>
<File Name="../../src/tests/test_network_worker.cpp"/>
<File Name="../../src/tests/test_unit_map.cpp"/>
<File Name="../../src/tests/main.cpp"/>
<File Name="../../src/tests/floating_point_emulation.cpp"/>
<File Name="../../src/tests/test_serialization.cpp"/>
<File Name="../../src/tests/test_config.cpp"/>
<File Name="../../src/tests/test_config_cache.cpp"/>
<File Name="../../src/tests/test_lexical_cast.cpp"/>
<File Name="../../src/tests/map_location.cpp"/>
<File Name="../../src/tests/test_mp_connect.cpp"/>
<File Name="../../src/tests/test_network_worker.cpp"/>
<File Name="../../src/tests/test_sdl_utils.hpp"/>
<File Name="../../src/tests/test_sdl_utils.cpp"/>
<File Name="../../src/tests/test_serialization.cpp"/>
<File Name="../../src/tests/test_team.cpp"/>
<File Name="../../src/tests/test_unit_map.cpp"/>
<File Name="../../src/tests/test_util.cpp"/>
<File Name="../../src/tests/test_lexical_cast.cpp"/>
<File Name="../../src/tests/test_version.cpp"/>
<File Name="../../src/tests/test_whiteboard_side_actions.cpp"/>
</VirtualDirectory>
<VirtualDirectory Name="ai">
<VirtualDirectory Name="testing">
Expand Down
168 changes: 168 additions & 0 deletions projectfiles/VC9/wesnoth.vcproj
Expand Up @@ -16219,6 +16219,62 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\tests\test_config.cpp"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Tests\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Tests\"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_with_VLD|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Tests\"
/>
</FileConfiguration>
<FileConfiguration
Name="Test_Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Tests\"
/>
</FileConfiguration>
<FileConfiguration
Name="Test_Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Tests\"
/>
</FileConfiguration>
<FileConfiguration
Name="ReleaseDEBUG|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Tests\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\tests\test_config_cache.cpp"
>
Expand Down Expand Up @@ -16499,6 +16555,118 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\tests\test_map_location.cpp"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Tests\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Tests\"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_with_VLD|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Tests\"
/>
</FileConfiguration>
<FileConfiguration
Name="Test_Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Tests\"
/>
</FileConfiguration>
<FileConfiguration
Name="Test_Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Tests\"
/>
</FileConfiguration>
<FileConfiguration
Name="ReleaseDEBUG|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Tests\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\tests\test_mp_connect.cpp"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Tests\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Tests\"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_with_VLD|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Tests\"
/>
</FileConfiguration>
<FileConfiguration
Name="Test_Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Tests\"
/>
</FileConfiguration>
<FileConfiguration
Name="Test_Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Tests\"
/>
</FileConfiguration>
<FileConfiguration
Name="ReleaseDEBUG|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Tests\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\tests\test_network_worker.cpp"
>
Expand Down
27 changes: 14 additions & 13 deletions src/CMakeLists.txt
Expand Up @@ -1241,34 +1241,35 @@ if(ENABLE_TESTS)

set(test_SRC
tests/floating_point_emulation.cpp
tests/gui/iterator.cpp
tests/gui/fire_event.cpp
tests/gui/test_drop_target.cpp
tests/gui/test_gui2.cpp
tests/gui/test_save_dialog.cpp
tests/gui/visitor.cpp
tests/main.cpp
tests/utils/fake_display.cpp
tests/utils/fake_event_source.cpp
tests/utils/game_config_manager.cpp
tests/utils/play_scenario.cpp
tests/test_addons.cpp
tests/test_commandline_options.cpp
tests/test_config.cpp
tests/test_config_cache.cpp
tests/test_formula_ai.cpp
tests/test_formula_function.cpp
tests/test_image_modifications.cpp
tests/test_lexical_cast.cpp
tests/test_network_worker.cpp
tests/test_map_location.cpp
tests/test_mp_connect.cpp
tests/test_network_worker.cpp
tests/test_sdl_utils.cpp
tests/test_serialization.cpp
tests/test_team.cpp
tests/test_unit_map.cpp
tests/test_util.cpp
tests/test_sdl_utils.cpp
tests/test_serialization.cpp
tests/test_version.cpp
tests/test_whiteboard_side_actions.cpp
tests/gui/iterator.cpp
tests/gui/fire_event.cpp
tests/gui/test_drop_target.cpp
tests/gui/test_gui2.cpp
tests/gui/visitor.cpp
tests/gui/test_save_dialog.cpp
tests/utils/fake_display.cpp
tests/utils/fake_event_source.cpp
tests/utils/game_config_manager.cpp
tests/utils/play_scenario.cpp
)
if(ENABLE_GAME)
set(test_LIB
Expand Down
19 changes: 10 additions & 9 deletions src/SConscript
Expand Up @@ -648,29 +648,30 @@ libtest_utils = test_env.Library("test_utils", test_utils_sources)

test_sources = Split("""
tests/floating_point_emulation.cpp
tests/gui/fire_event.cpp
tests/gui/iterator.cpp
tests/gui/test_drop_target.cpp
tests/gui/test_gui2.cpp
tests/gui/test_save_dialog.cpp
tests/gui/visitor.cpp
tests/main.cpp
tests/test_addons.cpp
tests/test_commandline_options.cpp
tests/test_config.cpp
tests/test_formula_ai.cpp
tests/test_formula_function.cpp
tests/test_image_modifications.cpp
tests/test_lexical_cast.cpp
tests/test_network_worker.cpp
tests/test_map_location.cpp
tests/test_mp_connect.cpp
tests/test_network_worker.cpp
tests/test_sdl_utils.cpp
tests/test_serialization.cpp
tests/test_team.cpp
tests/test_unit_map.cpp
tests/test_util.cpp
tests/test_sdl_utils.cpp
tests/test_serialization.cpp
tests/test_version.cpp
tests/test_whiteboard_side_actions.cpp
tests/gui/fire_event.cpp
tests/gui/iterator.cpp
tests/gui/test_drop_target.cpp
tests/gui/test_gui2.cpp
tests/gui/test_save_dialog.cpp
tests/gui/visitor.cpp
tests/utils/play_scenario.cpp
""")
test_sources.extend(test_env.Object("tests/test_config_cache.cpp"))
Expand Down

0 comments on commit 7cd2058

Please sign in to comment.