Skip to content

Commit 4ef424a

Browse files
committed
Now using common test library
1 parent fa8ccab commit 4ef424a

File tree

4 files changed

+5
-36
lines changed

4 files changed

+5
-36
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ set(SDL_RENDER_D3D OFF CACHE BOOL "" FORCE)
1818
set(SDL_RENDER_VULKAN OFF CACHE BOOL "" FORCE)
1919
set(SDL_VULKAN OFF CACHE BOOL "" FORCE)
2020
set(SDL_WASAPI OFF CACHE BOOL "" FORCE)
21+
2122
fetch_external_module(
2223
SDL
2324
GIT_REPOSITORY https://github.com/libsdl-org/SDL.git
@@ -36,7 +37,7 @@ add_langulus_mod(LangulusModInputSDL ${LANGULUS_MOD_INPUTSDL_SOURCES})
3637
target_link_libraries(LangulusModInputSDL PRIVATE SDL3-static)
3738

3839
if(LANGULUS_TESTING)
39-
enable_testing()
40+
enable_testing()
4041
add_subdirectory(test)
4142
endif()
4243

test/Main.cpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,6 @@
55
///
66
/// SPDX-License-Identifier: GPL-3.0-or-later
77
///
8-
#include "Main.hpp"
8+
#include <Langulus/MetaOf.hpp>
99

10-
#define CATCH_CONFIG_RUNNER
11-
#include <catch2/catch.hpp>
12-
13-
LANGULUS_RTTI_BOUNDARY(RTTI::MainBoundary)
14-
15-
int main(int argc, char* argv[]) {
16-
Catch::Session session;
17-
return session.run(argc, argv);
18-
}
10+
LANGULUS_RTTI_BOUNDARY(RTTI::MainBoundary)

test/Main.hpp

Lines changed: 0 additions & 17 deletions
This file was deleted.

test/TestInput.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,10 @@
55
///
66
/// SPDX-License-Identifier: GPL-3.0-or-later
77
///
8-
#include "Main.hpp"
98
#include <Langulus/Input.hpp>
10-
#include <catch2/catch.hpp>
9+
#include <Langulus/Testing.hpp>
1110

1211

13-
/// See https://github.com/catchorg/Catch2/blob/devel/docs/tostring.md
14-
CATCH_TRANSLATE_EXCEPTION(::Langulus::Exception const& ex) {
15-
const Text serialized {ex};
16-
return ::std::string {Token {serialized}};
17-
}
18-
1912
SCENARIO("Input handler creation", "[input]") {
2013
static Allocator::State memoryState;
2114

0 commit comments

Comments
 (0)