From a983b3bec81a6909c75f6760281cb09ab296123e Mon Sep 17 00:00:00 2001
From: fgodi <fgodi@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Thu, 23 Nov 2017 17:20:14 +0000
Subject: test name

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/toplex_map@2946 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: d663b0f8578cb9a3ebced7d170bae5c924a02d78
---
 src/Toplex_map/test/CMakeLists.txt           |  2 +-
 src/Toplex_map/test/test.cpp                 | 71 ----------------------------
 src/Toplex_map/test/toplex_map_unit_test.cpp | 71 ++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 72 deletions(-)
 delete mode 100644 src/Toplex_map/test/test.cpp
 create mode 100644 src/Toplex_map/test/toplex_map_unit_test.cpp

(limited to 'src/Toplex_map')

diff --git a/src/Toplex_map/test/CMakeLists.txt b/src/Toplex_map/test/CMakeLists.txt
index 223ebccb..25fcabac 100644
--- a/src/Toplex_map/test/CMakeLists.txt
+++ b/src/Toplex_map/test/CMakeLists.txt
@@ -6,7 +6,7 @@ target_link_libraries(ToplexMapUT ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAM
 
 
 # Unitary tests
-add_test(NAME SalUT 
+add_test(NAME ToplexMapUT 
   COMMAND ${CMAKE_CURRENT_BINARY_DIR}/ToplexMapUT
     ${CMAKE_SOURCE_DIR}/src/Toplex_map/test/test.txt
     # XML format for Jenkins xUnit plugin 
diff --git a/src/Toplex_map/test/test.cpp b/src/Toplex_map/test/test.cpp
deleted file mode 100644
index 3f4d96c2..00000000
--- a/src/Toplex_map/test/test.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-#include <iostream>
-#include <gudhi/Lazy_toplex_map.h>
-#include <gudhi/Filtered_toplex_map.h>
-#include <gudhi/Fake_simplex_tree.h>
-
-#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE "toplex map"
-#include <boost/test/unit_test.hpp>
-
-using namespace Gudhi;
-
-std::vector<Vertex> sigma1 = {1, 2, 3, 4};
-std::vector<Vertex> sigma2 = {5, 2, 3, 6};
-std::vector<Vertex> sigma3 = {5};
-std::vector<Vertex> sigma4 = {5, 2, 3};
-std::vector<Vertex> sigma5 = {5, 2, 7};
-std::vector<Vertex> sigma6 = {4, 5, 3};
-std::vector<Vertex> sigma7 = {4, 5, 9};
-std::vector<Vertex> sigma8 = {1, 2, 3, 6};
-
-
-BOOST_AUTO_TEST_CASE(toplexmap) {
-    Toplex_map K;
-    K.insert_simplex(sigma1);
-    K.insert_simplex(sigma2);
-    K.insert_simplex(sigma3);
-    K.insert_simplex(sigma6);
-    K.insert_simplex(sigma7);
-    BOOST_CHECK(K.membership(sigma4));
-    BOOST_CHECK(!K.maximality(sigma5));
-    BOOST_CHECK(!K.membership(sigma5));
-    K.contraction(4,5);
-    BOOST_CHECK(!K.membership(sigma6));
-}
-
-BOOST_AUTO_TEST_CASE(ltoplexmap) {
-    Lazy_Toplex_map K;
-    K.insert_simplex(sigma1);
-    K.insert_simplex(sigma2);
-    K.insert_simplex(sigma3);
-    K.insert_simplex(sigma6);
-    K.insert_simplex(sigma7);
-    BOOST_CHECK(K.membership(sigma4));
-    BOOST_CHECK(!K.membership(sigma5));
-    K.contraction(4,5);
-    BOOST_CHECK(!K.membership(sigma6));
-}
-
-BOOST_AUTO_TEST_CASE(ftoplexmap) {
-    Filtered_toplex_map K;
-    K.insert_simplex_and_subfaces(sigma1, 2.);
-    K.insert_simplex_and_subfaces(sigma2, 2.);
-    K.insert_simplex_and_subfaces(sigma6, 1.);
-    K.insert_simplex_and_subfaces(sigma7, 1.);
-    BOOST_CHECK(K.filtration(sigma4)==2.);
-    BOOST_CHECK(K.filtration(sigma3)==1.);
-}
-
-/*
-BOOST_AUTO_TEST_CASE(toplexmap_candidates) {
-    Toplex_map K;
-    K.insert_simplex(sigma1);
-    K.insert_simplex(sigma2);
-    K.remove_simplex(sigma1);
-    K.remove_simplex(sigma2);
-    auto c = K.candidates();
-    BOOST_CHECK(c.count(get_key(sigma1)));
-    BOOST_CHECK(c.count(get_key(sigma2)));
-    BOOST_CHECK(c.size()==2);
-}
-*/
diff --git a/src/Toplex_map/test/toplex_map_unit_test.cpp b/src/Toplex_map/test/toplex_map_unit_test.cpp
new file mode 100644
index 00000000..3f4d96c2
--- /dev/null
+++ b/src/Toplex_map/test/toplex_map_unit_test.cpp
@@ -0,0 +1,71 @@
+#include <iostream>
+#include <gudhi/Lazy_toplex_map.h>
+#include <gudhi/Filtered_toplex_map.h>
+#include <gudhi/Fake_simplex_tree.h>
+
+#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE "toplex map"
+#include <boost/test/unit_test.hpp>
+
+using namespace Gudhi;
+
+std::vector<Vertex> sigma1 = {1, 2, 3, 4};
+std::vector<Vertex> sigma2 = {5, 2, 3, 6};
+std::vector<Vertex> sigma3 = {5};
+std::vector<Vertex> sigma4 = {5, 2, 3};
+std::vector<Vertex> sigma5 = {5, 2, 7};
+std::vector<Vertex> sigma6 = {4, 5, 3};
+std::vector<Vertex> sigma7 = {4, 5, 9};
+std::vector<Vertex> sigma8 = {1, 2, 3, 6};
+
+
+BOOST_AUTO_TEST_CASE(toplexmap) {
+    Toplex_map K;
+    K.insert_simplex(sigma1);
+    K.insert_simplex(sigma2);
+    K.insert_simplex(sigma3);
+    K.insert_simplex(sigma6);
+    K.insert_simplex(sigma7);
+    BOOST_CHECK(K.membership(sigma4));
+    BOOST_CHECK(!K.maximality(sigma5));
+    BOOST_CHECK(!K.membership(sigma5));
+    K.contraction(4,5);
+    BOOST_CHECK(!K.membership(sigma6));
+}
+
+BOOST_AUTO_TEST_CASE(ltoplexmap) {
+    Lazy_Toplex_map K;
+    K.insert_simplex(sigma1);
+    K.insert_simplex(sigma2);
+    K.insert_simplex(sigma3);
+    K.insert_simplex(sigma6);
+    K.insert_simplex(sigma7);
+    BOOST_CHECK(K.membership(sigma4));
+    BOOST_CHECK(!K.membership(sigma5));
+    K.contraction(4,5);
+    BOOST_CHECK(!K.membership(sigma6));
+}
+
+BOOST_AUTO_TEST_CASE(ftoplexmap) {
+    Filtered_toplex_map K;
+    K.insert_simplex_and_subfaces(sigma1, 2.);
+    K.insert_simplex_and_subfaces(sigma2, 2.);
+    K.insert_simplex_and_subfaces(sigma6, 1.);
+    K.insert_simplex_and_subfaces(sigma7, 1.);
+    BOOST_CHECK(K.filtration(sigma4)==2.);
+    BOOST_CHECK(K.filtration(sigma3)==1.);
+}
+
+/*
+BOOST_AUTO_TEST_CASE(toplexmap_candidates) {
+    Toplex_map K;
+    K.insert_simplex(sigma1);
+    K.insert_simplex(sigma2);
+    K.remove_simplex(sigma1);
+    K.remove_simplex(sigma2);
+    auto c = K.candidates();
+    BOOST_CHECK(c.count(get_key(sigma1)));
+    BOOST_CHECK(c.count(get_key(sigma2)));
+    BOOST_CHECK(c.size()==2);
+}
+*/
-- 
cgit v1.2.3