From d9443cd8cdb58cafd4bfb436bac8b1be8a049377 Mon Sep 17 00:00:00 2001
From: asl <asl@opencascade.com>
Date: Fri, 9 Dec 2016 12:22:59 +0300
Subject: [PATCH] automatic test for DTM, refs issue #1066

---
 src/HYDRO_tests/reference_data/CMakeLists.txt |   1 +
 src/HYDRO_tests/reference_data/pb_1066.cbf    | Bin 0 -> 16636 bytes
 src/HYDRO_tests/test_HYDROData_DTM.cxx        |  26 ++++++++++++++++++
 src/HYDRO_tests/test_HYDROData_DTM.h          |   2 ++
 4 files changed, 29 insertions(+)
 create mode 100644 src/HYDRO_tests/reference_data/pb_1066.cbf

diff --git a/src/HYDRO_tests/reference_data/CMakeLists.txt b/src/HYDRO_tests/reference_data/CMakeLists.txt
index b3fb1124..2ee55128 100644
--- a/src/HYDRO_tests/reference_data/CMakeLists.txt
+++ b/src/HYDRO_tests/reference_data/CMakeLists.txt
@@ -116,6 +116,7 @@ SET(REFERENCE_DATA
     DTM_2.png
     stream_dtm_2d.png
     stream_dtm_3d.png
+    pb_1066.cbf
 )
 
 # Application tests
diff --git a/src/HYDRO_tests/reference_data/pb_1066.cbf b/src/HYDRO_tests/reference_data/pb_1066.cbf
new file mode 100644
index 0000000000000000000000000000000000000000..220d577f1e3d151087cb195be13b2c198d9f5bf6
GIT binary patch
literal 16636
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

literal 0
HcmV?d00001

diff --git a/src/HYDRO_tests/test_HYDROData_DTM.cxx b/src/HYDRO_tests/test_HYDROData_DTM.cxx
index 3cf271fd..c9934653 100644
--- a/src/HYDRO_tests/test_HYDROData_DTM.cxx
+++ b/src/HYDRO_tests/test_HYDROData_DTM.cxx
@@ -21,6 +21,7 @@
 #include <HYDROData_Profile.h>
 #include <HYDROData_DTM.h>
 #include <HYDROData_Iterator.h>
+#include <HYDROData_CalculationCase.h>
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <gp_XY.hxx>
@@ -620,5 +621,30 @@ void test_HYDROData_DTM::test_garonne()
   TestViewer::showColorScale( ColorScaleIsDisp );
   delete aBathPrs;
   aDoc->Close();
+}
 
+void test_HYDROData_DTM::test_classifier_1()
+{
+  TCollection_AsciiString fname = REF_DATA_PATH.toLatin1().data();
+  fname += "/pb_1066.cbf";
+  CPPUNIT_ASSERT_EQUAL( DocError_OK, HYDROData_Document::Load( fname.ToCString(), 1 ) );
+
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  
+  Handle(HYDROData_CalculationCase) aCase = 
+    Handle(HYDROData_CalculationCase)::DownCast( aDoc->FindObjectByName( "Case_1" ) );
+  CPPUNIT_ASSERT_EQUAL( Standard_False, aCase.IsNull() ); 
+  std::vector<gp_XY> points;
+  points.push_back( gp_XY( 43.4842, 3.33176  ) );
+  points.push_back( gp_XY( -125.777, 2.24728 ) );
+  points.push_back( gp_XY( -60.1628, 168.262 ) );
+
+  std::vector<double> values = aCase->GetStricklerCoefficientForPoints( points, 0.0, true );
+  CPPUNIT_ASSERT_EQUAL( 3, (int)values.size() );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0123, values[0], EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0123, values[1], EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0221, values[2], EPS );
+
+  aDoc->Close();
 }
+
diff --git a/src/HYDRO_tests/test_HYDROData_DTM.h b/src/HYDRO_tests/test_HYDROData_DTM.h
index 5eb53be1..57413786 100644
--- a/src/HYDRO_tests/test_HYDROData_DTM.h
+++ b/src/HYDRO_tests/test_HYDROData_DTM.h
@@ -31,6 +31,7 @@ class test_HYDROData_DTM : public CppUnit::TestFixture
   CPPUNIT_TEST( test_curve_to_3d );
   CPPUNIT_TEST( test_presentation );
   CPPUNIT_TEST( test_garonne );
+  CPPUNIT_TEST( test_classifier_1 );
   CPPUNIT_TEST_SUITE_END();
 
 public:
@@ -47,6 +48,7 @@ public:
   void test_curve_to_3d();
   void test_presentation();
   void test_garonne();
+  void test_classifier_1();
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION( test_HYDROData_DTM );
-- 
2.39.2