[Liblas-commits] r1039 - trunk/test/unit

[liblas-commits at liblas.org]

Author: hobu
Date: Tue Feb 17 13:55:28 2009
New Revision: 1039
URL: http://liblas.org/changeset/1039

Log:
update tests to reflect that 1.2 is now the default version

Modified:
   trunk/test/unit/common.cpp
   trunk/test/unit/laswriter_test.cpp

Modified: trunk/test/unit/common.cpp
==============================================================================
--- trunk/test/unit/common.cpp	(original)
+++ trunk/test/unit/common.cpp	Tue Feb 17 13:55:28 2009
@@ -33,7 +33,7 @@
     ensure_equals("wrong default major version",
         h.GetVersionMajor(), 1);
     ensure_equals("wrong default minor version",
-        h.GetVersionMinor(), 1);
+        h.GetVersionMinor(), 2);
 
     ensure_equals("wrong default system id",
         h.GetSystemId(), LASHeader::SystemIdentifier);
@@ -49,7 +49,7 @@
         h.GetHeaderSize(), liblas::uint16_t(227));
     
     liblas::uint32_t offset = 229;
-    if (h.GetVersionMinor() == 1)
+    if (h.GetVersionMinor() == 1 || h.GetVersionMinor() == 2)
     {
         offset = 227;
     }

Modified: trunk/test/unit/laswriter_test.cpp
==============================================================================
--- trunk/test/unit/laswriter_test.cpp	(original)
+++ trunk/test/unit/laswriter_test.cpp	Tue Feb 17 13:55:28 2009
@@ -53,11 +53,11 @@
             std::ofstream ofs;
             ofs.open(tmpfile_.c_str(), std::ios::out | std::ios::binary);
 
-            // LAS 1.1, Point Format 0
+            // LAS 1.2, Point Format 0
             liblas::LASHeader header;
             liblas::LASWriter writer(ofs, header);
 
-            ensure_equals<std::size_t>(writer.GetVersion(), liblas::eLASVersion11);
+            ensure_equals<std::size_t>(writer.GetVersion(), liblas::eLASVersion12);
 
             liblas::LASHeader const& hdr_default = writer.GetHeader();
             test_default_header(hdr_default);
@@ -69,7 +69,7 @@
             ifs.open(tmpfile_.c_str(), std::ios::in | std::ios::binary);
             liblas::LASReader reader(ifs);
 
-            ensure_equals<std::size_t>(reader.GetVersion(), liblas::eLASVersion11);
+            ensure_equals<std::size_t>(reader.GetVersion(), liblas::eLASVersion12);
             
             liblas::LASHeader const& hdr_default = reader.GetHeader();
             test_default_header(hdr_default);