extract_uri: fix, test, document

2 files changed, 75 insertions, 97 deletions

diff --git a/testfiles/src/cxxtests-to-migrate/extract-uri-test.h b/testfiles/src/cxxtests-to-migrate/extract-uri-test.h
deleted file mode 100644
index 189318cef..000000000
--- a/testfiles/src/cxxtests-to-migrate/extract-uri-test.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/** @file
- * TODO: insert short description here
- *//*
- * Authors: see git history
- *
- * Copyright (C) 2016 Authors
- * Released under GNU GPL v2+, read the file 'COPYING' for more information.
- */
-
-#ifndef SEEN_EXTRACT_URI_TEST_H
-#define SEEN_EXTRACT_URI_TEST_H
-
-#include <cxxtest/TestSuite.h>
-
-#include "extract-uri.h"
-
-class ExtractURITest : public CxxTest::TestSuite
-{
-public:
-    void checkOne( char const* str, char const* expected )
-    {
-        gchar* result = extract_uri( str );
-        TS_ASSERT_EQUALS( ( result == NULL ), ( expected == NULL ) );
-        if ( result && expected ) {
-            TS_ASSERT_EQUALS( std::string(result), std::string(expected) );
-        } else if ( result ) {
-            TS_FAIL( std::string("Expected null, found (") + result + ")" );
-        } else if ( expected ) {
-            TS_FAIL( std::string("Expected (") + expected + "), found null" );
-        }
-        g_free( result );
-    }
-
-    void testBase()
-    {
-        char const* cases[][2] = {
-            { "url(#foo)", "#foo" },
-            { "url  foo  ", NULL },
-            { "url", NULL },
-            { "url ", NULL },
-            { "url()", NULL },
-            { "url ( ) ", NULL },
-            { "url foo bar ", NULL },
-        };
-
-        for ( size_t i = 0; i < G_N_ELEMENTS(cases); i++ )
-        {
-            checkOne( cases[i][0], cases[i][1] );
-        }
-    }
-
-    void testWithTrailing()
-    {
-        char const* cases[][2] = {
-            { "url(#foo) bar", "#foo" },
-            { "url() bar", NULL },
-            { "url ( ) bar ", NULL }
-        };
-
-        for ( size_t i = 0; i < G_N_ELEMENTS(cases); i++ )
-        {
-            checkOne( cases[i][0], cases[i][1] );
-        }
-    }
-
-    void testQuoted()
-    {
-        char const* cases[][2] = {
-            { "url('#foo')", "#foo" },
-            { "url(\"#foo\")", "#foo" },
-            { "url('#f o o')", "#f o o" },
-            { "url(\"#f o o\")", "#f o o" },
-            { "url('#fo\"o')", "#fo\"o" },
-            { "url(\"#fo'o\")", "#fo'o" },
-        };
-
-        for ( size_t i = 0; i < G_N_ELEMENTS(cases); i++ )
-        {
-            checkOne( cases[i][0], cases[i][1] );
-        }
-    }
-
-};
-
-#endif // SEEN_EXTRACT_URI_TEST_H
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/testfiles/src/extract-uri-test.cpp b/testfiles/src/extract-uri-test.cpp
new file mode 100644
index 000000000..acff9669a
--- /dev/null
+++ b/testfiles/src/extract-uri-test.cpp
@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/**
+ * @file
+ * Test extract_uri
+ */
+/*
+ * Authors:
+ *   Thomas Holder
+ *
+ * Copyright (C) 2018 Authors
+ *
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#include "extract-uri.h"
+#include "gtest/gtest.h"
+
+TEST(ExtractUriTest, valid)
+{
+    ASSERT_EQ(extract_uri("url(#foo)"), "#foo");
+    ASSERT_EQ(extract_uri("url( \t #foo \t )"), "#foo");
+    ASSERT_EQ(extract_uri("url( '#foo' )"), "#foo");
+    ASSERT_EQ(extract_uri("url('url(foo)')"), "url(foo)");
+    ASSERT_EQ(extract_uri("url(\"foo(url)\")"), "foo(url)");
+    ASSERT_EQ(extract_uri("url()bar"), "");
+    ASSERT_EQ(extract_uri("url( )bar"), "");
+    ASSERT_EQ(extract_uri("url(a b)"), "a b");
+}
+
+TEST(ExtractUriTest, legacy)
+{
+    ASSERT_EQ(extract_uri("url (foo)"), "foo");
+}
+
+TEST(ExtractUriTest, invalid)
+{
+    ASSERT_EQ(extract_uri("#foo"), "");
+    ASSERT_EQ(extract_uri(" url(foo)"), "");
+    ASSERT_EQ(extract_uri("url(#foo"), "");
+    ASSERT_EQ(extract_uri("url('#foo'"), "");
+    ASSERT_EQ(extract_uri("url('#foo)"), "");
+    ASSERT_EQ(extract_uri("url #foo)"), "");
+}
+
+static char const *extract_end(char const *s)
+{
+    char const *end = nullptr;
+    extract_uri(s, &end);
+    return end;
+}
+
+TEST(ExtractUriTest, endptr)
+{
+    ASSERT_STREQ(extract_end(""), nullptr);
+    ASSERT_STREQ(extract_end("url(invalid"), nullptr);
+    ASSERT_STREQ(extract_end("url('invalid)"), nullptr);
+    ASSERT_STREQ(extract_end("url(valid)"), "");
+    ASSERT_STREQ(extract_end("url(valid)foo"), "foo");
+    ASSERT_STREQ(extract_end("url('valid')bar"), "bar");
+    ASSERT_STREQ(extract_end("url(  'valid'  )bar"), "bar");
+    ASSERT_STREQ(extract_end("url(  valid  ) bar "), " bar ");
+    ASSERT_STREQ(extract_end("url()bar"), "bar");
+    ASSERT_STREQ(extract_end("url( )bar"), "bar");
+}
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :