(OPM#687) Moved FileInterface tests into ApplicationCode/UnitTests

atgeirr · Dec 3, 2015 · c72e047 · c72e047
1 parent e03b649
commit c72e047
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 172 deletions.
diff --git a/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt b/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt
diff --git a/ApplicationCode/FileInterface/FileInterface_UnitTests/main.cpp b/ApplicationCode/FileInterface/FileInterface_UnitTests/main.cpp
diff --git a/...face/FileInterface_UnitTests/Ert-Test.cpp → ApplicationCode/UnitTests/Ert-Test.cpp b/...face/FileInterface_UnitTests/Ert-Test.cpp → ApplicationCode/UnitTests/Ert-Test.cpp
diff --git a/...itTests/RifEclipseInputFileTools-Test.cpp → ...itTests/RifEclipseInputFileTools-Test.cpp b/...itTests/RifEclipseInputFileTools-Test.cpp → ...itTests/RifEclipseInputFileTools-Test.cpp
diff --git a/...UnitTests/RifReaderEclipseOutput-Test.cpp → ...UnitTests/RifReaderEclipseOutput-Test.cpp b/...UnitTests/RifReaderEclipseOutput-Test.cpp → ...UnitTests/RifReaderEclipseOutput-Test.cpp
@@ -18,7 +18,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
 #include "gtest/gtest.h"
 
 #include "RigCaseData.h"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -255,19 +255,6 @@ endif (RESINSIGHT_PRIVATE_INSTALL)
 add_subdirectory(ApplicationCode)
 add_subdirectory(OctavePlugin)
 
-################################################################################
-# Unit tests
-################################################################################
-add_subdirectory(ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests)
-#add_subdirectory(ApplicationCode/FileInterface/FileInterface_UnitTests)
-
-set_property(TARGET  
-#	FileInterface_UnitTests 
-	RigReservoirDataModel_UnitTests 
-	PROPERTY FOLDER "UnitTests"
-)
-
-
 ################################################################################
 # Code documentation using Doxygen
 ################################################################################