Changeset 641

Timestamp:

05/02/08 00:44:55 (14 months ago)

Author:

mloskot

Message:

Added liblas::LASFile test (Ticket #25).

Location:

trunk

Files:

• build/msvc80/liblas_test/liblas_test.vcproj (modified) (1 diff)
• test/unit/common.cpp (modified) (1 diff)
• test/unit/common.hpp (modified) (1 diff)
• test/unit/lasfile_test.cpp (added)
• test/unit/lasreader_test.cpp (modified) (2 diffs)

trunk/build/msvc80/liblas_test/liblas_test.vcproj

@@ -208 +208 @@
                 </File>
                 <File
+                        RelativePath="..\..\..\test\unit\lasfile_test.cpp"
+                        >
+                </File>
+                <File
                         RelativePath="..\..\..\test\unit\lasheader_test.cpp"
                         >

trunk/test/unit/common.cpp

@@ -111 +111 @@
 }
 
+void test_file10_header(liblas::LASHeader const& h)
+{
+    ensure_equals(h.GetFileSignature(), liblas::LASHeader::FileSignature);
+    ensure_equals(h.GetFileSourceId(), 0);
+    ensure_equals(h.GetReserved(), 0);
+
+    liblas::guid g;
+    ensure(g.is_null());
+    ensure_equals(h.GetProjectId(), g);
+
+    ensure_equals(h.GetVersionMajor(), 1);
+    ensure_equals(h.GetVersionMinor(), 0);
+    ensure_equals(h.GetSystemId(), std::string(""));
+    ensure_equals(h.GetSoftwareId(), std::string("TerraScan"));
+    ensure_equals(h.GetCreationDOY(), 0);
+    ensure_equals(h.GetCreationYear(), 0);
+    ensure_equals(h.GetHeaderSize(), liblas::uint16_t(227));
+    ensure_equals(h.GetDataOffset(), liblas::uint32_t(229));
+    ensure_equals(h.GetRecordsCount(), liblas::uint32_t(0));
+    ensure_equals(h.GetDataFormatId(), liblas::LASHeader::ePointFormat1);
+    ensure_equals(h.GetDataRecordLength(), liblas::LASHeader::ePointSize1);
+    ensure_equals(h.GetPointRecordsCount(), liblas::uint32_t(8));
+    ensure_equals(h.GetScaleX(), double(0.01));
+    ensure_equals(h.GetScaleY(), double(0.01));
+    ensure_equals(h.GetScaleZ(), double(0.01));
+    ensure_equals(h.GetOffsetX(), double(-0));
+    ensure_equals(h.GetOffsetY(), double(-0));
+    ensure_equals(h.GetOffsetZ(), double(-0));
+    ensure_equals(h.GetMinX(), double(630262.3));
+    ensure_equals(h.GetMaxX(), double(630346.83));
+    ensure_equals(h.GetMinY(), double(4834500));
+    ensure_equals(h.GetMaxY(), double(4834500));
+    ensure_equals(h.GetMinZ(), double(50.9));
+    ensure_equals(h.GetMaxZ(), double(55.26));
 }
 
+}
+

trunk/test/unit/common.hpp

@@ -20 +20 @@
 void test_default_header(liblas::LASHeader const& h);
 
+// Test of header data in trunk/test/data/TO_core_last_clip.las file
+void test_file10_header(liblas::LASHeader const& h);
+
 } // namespace tut
 

trunk/test/unit/lasreader_test.cpp

@@ -15 +15 @@
 #include <string>
 #include "liblas_test.hpp"
+#include "common.hpp"
 
 namespace tut
@@ -93 +94 @@
         liblas::LASHeader const& hdr = reader.GetHeader();
 
-        ensure_equals(hdr.GetFileSignature(), liblas::LASHeader::FileSignature);
-        ensure_equals(hdr.GetFileSourceId(), 0);
-        ensure_equals(hdr.GetReserved(), 0);
-
-        liblas::guid g;
-        ensure(g.is_null());
-        ensure_equals(hdr.GetProjectId(), g);
-
-        ensure_equals(hdr.GetVersionMajor(), 1);
-        ensure_equals(hdr.GetVersionMinor(), 0);
-        ensure_equals(hdr.GetSystemId(), std::string(""));
-        ensure_equals(hdr.GetSoftwareId(), std::string("TerraScan"));
-        ensure_equals(hdr.GetCreationDOY(), 0);
-        ensure_equals(hdr.GetCreationYear(), 0);
-        ensure_equals(hdr.GetHeaderSize(), liblas::uint16_t(227));
-        ensure_equals(hdr.GetDataOffset(), liblas::uint32_t(229));
-        ensure_equals(hdr.GetRecordsCount(), liblas::uint32_t(0));
-        ensure_equals(hdr.GetDataFormatId(), liblas::LASHeader::ePointFormat1);
-        ensure_equals(hdr.GetDataRecordLength(), liblas::LASHeader::ePointSize1);
-        ensure_equals(hdr.GetPointRecordsCount(), liblas::uint32_t(8));
-        ensure_equals(hdr.GetScaleX(), double(0.01));
-        ensure_equals(hdr.GetScaleY(), double(0.01));
-        ensure_equals(hdr.GetScaleZ(), double(0.01));
-        ensure_equals(hdr.GetOffsetX(), double(-0));
-        ensure_equals(hdr.GetOffsetY(), double(-0));
-        ensure_equals(hdr.GetOffsetZ(), double(-0));
-        ensure_equals(hdr.GetMinX(), double(630262.3));
-        ensure_equals(hdr.GetMaxX(), double(630346.83));
-        ensure_equals(hdr.GetMinY(), double(4834500));
-        ensure_equals(hdr.GetMaxY(), double(4834500));
-        ensure_equals(hdr.GetMinZ(), double(50.9));
-        ensure_equals(hdr.GetMaxZ(), double(55.26));
+        test_file10_header(hdr);
     }