fix test setup and small correction

diff --git a/splittermond-assistant-tests/splittermond-assistant-tests.pro b/splittermond-assistant-tests/splittermond-assistant-tests.pro
index 6a8fde533d37b96d46fdf39de74e80c1555d80c9..4a9965e0ff7d6c34913b585d83e65be2c309b74e 100644 (file)
--- a/splittermond-assistant-tests/splittermond-assistant-tests.pro
+++ b/splittermond-assistant-tests/splittermond-assistant-tests.pro
@@ -1,3 +1,5 @@
+include(../qmake-target-platform.pri)
+include(../qmake-destination-path.pri)
 QT += testlib
 QT -= gui
 
@@ -5,15 +7,16 @@ CONFIG += qt console warn_on depend_includepath testcase
 CONFIG -= app_bundle
 
 TEMPLATE = app
-include(../qmake-destination-path.pri)
-include(../qmake-target-platform.pri)
 INCLUDEPATH += ../splittermond-assistant/src
 DEPENDPATH += ../splittermond-assistant/src
 
-SOURCES +=  tst_test.cpp
+SOURCES +=  tst_test.cpp \
+            ../splittermond-assistant/src/character.cpp
 
 DESTDIR = $$PWD/../binaries/$$DESTINATION_PATH
 OBJECTS_DIR = $$PWD/build/$$DESTINATION_PATH/.obj
 MOC_DIR = $$PWD/build/$$DESTINATION_PATH/.moc
 RCC_DIR = $$PWD/build/$$DESTINATION_PATH/.qrc
 UI_DIR = $$PWD/build/$$DESTINATION_PATH/.ui
+message(splittermond-assistant-test output dir: $${DESTDIR})
+message(splittermond-assistant-test project dir: $${PWD})

diff --git a/splittermond-assistant-tests/tst_test.cpp b/splittermond-assistant-tests/tst_test.cpp
index 7a0132b50b244235ef6e1a2dc28120c2da4c84a7..2ea0de2f17fa385ac7b2a2f70bda146836b70ee1 100644 (file)
--- a/splittermond-assistant-tests/tst_test.cpp
+++ b/splittermond-assistant-tests/tst_test.cpp
@@ -15,7 +15,7 @@ public:
 private slots:
   void initTestCase();
   void cleanupTestCase();
-  void test_case1();
+  void init_Character();
 
 };
 
@@ -39,9 +39,24 @@ void Test::cleanupTestCase()
 
 }
 
-void Test::test_case1()
+void Test::init_Character()
 {
-  QVERIFY_EXCEPTION_THROWN (sm::data::Character c{12, 12}, std::invalid_argument);
+  QVERIFY_EXCEPTION_THROWN (sm::data::Character c ({12, 12}), std::invalid_argument);
+  sm::data::Character c ({9, 9, 9, 9, 9, 9, 9, 9, 8, 8,
+                          8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+                          8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+                          8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+                          8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+                          8, 8, 8, 10});
+  QVERIFY ( c.skill (sm::data::Skill::heal) == 8);
+  QVERIFY ( c.attribute (sm::data::Attribute::mind) == 9);
+  QVERIFY ( c.life() == 10);
+  QVERIFY_EXCEPTION_THROWN (sm::data::Character c ({9, 9, 9, 9, 9, 9, 9, 9, 8, 8,
+                            8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+                            8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+                            8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+                            8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+                            8, 8, 8, 10, 11}), std::invalid_argument);
 }
 
 QTEST_APPLESS_MAIN (Test)

diff --git a/splittermond-assistant/src/character.cpp b/splittermond-assistant/src/character.cpp
index 6fbe87d8870a21b28db182f976e61d2af4b12075..a3488d1a0af6ced6c4249029259c1cb1e977af0b 100644 (file)
--- a/splittermond-assistant/src/character.cpp
+++ b/splittermond-assistant/src/character.cpp
@@ -26,8 +26,8 @@ Character::Character (std::initializer_list<unsigned int> list) : d{new Characte
   if (list.size() != 54) throw std::invalid_argument (std::string ("Not exactly 54 arguments!") );
   unsigned int ctr = 0;
   for (auto val : list) {
-    if (ctr < 8) d->attributes.insert ({Attribute{ctr}, val});
-    else if (ctr >= 8 && ctr < 53) d->skills.insert ({Skill{ctr - 8}, val});
+    if (ctr < 8) d->attributes.insert ({static_cast<Attribute> (ctr), val});
+    else if (ctr >= 8 && ctr < 53) d->skills.insert ({static_cast<Skill> (ctr - 8), val});
     else if (ctr == 53) d->life = val;
     else throw std::invalid_argument ("Found an argument that should not have been there!");
     ctr++;

diff --git a/splittermond-assistant/src/character.h b/splittermond-assistant/src/character.h
index d2fb51d431ba31ab4c511bd349698d95b2700b07..f00dae10797165b397262775c2efc26e29595253 100644 (file)
--- a/splittermond-assistant/src/character.h
+++ b/splittermond-assistant/src/character.h
@@ -74,6 +74,12 @@ enum Damage : unsigned int {
   used
 };
 
+enum TestKind : unsigned int {
+  safe,
+  normal,
+  risk
+};
+
 static const std::unordered_map<Skill, std::pair<Attribute, Attribute>> skillAttributes{
   {acrobatics, {agility, strength}},
   {alchemy, {mystic, mind}},