fix tests

hotstreams · Aug 30, 2024 · be7b141 · be7b141
1 parent 10defad
commit be7b141
Show file tree

Hide file tree

Showing 16 changed files with 143 additions and 143 deletions.
diff --git a/.github/workflows/ubuntu-build.yml b/.github/workflows/ubuntu-build.yml
@@ -25,7 +25,7 @@ jobs:
       - name: build
         run: |
           mkdir build
-          cmake -DBUILD_SAMPLES=OFF -DBUILD_TESTS=OFF -DOPENGL_SHADER_OUTPUT=ON -S . -B build
+          cmake -DBUILD_SAMPLES=OFF -DBUILD_TESTS=ON -DOPENGL_SHADER_OUTPUT=ON -S . -B build
           cd build
           make
       - name: test

diff --git a/tests/limitless/core/context_test.cpp b/tests/limitless/core/context_test.cpp
@@ -7,15 +7,15 @@ using namespace Limitless;
 using namespace LimitlessTest;
 
 TEST_CASE("Context constructor") {
-    Context context = {"Title", {1024, 1024}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {1024, 1024}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     REQUIRE(static_cast<GLFWwindow*>(context) != nullptr);
 
     check_opengl_state();
 }
 
 TEST_CASE("Context move constructor") {
-    Context context1 = {"Title1", {1024, 1024}, {{WindowHint::Visible, false}}};
+    Context context1 = {"Title1", {1024, 1024}, nullptr , {{WindowHint::Hint::Visible, false}}};
     Context context2 = {std::move(context1)};
 
     REQUIRE(context2.getSize() == glm::uvec2{1024, 1024});
@@ -28,8 +28,8 @@ TEST_CASE("Context move constructor") {
 }
 
 TEST_CASE("Context move operator") {
-    Context context1 = {"Title1", {1024, 1024}, {{WindowHint::Visible, false}}};
-    Context context2 = {"Title2", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context1 = {"Title1", {1024, 1024}, nullptr , {{WindowHint::Hint::Visible, false}}};
+    Context context2 = {"Title2", {512, 512}, nullptr , {{WindowHint::Hint::Visible, false}}};
 
     context2 = {std::move(context1)};
 

diff --git a/tests/limitless/core/shader_compiler_test.cpp b/tests/limitless/core/shader_compiler_test.cpp
@@ -8,7 +8,7 @@ using namespace Limitless;
 using namespace LimitlessTest;
 
 TEST_CASE("Manual shader program compilation") {
-    Context context = Context{"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         RendererSettings settings;
@@ -27,7 +27,7 @@ TEST_CASE("Manual shader program compilation") {
 }
 
 TEST_CASE("Auto shader program compilation") {
-    Context context = Context{"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         RendererSettings settings;
@@ -43,7 +43,7 @@ TEST_CASE("Auto shader program compilation") {
 }
 
 TEST_CASE("Auto shader program compilation with specified actions") {
-    Context context = Context{"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         RendererSettings settings;
@@ -63,7 +63,7 @@ TEST_CASE("Auto shader program compilation with specified actions") {
 }
 
 TEST_CASE("Throw on not existing path") {
-    Context context = Context{"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         RendererSettings settings;

diff --git a/tests/limitless/core/shader_test.cpp b/tests/limitless/core/shader_test.cpp
@@ -8,7 +8,7 @@ using namespace Limitless;
 using namespace LimitlessTest;
 
 TEST_CASE("Loads simple shader without error") {
-    Context context = Context{"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         Shader shader = Shader{"../../tests/limitless/assets/shader1.vert", Shader::Type::Vertex};
@@ -22,7 +22,7 @@ TEST_CASE("Loads simple shader without error") {
 }
 
 TEST_CASE("Replaces version in shader") {
-    Context context = Context{"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         Shader shader = Shader{"../../tests/limitless/assets/shader2.vert", Shader::Type::Vertex};
@@ -36,7 +36,7 @@ TEST_CASE("Replaces version in shader") {
 }
 
 TEST_CASE("Resolves include in shader") {
-    Context context = Context{"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         Shader shader = Shader{"../../tests/limitless/assets/shader4.vert", Shader::Type::Vertex};
@@ -50,7 +50,7 @@ TEST_CASE("Resolves include in shader") {
 }
 
 TEST_CASE("Replaces key-line in shader") {
-    Context context = Context{"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         Shader shader = Shader{"../../tests/limitless/assets/shader6.vert", Shader::Type::Vertex};
@@ -66,7 +66,7 @@ TEST_CASE("Replaces key-line in shader") {
 }
 
 TEST_CASE("Throw file not found") {
-    Context context = Context{"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         REQUIRE_THROWS_AS(Shader("../../tests/limitless/assets/3228.vert", Shader::Type::Vertex), shader_file_not_found);
@@ -78,7 +78,7 @@ TEST_CASE("Throw file not found") {
 }
 
 TEST_CASE("Throw include not found") {
-    Context context = Context{"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         REQUIRE_THROWS_AS(Shader("../../tests/limitless/assets/shader7.vert", Shader::Type::Vertex), shader_include_not_found);
@@ -90,7 +90,7 @@ TEST_CASE("Throw include not found") {
 }
 
 TEST_CASE("Throw shader_compilation_error") {
-    Context context = Context{"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         Shader shader = Shader{"../../tests/limitless/assets/shader8.vert", Shader::Type::Vertex};
@@ -103,7 +103,7 @@ TEST_CASE("Throw shader_compilation_error") {
 }
 
 TEST_CASE("Compiles simple shader") {
-    Context context = Context{"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         Shader shader = Shader{"../../tests/limitless/assets/shader1.vert", Shader::Type::Vertex};
@@ -117,7 +117,7 @@ TEST_CASE("Compiles simple shader") {
 }
 
 TEST_CASE("Shader move ctor") {
-    Context context = Context{"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         Shader shader1 = Shader{"../../tests/limitless/assets/shader1.vert", Shader::Type::Vertex};

diff --git a/tests/limitless/core/state_buffer_test.cpp b/tests/limitless/core/state_buffer_test.cpp
@@ -65,7 +65,7 @@ class BufferChecker {
 };
 
 TEST_CASE("Buffer mutable constructor") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         StateBuffer buffer = StateBuffer(Buffer::Type::Array, 1024, nullptr, Buffer::Usage::StaticDraw, Buffer::MutableAccess::None);
@@ -81,7 +81,7 @@ TEST_CASE("Buffer mutable constructor") {
 }
 
 TEST_CASE("Buffer immutable constructor") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         StateBuffer buffer = StateBuffer(Buffer::Type::Array, 1024, nullptr, Buffer::Storage::Static, Buffer::ImmutableAccess::None);
@@ -97,7 +97,7 @@ TEST_CASE("Buffer immutable constructor") {
 }
 
 TEST_CASE("Buffer bind function changes state correctly") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         StateBuffer buffer = StateBuffer(Buffer::Type::Array, 1024, nullptr, Buffer::Usage::StaticDraw, Buffer::MutableAccess::None);
@@ -111,7 +111,7 @@ TEST_CASE("Buffer bind function changes state correctly") {
 }
 
 TEST_CASE("Buffer bindAs function changes state correctly") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         StateBuffer buffer = StateBuffer(Buffer::Type::Array, 1024, nullptr, Buffer::Usage::StaticDraw, Buffer::MutableAccess::None);
@@ -125,7 +125,7 @@ TEST_CASE("Buffer bindAs function changes state correctly") {
 }
 
 TEST_CASE("Buffer bindBase function changes state correctly") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         StateBuffer buffer = StateBuffer(Buffer::Type::Uniform, 1024, nullptr, Buffer::Usage::StaticDraw, Buffer::MutableAccess::None);
@@ -139,7 +139,7 @@ TEST_CASE("Buffer bindBase function changes state correctly") {
 }
 
 TEST_CASE("Buffer bindBaseAs function changes state correctly") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         StateBuffer buffer = StateBuffer(Buffer::Type::Uniform, 1024, nullptr, Buffer::Usage::StaticDraw, Buffer::MutableAccess::None);
@@ -153,7 +153,7 @@ TEST_CASE("Buffer bindBaseAs function changes state correctly") {
 }
 
 TEST_CASE("Buffer bindBufferRange function changes state correctly") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         StateBuffer buffer = StateBuffer(Buffer::Type::Uniform, 1024, nullptr, Buffer::Usage::StaticDraw, Buffer::MutableAccess::None);
@@ -167,7 +167,7 @@ TEST_CASE("Buffer bindBufferRange function changes state correctly") {
 }
 
 TEST_CASE("Buffer bindBufferRangeAs function changes state correctly") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         StateBuffer buffer = StateBuffer(Buffer::Type::Uniform, 1024, nullptr, Buffer::Usage::StaticDraw, Buffer::MutableAccess::None);
@@ -181,7 +181,7 @@ TEST_CASE("Buffer bindBufferRangeAs function changes state correctly") {
 }
 
 TEST_CASE("Buffer mutable mapData function changes state correctly") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         StateBuffer buffer = StateBuffer(Buffer::Type::Uniform, 1024, nullptr, Buffer::Usage::StaticDraw, Buffer::MutableAccess::Write);
@@ -223,7 +223,7 @@ TEST_CASE("Buffer mutable mapData function changes state correctly") {
 }
 
 TEST_CASE("Buffer immutable mapData function changes state correctly") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         unsigned char data[1024] = {1};
@@ -263,7 +263,7 @@ TEST_CASE("Buffer immutable mapData function changes state correctly") {
 }
 
 TEST_CASE("Buffer bufferSubData function changes state correctly") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         StateBuffer buffer = StateBuffer(Buffer::Type::Uniform, 1024, nullptr, Buffer::Usage::StaticDraw, Buffer::MutableAccess::None);
@@ -277,7 +277,7 @@ TEST_CASE("Buffer bufferSubData function changes state correctly") {
 }
 
 TEST_CASE("Buffer clone function changes state correctly for mutable buffer") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         unsigned char data[1024] = {42};
@@ -298,7 +298,7 @@ TEST_CASE("Buffer clone function changes state correctly for mutable buffer") {
 }
 
 TEST_CASE("Buffer clone function changes state correctly for immutable buffer") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         unsigned char data[1024] = {42};
@@ -319,7 +319,7 @@ TEST_CASE("Buffer clone function changes state correctly for immutable buffer")
 }
 
 TEST_CASE("Buffer resize function changes state correctly for mutable buffer") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         unsigned char data[1024] = {42};
@@ -336,7 +336,7 @@ TEST_CASE("Buffer resize function changes state correctly for mutable buffer") {
 }
 
 TEST_CASE("Buffer resize function changes state correctly for immutable buffer") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         unsigned char data[1024] = {42};
@@ -353,7 +353,7 @@ TEST_CASE("Buffer resize function changes state correctly for immutable buffer")
 }
 
 TEST_CASE("Buffer resize function changes state correctly for immutable buffer with immutable buffers bound") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     StateBuffer fake1 = StateBuffer(Buffer::Type::Uniform, 1024, nullptr, Buffer::Storage::Static, Buffer::ImmutableAccess::None);
     StateBuffer fake2 = StateBuffer(Buffer::Type::Uniform, 1024, nullptr, Buffer::Storage::Static, Buffer::ImmutableAccess::None);
@@ -378,7 +378,7 @@ TEST_CASE("Buffer resize function changes state correctly for immutable buffer w
 }
 
 TEST_CASE("Buffer clone function changes state correctly for immutable buffer with immutable buffers bound") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     StateBuffer fake1 = StateBuffer(Buffer::Type::Uniform, 1024, nullptr, Buffer::Storage::Static, Buffer::ImmutableAccess::None);
     StateBuffer fake2 = StateBuffer(Buffer::Type::ShaderStorage, 1024, nullptr, Buffer::Storage::Static, Buffer::ImmutableAccess::None);

diff --git a/tests/limitless/core/state_texture_test.cpp b/tests/limitless/core/state_texture_test.cpp
@@ -83,7 +83,7 @@ class TextureChecker {
 };
 
 TEST_CASE("Texture constructor") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         StateTexture tex = StateTexture();
@@ -98,7 +98,7 @@ TEST_CASE("Texture constructor") {
 }
 
 TEST_CASE("Texture activate function") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         StateTexture tex = StateTexture();
@@ -112,7 +112,7 @@ TEST_CASE("Texture activate function") {
 }
 
 TEST_CASE("Texture bind function") {
-    Context context = {"Title", {512, 512}, {{WindowHint::Visible, false}}};
+    Context context = {"Title", {512, 512}, nullptr, {{WindowHint::Hint::Visible, false}}};
 
     {
         StateTexture tex = StateTexture();