From f4a70cc41e69670cb61be9f823f77ded6d2cb119 Mon Sep 17 00:00:00 2001
From: Sanchez Alexandre <alexandre.sanchez@insa-rennes.fr>
Date: Wed, 27 Apr 2016 10:47:05 +0200
Subject: [PATCH] [TU] Correction de l'exemple de base des TU
---
.../ElderInternalIgnition_test.cbp | 32 +++++++------------
TU/test_main.c | 12 +++----
TU/test_partie.c | 27 +++++-----------
TU/test_partie.h | 9 +++---
4 files changed, 27 insertions(+), 53 deletions(-)
diff --git a/ElderInternalIgnition/ElderInternalIgnition_test.cbp b/ElderInternalIgnition/ElderInternalIgnition_test.cbp
index 9935314..0530e71 100644
--- a/ElderInternalIgnition/ElderInternalIgnition_test.cbp
+++ b/ElderInternalIgnition/ElderInternalIgnition_test.cbp
@@ -29,17 +29,16 @@
</Target>
</Build>
<Compiler>
- <Add directory="./../Libs/libroxml-2.3.0/src" />
- <Add directory="./../src" />
- <Add directory="./../Libs/SDL-1.2.15/include" />
+ <Add directory="../Libs/libroxml-2.3.0/src" />
+ <Add directory="../Libs/SDL-1.2.15/include/SDL" />
+ <Add directory="../src" />
<Add directory="../Libs/cmocka-1.0.0/include" />
</Compiler>
<Linker>
- <Add library="../Libs/libroxml-2.3.0/Build/libroxml.dll" />
- <Add library="./../Libs/SDL-1.2.15/bin/SDL.dll" />
- <Add library="../Libs/cmocka-1.0.0/lib/cmocka.dll.a" />
- <Add directory="./../Libs" />
- <Add directory="../Libs/cmocka-1.0.0/lib" />
+ <Add library="SDL" />
+ <Add library="roxml" />
+ <Add library="cmocka" />
+ <Add directory="../Libs/libroxml-2.3.0/Build" />
</Linker>
<Unit filename="../TU/test_main.c">
<Option compilerVar="CC" />
@@ -60,17 +59,10 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="../src/SDL.h" />
- <Unit filename="../src/TU_main.c">
- <Option compilerVar="CC" />
- </Unit>
- <Unit filename="../src/TU_partie.c">
- <Option compilerVar="CC" />
- </Unit>
<Unit filename="../src/TerrainsXML.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="../src/TerrainsXML.h" />
- <Unit filename="../src/affichage.h" />
<Unit filename="../src/affichageConsole2.c">
<Option compilerVar="CC" />
</Unit>
@@ -111,12 +103,6 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="../src/joueurList.h" />
- <Unit filename="../src/main.c">
- <Option compilerVar="CC" />
- </Unit>
- <Unit filename="../src/mainPartieConsole.c">
- <Option compilerVar="CC" />
- </Unit>
<Unit filename="../src/partie.c">
<Option compilerVar="CC" />
</Unit>
@@ -129,6 +115,10 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="../src/resultat_aleatoire.h" />
+ <Unit filename="../src/skinsXML.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../src/skinsXML.h" />
<Unit filename="../src/structures.h" />
<Unit filename="../src/terrain.c">
<Option compilerVar="CC" />
diff --git a/TU/test_main.c b/TU/test_main.c
index dccd2cc..181bbf7 100644
--- a/TU/test_main.c
+++ b/TU/test_main.c
@@ -1,20 +1,16 @@
-#include "partie.h"
-#include "test_partie.h"
-
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#include <stddef.h>
#include <setjmp.h>
#include <cmocka.h>
+#include "test_partie.h"
-Partie * p;
-
-/*int main(void)
+int main()
{
const UnitTest tests[] =
{
- unit_test(test_initPartie(void ** state)),
+ unit_test(test_getNbTour),
};
return run_tests(tests);
-}*/
+}
diff --git a/TU/test_partie.c b/TU/test_partie.c
index dfe2ce1..1282060 100644
--- a/TU/test_partie.c
+++ b/TU/test_partie.c
@@ -1,10 +1,3 @@
-#include "test_partie.h"
-#include "structures.h"
-#include "partie.h"
-#include "joueurList.h"
-#include "joueur.h"
-#include "case.h"
-
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
@@ -12,21 +5,17 @@
#include <setjmp.h>
#include <cmocka.h>
-static int test_initPartie(void ** state) {
- Partie * p = (Partie *) (* state);
- initPartie();
- assert_int_equal(p->nbTours, getNbTour(p));
-}
+#include "test_partie.h"
-static int test_getNbTour(Partie * p) {
+void test_getNbTour(void **state) {
+ Partie p;
+ p.nbTours = 4;
- // Partie * p = (Partie *)(*state);
- p->nbTours = 4;
- getNbTour(p);
+ // Test 1
+ assert_int_equal(p.nbTours, getNbTour(&p));
- assert_int_equal(4, p->nbTours);
- /* Teste d'une partie NULL */
- assert_int_equal(p->nbTours,getNbTour(NULL));
+ // Test 2
+ assert_int_equal(-1, getNbTour(NULL));
}
diff --git a/TU/test_partie.h b/TU/test_partie.h
index 613a96e..0fa57e8 100644
--- a/TU/test_partie.h
+++ b/TU/test_partie.h
@@ -1,10 +1,9 @@
+#include "structures.h"
+#include "partie.h"
+
#ifndef TEST_PARTIE_H
#define TEST_PARTIE_H
-// static int test_initPartie(void ** state);
-
-// static int test_getNbTour(Partie * p);
-
-//static int test_deletePartie(Partie * p);
+void test_getNbTour(void **state);
#endif
--
GitLab