Storage bugfix, whiteboard xml implementation

2 files changed, 17 insertions, 8 deletions

diff --git a/tests/test-storage.cpp b/tests/test-storage.cpp
index ce19c3e..d8259e1 100644
--- a/tests/test-storage.cpp
+++ b/tests/test-storage.cpp
@@ -210,15 +210,20 @@ TEST_F(StorageTest, revision_increment)
 TEST_F(StorageTest, generate_id)
 {
  Storage storage(*m_config);
- std::string a{storage.generate_id()};
- std::string b{storage.generate_id()};
+ for (int i = 0; i < 100; i++) {
+  std::string a{storage.generate_id()};
+  std::string b{storage.generate_id()};
 
- EXPECT_NE(a, b);
- EXPECT_NE(a, "");
- EXPECT_NE(b, "");
+  EXPECT_NE(a, b);
+  EXPECT_NE(a, "");
+  EXPECT_NE(b, "");
 
- EXPECT_GE(a.size(), 6);
+  EXPECT_GE(a.size(), 6);
 
+  for (char c: a + b) {
+   EXPECT_TRUE((c >= '0' && c <= '9') || (c >= 'a' && c <= 'z'));
+  }
+ }
 }
 
 TEST_F(StorageTest, checksum32)
diff --git a/tests/test-whiteboard.cpp b/tests/test-whiteboard.cpp
index 4ed10ae..a472d64 100644
--- a/tests/test-whiteboard.cpp
+++ b/tests/test-whiteboard.cpp
@@ -234,11 +234,15 @@ TEST_F(WhiteboardTest, generate_id)
 
  wc.write("<request><command>newid</command></request>");
  std::string result0 {wc.read()};
- ASSERT_EQ(result0.size(), 6);
+ ASSERT_TRUE(boost::algorithm::starts_with(result0, "<serverinfo><type>newid</type><id>"));
+ ASSERT_TRUE(boost::algorithm::ends_with(result0, "</id></serverinfo>"));
+ ASSERT_EQ(result0.size(), 58);
  
  wc.write("<request><command>newid</command></request>");
  std::string result1 {wc.read()};
- ASSERT_EQ(result1.size(), 6);
+ ASSERT_TRUE(boost::algorithm::starts_with(result1, "<serverinfo><type>newid</type><id>"));
+ ASSERT_TRUE(boost::algorithm::ends_with(result1, "</id></serverinfo>"));
+ ASSERT_EQ(result1.size(), 58);
  
  ASSERT_NE(result0, result1);
 }