From e9e19fbf61b2d2cb4efc2a1e6551b629094d7087 Mon Sep 17 00:00:00 2001
From: klmp200 <klmp200@klmp200.net>
Date: Tue, 16 May 2017 01:33:36 +0200
Subject: [PATCH] Premier test fonctionnel

---
 CMakeLists.txt                     |  9 ++++++++-
 fish_shell/CMakeLists.txt          |  4 ++--
 fish_shell_tests/CMakeLists.txt    |  5 ++---
 fish_shell_tests/FishCoreTests.cpp | 10 ++++------
 fish_shell_tests/main.cpp          | 10 ++--------
 5 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0dd57f8..3c1eb5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,9 +44,16 @@ include_directories(
         "${source_dir}/googlemock/include"
 )
 
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_FLAGS "-Wall -Werror -pedantic -fpic -Wextra -Wshadow")
+
 add_subdirectory(fish_shell)
+
 add_subdirectory(fish_shell_tests)
 
+
 enable_testing()
 
-add_test(fish_tests fish_shell_tests/fish_tests)
+add_test(NAME fish_tests
+        COMMAND fish_tests
+)
diff --git a/fish_shell/CMakeLists.txt b/fish_shell/CMakeLists.txt
index aace618..272f384 100644
--- a/fish_shell/CMakeLists.txt
+++ b/fish_shell/CMakeLists.txt
@@ -4,5 +4,5 @@ project(fish_shell)
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_C_FLAGS "-Wall -Werror -pedantic -fpic -Wextra -Wshadow")
 
-set(SOURCE_FILES main.c fish_core.c fish_core.h fish_commands.c fish_commands.h fish_types.h fish_utils.c fish_utils.h fish_globbing.c fish_globbing.h)
-add_executable(fish ${SOURCE_FILES})
+file(GLOB SOURCE_FILES *)
+add_executable(fish ${SOURCE_FILES})
\ No newline at end of file
diff --git a/fish_shell_tests/CMakeLists.txt b/fish_shell_tests/CMakeLists.txt
index 8a4f8df..72e4047 100644
--- a/fish_shell_tests/CMakeLists.txt
+++ b/fish_shell_tests/CMakeLists.txt
@@ -4,17 +4,16 @@ project(fish_shell_tests)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -c")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 
 include_directories(
         "${source_dir}/googletest/include"
         "${source_dir}/googlemock/include"
 )
 
-set(SOURCE_FILES_TESTS main.cpp FishCoreTests.cpp FishCoreTests.h)
+file(GLOB SOURCE_FILES_TESTS *)
 
 add_executable(fish_tests ${SOURCE_FILES_TESTS})
 
 target_link_libraries(fish_tests libgtest libgmock)
 
-
diff --git a/fish_shell_tests/FishCoreTests.cpp b/fish_shell_tests/FishCoreTests.cpp
index 030cf05..4ef96b8 100644
--- a/fish_shell_tests/FishCoreTests.cpp
+++ b/fish_shell_tests/FishCoreTests.cpp
@@ -3,19 +3,17 @@
 //
 
 #include "FishCoreTests.h"
-
-//
-// Created by Antoine Bartuccio on 15/05/2017.
-//
-
 #include "../fish_shell/fish_core.c"
+#include "../fish_shell/fish_utils.c"
+#include "../fish_shell/fish_commands.c"
+#include "../fish_shell/fish_globbing.c"
 
 
 //TEST_F(FishCoreTests, split){
 //	ASSERT_TRUE(true);
 //}
 
-TEST(simple_split, split){
+TEST(command_split, split){
 	char input[] = "git push --force";
 	char *output[] = {
 			(char *) "git",
diff --git a/fish_shell_tests/main.cpp b/fish_shell_tests/main.cpp
index 95f52c9..c2657e9 100644
--- a/fish_shell_tests/main.cpp
+++ b/fish_shell_tests/main.cpp
@@ -2,15 +2,9 @@
 // Created by Antoine Bartuccio on 15/05/2017.
 //
 
-
-
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
 int main(int argc, char **argv){
-
-	printf("Je mange des patates");
 	::testing::InitGoogleTest(&argc, argv);
-	int ret = RUN_ALL_TESTS();
-
-	return ret;
+	return RUN_ALL_TESTS();
 }