From c54b09dd827dbeab0ca6be7bdc92d509417bd6cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?=
 <mael.rouxel.labbe@geometryfactory.com>
Date: Tue, 11 Apr 2017 18:15:20 +0200
Subject: [PATCH] Added a test to check Point / Weighted_point conversions

and fixed a previous test that used now-disabled implicit conversions
---
 Kernel_23/test/Kernel_23/include/CGAL/_test_cls_point_2.h   | 5 +++++
 Kernel_23/test/Kernel_23/include/CGAL/_test_cls_point_3.h   | 5 +++++
 .../Kernel_23/include/CGAL/_test_fct_weighted_point_3.h     | 6 +++---
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_point_2.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_point_2.h
index e8008db6623..567cfd19a39 100644
--- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_point_2.h
+++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_point_2.h
@@ -64,6 +64,11 @@ _test_cls_point_2(const R& )
  CGAL::Weighted_point_2<R> wp(p1);
  CGAL::Point_2<R> p7(wp);
 
+ CGAL_static_assertion(!(boost::is_convertible<CGAL::Weighted_point_2<R>,
+                                               CGAL::Point_2<R> >::value));
+ CGAL_static_assertion(!(boost::is_convertible<CGAL::Point_2<R>,
+                                               CGAL::Weighted_point_2<R> >::value));
+
  std::cout << '.';
 
  assert( p3 == CGAL::Point_2<R>(FT(n1), FT(n2)) );
diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_point_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_point_3.h
index feec2ba5a49..08924b7fca7 100644
--- a/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_point_3.h
+++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_cls_point_3.h
@@ -62,6 +62,11 @@ _test_cls_point_3(const R& )
  CGAL::Weighted_point_3<R> wp(p1);
  CGAL::Point_3<R> p7(wp);
 
+ CGAL_static_assertion(!(boost::is_convertible<CGAL::Weighted_point_3<R>,
+                                               CGAL::Point_3<R> >::value));
+ CGAL_static_assertion(!(boost::is_convertible<CGAL::Point_3<R>,
+                                               CGAL::Weighted_point_3<R> >::value));
+
  std::cout << '.';
 
  assert( p3 == CGAL::Point_3<R>(FT(n1), FT(n2), FT(n3)) );
diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_weighted_point_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_weighted_point_3.h
index 1f072322969..78cc4a5767d 100644
--- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_weighted_point_3.h
+++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_weighted_point_3.h
@@ -103,11 +103,11 @@ _test_fct_weighted_point_3(const R& )
   assert( CGAL::power_side_of_oriented_power_sphere(wp6_b, wp6b_b) == CGAL::ON_POSITIVE_SIDE );
 
   assert( CGAL::power_side_of_oriented_power_sphere(wp3, wp1, wp6) == CGAL::ON_NEGATIVE_SIDE
-          && ! CGAL::Segment_3<R>(wp3, wp1).has_on(wp6) );
+          && ! CGAL::Segment_3<R>(p3, p1).has_on(p6) );
   assert( CGAL::power_side_of_oriented_power_sphere(wp5, wp6, wp5) == CGAL::ON_ORIENTED_BOUNDARY
-          && CGAL::Segment_3<R>(wp5, wp6).has_on(wp5) );
+          && CGAL::Segment_3<R>(p5, p6).has_on(p5) );
   assert( CGAL::power_side_of_oriented_power_sphere(wp3, wp6, wp1) == CGAL::ON_POSITIVE_SIDE
-          && CGAL::Segment_3<R>(wp3, wp6).has_on(wp1) );
+          && CGAL::Segment_3<R>(p3, p6).has_on(p1) );
 
   assert( CGAL::power_side_of_oriented_power_sphere(wp3_b, wp6b_b, wp1_b) == CGAL::ON_NEGATIVE_SIDE );
   assert( CGAL::power_side_of_oriented_power_sphere(wp1_b, wp3_b, wp3_b) == CGAL::ON_ORIENTED_BOUNDARY );