From b64b049b2290360f188d146c2ce7a164260449dc Mon Sep 17 00:00:00 2001
From: Marie Brunet Carteaux <marie.brunet@insa-rennes.fr>
Date: Tue, 26 Apr 2016 21:35:09 +0200
Subject: [PATCH] =?UTF-8?q?TU=20du=20fichier=20partie.c=20(1=C3=A8re=20par?=
=?UTF-8?q?tie)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- Création d'un projet EII_test.cbp (pourquoi l'ancien a disparu ?)
- Suppression de l'intégration de Cmocka au projet EII.cpb
- Ecriture des premiers TU pour le fichier partie.c
- Main à débuguer (actuellement en commentaire)
---
.../ElderInternalIgnition_test.cbp | 144 ++++++++++++++++++
TU/test_main.c | 20 +++
TU/test_partie.c | 32 ++++
TU/test_partie.h | 10 ++
src/TU_main.c | 7 -
src/TU_partie.c | 9 --
6 files changed, 206 insertions(+), 16 deletions(-)
create mode 100644 ElderInternalIgnition/ElderInternalIgnition_test.cbp
create mode 100644 TU/test_main.c
create mode 100644 TU/test_partie.c
create mode 100644 TU/test_partie.h
delete mode 100644 src/TU_main.c
delete mode 100644 src/TU_partie.c
diff --git a/ElderInternalIgnition/ElderInternalIgnition_test.cbp b/ElderInternalIgnition/ElderInternalIgnition_test.cbp
new file mode 100644
index 0000000..9935314
--- /dev/null
+++ b/ElderInternalIgnition/ElderInternalIgnition_test.cbp
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+ <FileVersion major="1" minor="6" />
+ <Project>
+ <Option title="ElderInternalIgnition" />
+ <Option pch_mode="2" />
+ <Option compiler="gcc" />
+ <Build>
+ <Target title="Debug">
+ <Option output="./../build/bin/Debug/ElderInternalIgnition" prefix_auto="1" extension_auto="1" />
+ <Option object_output="./../build/obj/Debug/" />
+ <Option type="1" />
+ <Option compiler="gcc" />
+ <Compiler>
+ <Add option="-g" />
+ </Compiler>
+ </Target>
+ <Target title="Release">
+ <Option output="./../build/bin/Release/ElderInternalIgnition" prefix_auto="1" extension_auto="1" />
+ <Option object_output="./../build/obj/Release/" />
+ <Option type="1" />
+ <Option compiler="gcc" />
+ <Compiler>
+ <Add option="-O2" />
+ </Compiler>
+ <Linker>
+ <Add option="-s" />
+ </Linker>
+ </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/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" />
+ </Linker>
+ <Unit filename="../TU/test_main.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../TU/test_partie.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../TU/test_partie.h" />
+ <Unit filename="../src/AffichageConsole.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../src/AffichageConsole.h" />
+ <Unit filename="../src/ClassesXML.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../src/ClassesXML.h" />
+ <Unit filename="../src/SDL.c">
+ <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>
+ <Unit filename="../src/affichageConsole2.h" />
+ <Unit filename="../src/carte.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../src/carte.h" />
+ <Unit filename="../src/case.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../src/case.h" />
+ <Unit filename="../src/classe.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../src/classe.h" />
+ <Unit filename="../src/competence.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../src/competence.h" />
+ <Unit filename="../src/controleur.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../src/controleur.h" />
+ <Unit filename="../src/controleurSDL.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../src/controleurSDL.h" />
+ <Unit filename="../src/deplacements.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../src/deplacements.h" />
+ <Unit filename="../src/joueur.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../src/joueur.h" />
+ <Unit filename="../src/joueurList.c">
+ <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>
+ <Unit filename="../src/partie.h" />
+ <Unit filename="../src/personnage.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../src/personnage.h" />
+ <Unit filename="../src/resultat_aleatoire.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../src/resultat_aleatoire.h" />
+ <Unit filename="../src/structures.h" />
+ <Unit filename="../src/terrain.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../src/terrain.h" />
+ <Extensions>
+ <code_completion />
+ <envvars />
+ <debugger />
+ <lib_finder disable_auto="1" />
+ </Extensions>
+ </Project>
+</CodeBlocks_project_file>
diff --git a/TU/test_main.c b/TU/test_main.c
new file mode 100644
index 0000000..dccd2cc
--- /dev/null
+++ b/TU/test_main.c
@@ -0,0 +1,20 @@
+#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>
+
+Partie * p;
+
+/*int main(void)
+{
+ const UnitTest tests[] =
+ {
+ unit_test(test_initPartie(void ** state)),
+ };
+ return run_tests(tests);
+}*/
diff --git a/TU/test_partie.c b/TU/test_partie.c
new file mode 100644
index 0000000..dfe2ce1
--- /dev/null
+++ b/TU/test_partie.c
@@ -0,0 +1,32 @@
+#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>
+#include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
+
+static int test_initPartie(void ** state) {
+ Partie * p = (Partie *) (* state);
+ initPartie();
+ assert_int_equal(p->nbTours, getNbTour(p));
+}
+
+static int test_getNbTour(Partie * p) {
+
+ // Partie * p = (Partie *)(*state);
+ p->nbTours = 4;
+ getNbTour(p);
+
+ assert_int_equal(4, p->nbTours);
+ /* Teste d'une partie NULL */
+ assert_int_equal(p->nbTours,getNbTour(NULL));
+}
+
+
diff --git a/TU/test_partie.h b/TU/test_partie.h
new file mode 100644
index 0000000..613a96e
--- /dev/null
+++ b/TU/test_partie.h
@@ -0,0 +1,10 @@
+#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);
+
+#endif
diff --git a/src/TU_main.c b/src/TU_main.c
deleted file mode 100644
index 58901d5..0000000
--- a/src/TU_main.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
-
diff --git a/src/TU_partie.c b/src/TU_partie.c
deleted file mode 100644
index 881176f..0000000
--- a/src/TU_partie.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
-#include "partie.h"
-
-
--
GitLab