Changeset 963

Timestamp:

11/09/08 07:41:23 (2 months ago)

Author:

mloskot

Message:

lasreader_iterator_test.cpp: refactored to remove redundant code and reuse common test group data.

Files:

• trunk/test/unit/lasreader_iterator_test.cpp (modified) (24 diffs)

trunk/test/unit/lasreader_iterator_test.cpp

@@ -9 +9 @@
 #include <liblas/iterator.hpp>
 #include <liblas/laspoint.hpp>
+#include <liblas/lasreader.hpp>
 #include <liblas/detail/utility.hpp>
 #include <tut/tut.hpp>
@@ -24 +25 @@
     {
         std::string file10_;
+        std::ifstream ifs_;
+        LASReader reader_;
 
         lasreader_iterator_data()
-            : file10_(g_test_data_path + "//TO_core_last_clip.las")
+            : file10_(g_test_data_path + "//TO_core_last_clip.las"),
+                ifs_(file10_.c_str(), std::ios::in | std::ios::binary),
+                    reader_(ifs_)
         {}
     };
@@ -48 +53 @@
     void to::test<2>()
     {
-        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        LASReader reader(ifs);
-        lasreader_iterator it(reader);
+        lasreader_iterator it(reader_);
     }
 
@@ -69 +72 @@
     void to::test<4>()
     {
-        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        LASReader reader(ifs);
-        lasreader_iterator it1(reader);
+        lasreader_iterator it1(reader_);
         lasreader_iterator it2(it1);
 
@@ -94 +95 @@
     void to::test<6>()
     {
-        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        LASReader reader(ifs);
-        lasreader_iterator it1(reader);
+        lasreader_iterator it1(reader_);
         lasreader_iterator it2;
         it1 = it2;
@@ -108 +107 @@
     void to::test<7>()
     {
-        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        LASReader reader(ifs);
-        lasreader_iterator it(reader);
+        lasreader_iterator it(reader_);
 
         test_file10_point1(*it);
@@ -120 +117 @@
     void to::test<8>()
     {
-        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        LASReader reader(ifs);
-        lasreader_iterator it(reader);
+        lasreader_iterator it(reader_);
 
         // test 1st point data record 
@@ -141 +136 @@
     void to::test<9>()
     {
-        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        LASReader reader(ifs);
-        lasreader_iterator it(reader); // move to 1st point
+        lasreader_iterator it(reader_); // move to 1st point
         ++it; // move to 2nd record
 
@@ -154 +147 @@
     void to::test<10>()
     {
-        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        LASReader reader(ifs);
-        lasreader_iterator it(reader); // move to 1st point
+        lasreader_iterator it(reader_); // move to 1st point
         it++; // move to 2nd record
 
@@ -167 +158 @@
     void to::test<11>()
     {
-        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        LASReader reader(ifs);
-        lasreader_iterator it(reader); // move to 1st point
+        lasreader_iterator it(reader_); // move to 1st point
         lasreader_iterator end;
 
@@ -180 +169 @@
     void to::test<12>()
     {
-        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        LASReader reader(ifs);
-        lasreader_iterator it(reader); // move to 1st point
+        lasreader_iterator it(reader_); // move to 1st point
         lasreader_iterator end;
 
@@ -193 +180 @@
     void to::test<13>()
     {
-        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        LASReader reader(ifs);
-        uint32_t const cnt = reader.GetHeader().GetPointRecordsCount();
-        lasreader_iterator it(reader); // move to 1st point
+        uint32_t const cnt = reader_.GetHeader().GetPointRecordsCount();
+        lasreader_iterator it(reader_); // move to 1st point
         lasreader_iterator end;
 
@@ -214 +199 @@
     void to::test<14>()
     {
-        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        LASReader reader(ifs);
-        uint32_t const cnt = reader.GetHeader().GetPointRecordsCount();
-        lasreader_iterator it(reader); // move to 1st point
+        uint32_t const cnt = reader_.GetHeader().GetPointRecordsCount();
+        lasreader_iterator it(reader_); // move to 1st point
         lasreader_iterator end;
 
@@ -229 +212 @@
     void to::test<15>()
     {
-        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        LASReader reader(ifs);
-        lasreader_iterator it(reader); // move to 1st point
+        lasreader_iterator it(reader_); // move to 1st point
 
         std::advance(it, 1); // move to 2nd record
@@ -245 +226 @@
     void to::test<16>()
     {
-        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        LASReader reader(ifs);
-        uint32_t const size = reader.GetHeader().GetPointRecordsCount();
-
-        lasreader_iterator it(reader);
+        uint32_t const size = reader_.GetHeader().GetPointRecordsCount();
+        lasreader_iterator it(reader_);
         lasreader_iterator end;
 
@@ -285 +263 @@
         test_file10_point2(pt);
 
-        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        LASReader reader(ifs);
-        lasreader_iterator it(reader);
+        lasreader_iterator it(reader_);
         lasreader_iterator end;
 
@@ -296 +272 @@
     }
 
-
     // Test std::equal algorithm
     template<>
@@ -302 +277 @@
     void to::test<18>()
     {
-        // TODO - mloskot: Can not re-use the reader because libLAS does
+        // TODO - mloskot: Can not re-use the LASReader (object reader_) because libLAS does
         // not support reset operation yet. In order to reuse reader with mre than one iterator
         // we have to provide operation to reset reader (set internal pointer to beginning of LAS file, etc.).
@@ -309 +284 @@
 
         std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-     
 
         // Copy LAS records to std::list based cache
@@ -354 +328 @@
         test_file10_point2(pt);
 
-        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        LASReader reader(ifs);
-        lasreader_iterator it(reader);
+        lasreader_iterator it(reader_);
         lasreader_iterator end;
 
@@ -371 +343 @@
     void to::test<20>()
     {
-        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        LASReader reader(ifs);
-        lasreader_iterator it(reader);
+        lasreader_iterator it(reader_);
         lasreader_iterator end;
 
@@ -388 +358 @@
     void to::test<21>()
     {
-        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        LASReader reader(ifs);
-        lasreader_iterator it(reader);
+        lasreader_iterator it(reader_);
         lasreader_iterator end;
 
@@ -396 +364 @@
         typedef liblas::detail::Extents<double> bbox_t;
 
-        LASHeader const& h = reader.GetHeader();
+        LASHeader const& h = reader_.GetHeader();
         bbox_t lasbbox(point_t(h.GetMinX(), h.GetMinY(), h.GetMinZ()),
                        point_t(h.GetMaxX(), h.GetMaxY(), h.GetMaxZ()));
@@ -406 +374 @@
         ensure(lasbbox == bbox);
     }
-
- 
 }