Changeset 645:7f8f1f16dfe1

Timestamp:

05/14/08 15:47:43 (2 years ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Convert:

svn:1766ff46-f334-0410-ab20-d63176f87757/trunk@712

Message:

fix up LASVLR stuff so read tests pass

Files:

• include/liblas/lasrecordheader.hpp (modified) (2 diffs)
• src/lasrecordheader.cpp (modified) (3 diffs)
• test/unit/lasrecordheader_test.cpp (modified) (8 diffs)

include/liblas/lasrecordheader.hpp

@@ -82 +82 @@
     /// The character data is up to 16 bytes long.
     /// \exception No throw
-    std::string GetUserId(bool pad /*= false*/);
+    std::string GetUserId(bool pad /*= false*/) const;
     
     void SetUserId(std::string const&);
@@ -102 +102 @@
     /// The character data is up to 32 bytes long.
     /// \exception No throw
-    std::string GetDescription(bool pad /*= false*/);
+    std::string GetDescription(bool pad /*= false*/) const;
     
     void SetDescription(std::string const&);

src/lasrecordheader.cpp

@@ -116 +116 @@
 }
 
-std::string LASVLR::GetUserId(bool pad /*= false*/)
+std::string LASVLR::GetUserId(bool pad /*= false*/) const
 {
     // copy array of chars and trim zeros if smaller than 32 bytes
@@ -161 +161 @@
 }
 
-std::string LASVLR::GetDescription(bool pad /*= false*/)
+std::string LASVLR::GetDescription(bool pad /*= false*/) const
 {
     // copy array of chars and trim zeros if smaller than 32 bytes
@@ -201 +201 @@
 {
     return (m_recordId == other.m_recordId
-            && m_userId == other.m_userId 
-            && m_desc == other.m_desc
+            && std::string(m_userId) == std::string(other.m_userId) 
+            && std::string(m_desc) == std::string(other.m_desc)
             && m_reserved == other.m_reserved
             && m_recordLength == other.m_recordLength);

test/unit/lasrecordheader_test.cpp

@@ -15 +15 @@
     struct lasrecordheader_data
     {
-        liblas::LASRecordHeader m_default;
+        liblas::LASVLR m_default;
 
-        void test_default(liblas::LASRecordHeader const& h)
+        void test_default(liblas::LASVLR const& h)
         {
             ensure_equals("wrong default reserved bytes",
@@ -26 +26 @@
 
             ensure_equals("wrong default record length",
-                h.GeRecordLength(), liblas::uint16_t());
+                h.GetRecordLength(), liblas::uint16_t());
 
             ensure_equals("wrong default user identifier",
-                h.GetUserId(), std::string());
+                h.GetUserId(true).c_str(), std::string());
 
             ensure_equals("wrong default description",
-                h.GetUserId(), std::string());
+                h.GetDescription(true).c_str(), std::string());
         }
     };
@@ -39 +39 @@
     typedef tg::object to;
 
-    tg test_group_lasrecordheader("liblas::LASRecordHeader");
+    tg test_group_lasrecordheader("liblas::LASVLR");
 
     // Test default constructor
@@ -54 +54 @@
     void to::test<2>()
     {
-        liblas::LASRecordHeader hdr_copy(m_default);
+        liblas::LASVLR hdr_copy(m_default);
         test_default(hdr_copy);
     }
@@ -63 +63 @@
     void to::test<3>()
     {
-        liblas::LASRecordHeader hdr_copy;
+        liblas::LASVLR hdr_copy;
         test_default(hdr_copy);
 
@@ -75 +75 @@
     void to::test<4>()
     {
-        liblas::LASRecordHeader hdr;
+        liblas::LASVLR hdr;
         ensure("two default headers not equal", m_default.equal(hdr));
 
-        liblas::LASRecordHeader hdr_copy(m_default);
+        liblas::LASVLR hdr_copy(m_default);
         ensure("copy of default header not equal", hdr.equal(m_default));
     }
@@ -87 +87 @@
     void to::test<5>()
     {
-        liblas::LASRecordHeader hdr;
+        liblas::LASVLR hdr;
         ensure("two default headers not equal", m_default == hdr);
 
-        liblas::LASRecordHeader hdr_copy(m_default);
+        liblas::LASVLR hdr_copy(m_default);
         ensure("copy of default header not equal", hdr == m_default);
     }
@@ -99 +99 @@
     void to::test<6>()
     {
-        liblas::LASRecordHeader hdr;
+        liblas::LASVLR hdr;
         ensure_not("two default headers not equal", m_default != hdr);
 
-        liblas::LASRecordHeader hdr_copy(m_default);
+        liblas::LASVLR hdr_copy(m_default);
         ensure_not("copy of default header not equal", hdr != m_default);
     }