aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2017-07-27 18:32:19 +0100
committerYann Herklotz <ymherklotz@gmail.com>2017-07-27 18:32:19 +0100
commiteb9b37e0029db31a7b8399bc4855c34c0e1f391d (patch)
treed7487b4f0190a9b53fec8ad1739f1ed2f5ecc22f /test
parent802a29f8c69c5bea0d57a7acdbdecf3aa554a976 (diff)
parent57d11153188dbe2a0b8f97baffcebcec5b4614fb (diff)
downloadYAGE-eb9b37e0029db31a7b8399bc4855c34c0e1f391d.tar.gz
YAGE-eb9b37e0029db31a7b8399bc4855c34c0e1f391d.zip
Merge branch 'master' of github.com:ymherklotz/YAGE
Diffstat (limited to 'test')
-rw-r--r--test/matrixtest.cpp28
-rw-r--r--test/testbench.cpp40
2 files changed, 57 insertions, 11 deletions
diff --git a/test/matrixtest.cpp b/test/matrixtest.cpp
index 08d025a6..50a0b29c 100644
--- a/test/matrixtest.cpp
+++ b/test/matrixtest.cpp
@@ -1,9 +1,31 @@
-/*
- * created 22-06-17 by Yann Herklotz
+/* ------------------------------------------------------------------------------
+ * MIT License
+ *
+ * Copyright (c) 2017 Yann Herklotz Grave
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * ------------------------------------------------------------------------------
+ * Description:
*
* Tests the math class using different tests to see if matrix operations work
* correctly.
- *
+ * ------------------------------------------------------------------------------
*/
#include "Math/math.hpp"
diff --git a/test/testbench.cpp b/test/testbench.cpp
index 77bd4a5a..c83d20b7 100644
--- a/test/testbench.cpp
+++ b/test/testbench.cpp
@@ -1,3 +1,33 @@
+/* ------------------------------------------------------------------------------
+ * MIT License
+ *
+ * Copyright (c) 2017 Yann Herklotz Grave
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * ------------------------------------------------------------------------------
+ * Description:
+ *
+ * Tests the math class using different tests to see if matrix operations work
+ * correctly.
+ * ------------------------------------------------------------------------------
+ */
+
#include "testbench.hpp"
#include <algorithm>
@@ -17,18 +47,12 @@ void TestBench::endTest(bool pass)
incrementer--;
if(incrementer!=0)
- {
throw std::runtime_error("Start and End don't match");
- }
- if(pass)
- {
+ if(pass)
passed++;
- }
- else
- {
+ else
failed++;
- }
tests_[passed+failed-1].passed=pass;
}