From 16d1dfd610f58a20ad8bfc8d0919ccf6e422bf2d Mon Sep 17 00:00:00 2001
From: Michael Kerber <mkerber@mpi-inf.mpg.de>
Date: Wed, 13 Aug 2008 14:21:03 +0000
Subject: [PATCH] Added tests from Bitstream_descartes_bfs into
 Bitstream_descartes

---
 .gitattributes                                |  2 +-
 .../Bitstream_descartes.cpp                   |  3 +-
 .../include/CGAL/_test_bitstream_descartes.h} | 32 +++++--------------
 .../include/CGAL/_test_real_root_isolator.h   |  3 +-
 4 files changed, 13 insertions(+), 27 deletions(-)
 rename Algebraic_kernel_d/test/{Algebraic_curve_kernel_2/Bitstream_descartes_bfs.cpp => Algebraic_kernel_d/include/CGAL/_test_bitstream_descartes.h} (96%)

diff --git a/.gitattributes b/.gitattributes
index 7340c4ef96d..790975dce15 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -303,7 +303,6 @@ Algebraic_kernel_d/include/CGAL/Rotated_algebraic_curve_kernel_2.h -text
 Algebraic_kernel_d/include/CGAL/algebraic_kernel_1_tools.h -text
 Algebraic_kernel_d/package_info/Algebraic_kernel_d/maintainer -text
 Algebraic_kernel_d/test/Algebraic_curve_kernel_2/Algebraic_curve_kernel_2.cpp -text
-Algebraic_kernel_d/test/Algebraic_curve_kernel_2/Bitstream_descartes_bfs.cpp -text
 Algebraic_kernel_d/test/Algebraic_curve_kernel_2/Curve_analysis_2.cpp -text
 Algebraic_kernel_d/test/Algebraic_curve_kernel_2/Curve_pair_analysis_2.cpp -text
 Algebraic_kernel_d/test/Algebraic_curve_kernel_2/alg_real_utils.cpp -text
@@ -314,6 +313,7 @@ Algebraic_kernel_d/test/Algebraic_kernel_d/Bitstream_descartes.cpp -text
 Algebraic_kernel_d/test/Algebraic_kernel_d/Descartes.cpp -text
 Algebraic_kernel_d/test/Algebraic_kernel_d/algebraic_kernel_1_tools.cpp -text
 Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_1.h -text
+Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_bitstream_descartes.h -text
 Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_comparable.h -text
 Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_root_isolator.h -text
 Alpha_shapes_2/demo/Alpha_shapes_2/data/m30f.jpg -text svneol=unset#image/jpeg
diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/Bitstream_descartes.cpp b/Algebraic_kernel_d/test/Algebraic_kernel_d/Bitstream_descartes.cpp
index 20e7c766b8b..17d1f1cf87f 100644
--- a/Algebraic_kernel_d/test/Algebraic_kernel_d/Bitstream_descartes.cpp
+++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/Bitstream_descartes.cpp
@@ -29,6 +29,7 @@
 #include <CGAL/Polynomial.h>
 
 #include <CGAL/_test_real_root_isolator.h>
+#include <CGAL/_test_bitstream_descartes.h>
 
 #include <CGAL/Algebraic_kernel_d/Bitstream_descartes.h>
 #include <CGAL/Algebraic_kernel_d/Algebraic_real_pure.h>
@@ -81,7 +82,7 @@ void test_descartes(){
         assert(r1 < isolator.right_boundary(1));
     
     }
-
+    CGAL::CGALi::test_bitstream_descartes<AT>();
     
 }
     
diff --git a/Algebraic_kernel_d/test/Algebraic_curve_kernel_2/Bitstream_descartes_bfs.cpp b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_bitstream_descartes.h
similarity index 96%
rename from Algebraic_kernel_d/test/Algebraic_curve_kernel_2/Bitstream_descartes_bfs.cpp
rename to Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_bitstream_descartes.h
index 9971d499711..794fffe96e8 100644
--- a/Algebraic_kernel_d/test/Algebraic_curve_kernel_2/Bitstream_descartes_bfs.cpp
+++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_bitstream_descartes.h
@@ -29,6 +29,10 @@
 
 #include <CGAL/Algebraic_curve_kernel_2/Bitstream_coefficient_kernel_at_alpha.h>
 
+CGAL_BEGIN_NAMESPACE
+
+namespace CGALi {
+
 // A simple model of the EventRefinement concept: 
 // Uses a vector of Algebraic reals
 template <typename AlgReal>
@@ -50,7 +54,7 @@ public:
 };
 
 template<typename ArithmeticKernel>
-void test_routine() {
+void test_bitstream_descartes() {
   
   typedef ArithmeticKernel Arithmetic_kernel;
   typedef typename Arithmetic_kernel::Integer Integer;
@@ -415,26 +419,6 @@ void test_routine() {
   }
 }
 
-int main(int argc,char** argv) {
-  
-#ifndef CGAL_USE_LEDA
-#ifndef LiS_HAVE_CORE
-  std::cerr << "This tests requires LEDA and/or CORE" << std::endl;
-  return 1;
-#endif
-#endif
-#ifdef CGAL_USE_LEDA
-  // LEDA TEST
-  test_routine<CGAL::LEDA_arithmetic_kernel> ();
-#else
-  std::cerr << "LEDA tests skipped" << std::endl;
-#endif
-#ifdef CGAL_USE_CORE
-  // CORE TEST
-  test_routine<CGAL::CORE_arithmetic_kernel> ();
-#else
-  std::cerr << "CORE tests skipped" << std::endl;
-#endif
-  return 0;
-  
-}
+} // namespace CGALi
+
+CGAL_END_NAMESPACE
diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_root_isolator.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_root_isolator.h
index cc1598a84fc..dd2d7c0fb38 100644
--- a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_root_isolator.h
+++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_root_isolator.h
@@ -90,7 +90,7 @@ void test_real_root_isolator() {
     typedef typename Isolator::Polynomial    Polynomial;
     typedef typename Isolator::Boundary Boundary;
     typedef typename Polynomial::NT          NT;
-    
+ 
     // just some Polynomials (not all are used)
     Polynomial P_00(NT(0));                   // zero polynomial
     Polynomial P_01(NT(1));                   // constant polynomial
@@ -245,6 +245,7 @@ void test_real_root_isolator() {
         int n = CGALi::check_intervals_real_root_isolator<Isolator>(P);
         assert( n == 4);  
     }
+    
 };
 
 } //namespace CGALi