Excise std::optional.

1 files changed, 4 insertions, 4 deletions

diff --git a/test/test_utf8.cpp b/test/test_utf8.cpp
index 4b57b64..759c826 100644
--- a/test/test_utf8.cpp
+++ b/test/test_utf8.cpp
@@ -173,7 +173,7 @@ TEST(Utf8Test, Utf8MultiByte)
 
     Utf8Iterator utf8Iter{stringBuffer};
     auto characterOpt = utf8Iter.next();
-    ASSERT_TRUE(characterOpt.has_value());
+    ASSERT_TRUE(characterOpt.hasValue());
 
     // MULTI_BYTE_LITERAL "test今日素敵はですねƩ®😀z"
     const Array<FudUtf8, 16> multiByteCharacters{
@@ -196,8 +196,8 @@ TEST(Utf8Test, Utf8MultiByte)
     };
 
     size_t idx = 0;
-    while (characterOpt.has_value()) {
-        auto character = *characterOpt;
+    while (characterOpt.hasValue()) {
+        auto character = characterOpt.value();
         if (character != FudUtf8{Utf8Variant{Ascii{'\0'}}}) {
             EXPECT_TRUE(character.size() >= 1);
             ASSERT_LT(idx, multiByteCharacters.size());
@@ -212,7 +212,7 @@ TEST(Utf8Test, Utf8MultiByte)
         characterOpt = utf8Iter.next();
     }
     utf8Iter.reset();
-    ASSERT_TRUE(utf8Iter.next().has_value());
+    ASSERT_TRUE(utf8Iter.next().hasValue());
 
     FudUtf8 invalid = FudUtf8::invalidAscii();
     ASSERT_FALSE(invalid.valid());