diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/activetest.cpp | 4 | ||||
-rw-r--r-- | tests/logtest.cpp | 6 | ||||
-rw-r--r-- | tests/matrixtest.cpp | 6 | ||||
-rw-r--r-- | tests/particlebodytest.cpp | 6 | ||||
-rw-r--r-- | tests/rendertest.cpp | 14 | ||||
-rw-r--r-- | tests/rendertest.h | 6 | ||||
-rw-r--r-- | tests/simplegame.cpp | 12 | ||||
-rw-r--r-- | tests/spritesheettest.cpp | 6 | ||||
-rw-r--r-- | tests/structtest.cpp | 14 | ||||
-rw-r--r-- | tests/syncqueuetest.cpp | 4 | ||||
-rw-r--r-- | tests/threadtest.cpp | 8 | ||||
-rw-r--r-- | tests/vector3test.cpp | 38 | ||||
-rw-r--r-- | tests/vector4test.cpp | 32 | ||||
-rw-r--r-- | tests/windowtest.cpp | 8 | ||||
-rw-r--r-- | tests/yagetest.cpp | 12 |
15 files changed, 101 insertions, 75 deletions
diff --git a/tests/activetest.cpp b/tests/activetest.cpp index cebf90d3..3d561283 100644 --- a/tests/activetest.cpp +++ b/tests/activetest.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * activetest.cpp +/** --------------------------------------------------------------------------- + * @file: activetest.cpp * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> * MIT License, see LICENSE file for more details. diff --git a/tests/logtest.cpp b/tests/logtest.cpp index 74a71057..e1010754 100644 --- a/tests/logtest.cpp +++ b/tests/logtest.cpp @@ -1,13 +1,11 @@ -/* ---------------------------------------------------------------------------- - * logtest.cpp +/** --------------------------------------------------------------------------- + * @file: logtest.cpp * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ - - #include <yage.h> #include <iostream> diff --git a/tests/matrixtest.cpp b/tests/matrixtest.cpp index be2ca186..1e316502 100644 --- a/tests/matrixtest.cpp +++ b/tests/matrixtest.cpp @@ -1,13 +1,11 @@ -/* ---------------------------------------------------------------------------- - * matrixtest.cpp +/** --------------------------------------------------------------------------- + * @file: matrixtest.cpp * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ - - #include <gtest/gtest.h> #include <yage/yage.h> diff --git a/tests/particlebodytest.cpp b/tests/particlebodytest.cpp index 511e3ef5..09277826 100644 --- a/tests/particlebodytest.cpp +++ b/tests/particlebodytest.cpp @@ -1,13 +1,11 @@ -/* ---------------------------------------------------------------------------- - * particlebodytest.cpp +/** --------------------------------------------------------------------------- + * @file: particlebodytest.cpp * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ - - #include <gtest/gtest.h> #include <yage/yage.h> diff --git a/tests/rendertest.cpp b/tests/rendertest.cpp index a0452ab4..74476ef8 100644 --- a/tests/rendertest.cpp +++ b/tests/rendertest.cpp @@ -1,19 +1,13 @@ -/* ---------------------------------------------------------------------------- - * rendertest.cpp +/** --------------------------------------------------------------------------- + * @file: rendertest.cpp * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ - - #include "rendertest.h" -RenderTest::RenderTest(std::string sprite) : sprite_(sprite) -{ -} +RenderTest::RenderTest(std::string sprite) : sprite_(sprite) {} -void RenderTest::render() -{ -} +void RenderTest::render() {} diff --git a/tests/rendertest.h b/tests/rendertest.h index f6ed36c6..db0e06e2 100644 --- a/tests/rendertest.h +++ b/tests/rendertest.h @@ -1,13 +1,11 @@ -/* ---------------------------------------------------------------------------- - * rendertest.h +/** --------------------------------------------------------------------------- + * @file: rendertest.h * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ - - #include <string> class RenderTest diff --git a/tests/simplegame.cpp b/tests/simplegame.cpp index 99796f08..d4c7b266 100644 --- a/tests/simplegame.cpp +++ b/tests/simplegame.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * simplegame.cpp +/** --------------------------------------------------------------------------- + * @file: simplegame.cpp * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> * MIT License, see LICENSE file for more details. @@ -22,13 +22,7 @@ int main() window.create("Simple Game", 800, 640); SpriteBatch sp; - program.compileShaders( - "/home/yannherklotz/Github/YAGE/resources/defaultshader.vert", - "/home/yannherklotz/Github/YAGE/resources/defaultshader.frag"); - program.addAttribute("vertex_position"); - program.addAttribute("vertex_colour"); - program.addAttribute("vertex_uv"); - program.linkShaders(); + program.defaultSetup(); Texture fountain = ResourceManager::getTexture("/home/yannherklotz/Github/YAGE/tests/" diff --git a/tests/spritesheettest.cpp b/tests/spritesheettest.cpp index 2ece61bf..fcfc842c 100644 --- a/tests/spritesheettest.cpp +++ b/tests/spritesheettest.cpp @@ -1,13 +1,11 @@ -/* ---------------------------------------------------------------------------- - * spritesheettest.cpp +/** --------------------------------------------------------------------------- + * @file: spritesheettest.cpp * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ - - /** @file */ #include <gtest/gtest.h> diff --git a/tests/structtest.cpp b/tests/structtest.cpp index 13a2c591..99752abb 100644 --- a/tests/structtest.cpp +++ b/tests/structtest.cpp @@ -1,8 +1,16 @@ -#include <yage/yage.h> +/** --------------------------------------------------------------------------- + * @file: structtest.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + #include <gtest/gtest.h> +#include <yage/yage.h> -#include <ctime> #include <cstdlib> +#include <ctime> TEST(StructTest, ColourDefault) { @@ -15,7 +23,7 @@ TEST(StructTest, ColourDefault) TEST(StructTest, ColourConstructor) { - int r = rand()%255, g = rand()%255, b = rand() % 255, a = rand() % 255; + int r = rand() % 255, g = rand() % 255, b = rand() % 255, a = rand() % 255; yage::Colour c(r, g, b, a); ASSERT_EQ(c.r, r); diff --git a/tests/syncqueuetest.cpp b/tests/syncqueuetest.cpp index db347854..1d7d8037 100644 --- a/tests/syncqueuetest.cpp +++ b/tests/syncqueuetest.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * syncqueuetest.cpp +/** --------------------------------------------------------------------------- + * @file: syncqueuetest.cpp * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> * MIT License, see LICENSE file for more details. diff --git a/tests/threadtest.cpp b/tests/threadtest.cpp index 9ea46e62..0527665a 100644 --- a/tests/threadtest.cpp +++ b/tests/threadtest.cpp @@ -1,5 +1,5 @@ -/* ---------------------------------------------------------------------------- - * threadtest.cpp +/** --------------------------------------------------------------------------- + * @file: threadtest.cpp * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> * MIT License, see LICENSE file for more details. @@ -17,9 +17,7 @@ int main() std::cout << "n before: " << n << "\n"; - auto f = [&] () { - n = 8; - }; + auto f = [&]() { n = 8; }; std::thread t1(f); diff --git a/tests/vector3test.cpp b/tests/vector3test.cpp index daab02af..570a5c10 100644 --- a/tests/vector3test.cpp +++ b/tests/vector3test.cpp @@ -1,13 +1,37 @@ -/* ---------------------------------------------------------------------------- - * vector3test.cpp +/** --------------------------------------------------------------------------- + * @file: vector3test.cpp * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ -/* ---------------------------------------------------------------------------- - * vector3test.cpp +/** --------------------------------------------------------------------------- + * @file: vector3test.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + +/** --------------------------------------------------------------------------- + * @file: vector3test.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + +/** --------------------------------------------------------------------------- + * @file: vector3test.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + +/** --------------------------------------------------------------------------- + * @file: vector3test.cpp * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> * MIT License, see LICENSE file for more details. @@ -17,8 +41,8 @@ #include <gtest/gtest.h> #include <yage/yage.h> -#include <ctime> #include <cstdlib> +#include <ctime> using namespace yage; @@ -60,9 +84,7 @@ TEST(Vector3, Assigning_z) ASSERT_EQ(vec.z, vec[2]); } -TEST(Vector3, Addition) -{ -} +TEST(Vector3, Addition) {} int main(int argc, char **argv) { diff --git a/tests/vector4test.cpp b/tests/vector4test.cpp index fd67d802..53554a25 100644 --- a/tests/vector4test.cpp +++ b/tests/vector4test.cpp @@ -1,13 +1,37 @@ -/* ---------------------------------------------------------------------------- - * vector4test.cpp +/** --------------------------------------------------------------------------- + * @file: vector4test.cpp * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ -/* ---------------------------------------------------------------------------- - * vector4test.cpp +/** --------------------------------------------------------------------------- + * @file: vector4test.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + +/** --------------------------------------------------------------------------- + * @file: vector4test.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + +/** --------------------------------------------------------------------------- + * @file: vector4test.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + +/** --------------------------------------------------------------------------- + * @file: vector4test.cpp * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> * MIT License, see LICENSE file for more details. diff --git a/tests/windowtest.cpp b/tests/windowtest.cpp index 53ff3e9c..40b7e664 100644 --- a/tests/windowtest.cpp +++ b/tests/windowtest.cpp @@ -1,15 +1,13 @@ -/* ---------------------------------------------------------------------------- - * windowtest.cpp +/** --------------------------------------------------------------------------- + * @file: windowtest.cpp * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ - - -#include <yage/yage.h> #include <gtest/gtest.h> +#include <yage/yage.h> TEST(Window, Open) { diff --git a/tests/yagetest.cpp b/tests/yagetest.cpp index 2e961327..a599eba2 100644 --- a/tests/yagetest.cpp +++ b/tests/yagetest.cpp @@ -1,23 +1,21 @@ -/* ---------------------------------------------------------------------------- - * yagetest.cpp +/** --------------------------------------------------------------------------- + * @file: yagetest.cpp * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> * MIT License, see LICENSE file for more details. * ---------------------------------------------------------------------------- */ - - -#include <yage/yage.h> #include <gtest/gtest.h> +#include <yage/yage.h> TEST(YAGE, InitQuit) { try { yage::init(); yage::quit(); - } catch(std::runtime_error e) { -// ASSERT_TRUE(false); + } catch (std::runtime_error e) { + // ASSERT_TRUE(false); } } |