Add UUID::InitializeFromString().

util/misc/uuid_test.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "util/misc/uuid.h"
 
 #include <stdint.h>
 
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/strings/stringprintf.h"
 #include "gtest/gtest.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 TEST(UUID, UUID) {
   UUID uuid_zero;
   EXPECT_EQ(0u, uuid_zero.data_1);
   EXPECT_EQ(0u, uuid_zero.data_2);
@@ skipping 113 matching lines @@
   EXPECT_EQ(0x45u, uuid.data_4[1]);
   EXPECT_EQ(0x45u, uuid.data_5[0]);
   EXPECT_EQ(0x45u, uuid.data_5[1]);
   EXPECT_EQ(0x45u, uuid.data_5[2]);
   EXPECT_EQ(0x45u, uuid.data_5[3]);
   EXPECT_EQ(0x45u, uuid.data_5[4]);
   EXPECT_EQ(0x45u, uuid.data_5[5]);
   EXPECT_EQ("45454545-4545-4545-4545-454545454545", uuid.ToString());
 }
 
+TEST(UUID, FromString) {

[Mark Mentovai, 2015/01/02 23:33:46]

const (and kCases?)

[Robert Sesek, 2015/01/02 23:46:00]

Done.

+  struct TestCase {
+    const char uuid_string[37];

[Mark Mentovai, 2015/01/02 23:33:46]

Probably ought to be const char*, especially in light of comment about trailing
crap.

[Robert Sesek, 2015/01/02 23:46:00]

Done.

+    bool success;
+  } cases[] = {
+    // Valid:
+    {"c6849cb5-fe14-4a79-8978-9ae6034c521d", true},
+    {"00000000-0000-0000-0000-000000000000", true},
+    {"ffffffff-ffff-ffff-ffff-ffffffffffff", true},
+    // Outside HEX range:
+    {"7318z10b-c453-4cef-9dc8-015655cb4bbc", false},
+    {"7318a10b-c453-4cef-9dz8-015655cb4bbc", false},
+    // Incomplete:
+    {"15655cb4-", false},
+    {"7318f10b-c453-4cef-9dc8-015655cb4bb", false},
+    {"318f10b-c453-4cef-9dc8-015655cb4bb2", false},
+    {"7318f10b-c453-4ef-9dc8-015655cb4bb2", false},
+    {"", false},
+    {"abcd", false},

[Mark Mentovai, 2015/01/02 23:33:46]

You should also have a test case that is a valid UUID plus extra digits tacked
onto the end. That shouldn’t be interpreted as a valid UUID.

[Robert Sesek, 2015/01/02 23:45:59]

Done.

+  };
+
+  const std::string empty_uuid = UUID().ToString();
+
+  for (size_t index = 0; index < arraysize(cases); ++index) {
+    const TestCase& test_case = cases[index];
+    SCOPED_TRACE(
+        base::StringPrintf("index %zu: %s", index, test_case.uuid_string));
+
+    UUID uuid;
+    EXPECT_EQ(test_case.success,
+              uuid.InitializeFromString(test_case.uuid_string));
+    if (test_case.success) {
+      EXPECT_EQ(test_case.uuid_string, uuid.ToString());
+    } else {
+      EXPECT_EQ(empty_uuid, uuid.ToString());
+    }
+  }
+
+  // Test for case insensitivty.
+  UUID uuid;
+  uuid.InitializeFromString("F32E5BDC-2681-4C73-A4E6-911FFD89B846");

[Mark Mentovai, 2015/01/02 23:33:46]

I was going to ask for this in the list of cases above, but I see why you didn’t
do that (the ToString() round-trip test).

You should at least add one more case here that mixes uppercase and lowercase
hex digits in a single UUID.

[Robert Sesek, 2015/01/02 23:46:00]

Done.

+  EXPECT_EQ("f32e5bdc-2681-4c73-a4e6-911ffd89b846", uuid.ToString());
+}
+
 }  // namespace
 }  // namespace test
 }  // namespace crashpad