diff options
| author | Thomas Holder <thomas@thomas-holder.de> | 2018-12-13 04:39:19 +0000 |
|---|---|---|
| committer | Thomas Holder <thomas@thomas-holder.de> | 2018-12-13 04:39:19 +0000 |
| commit | c88fe1e9973aa90217ccd25de79f5768b26d4a86 (patch) | |
| tree | 1e7aaed64fa621f170987a14be4e034977a11281 | |
| parent | remove Inkscape::URI::fromUtf8 (diff) | |
| download | inkscape-c88fe1e9973aa90217ccd25de79f5768b26d4a86.tar.gz inkscape-c88fe1e9973aa90217ccd25de79f5768b26d4a86.zip | |
remove obsolete URI cxxtests
| -rw-r--r-- | src/xml/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/xml/rebase-hrefs-test.h | 135 | ||||
| -rw-r--r-- | testfiles/src/cxxtests-to-migrate/uri-test.h | 95 |
3 files changed, 0 insertions, 231 deletions
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt index 3cccc5ea6..b5a4f18db 100644 --- a/src/xml/CMakeLists.txt +++ b/src/xml/CMakeLists.txt @@ -40,7 +40,6 @@ set(xml_SRC pi-node.h quote-test.h quote.h - rebase-hrefs-test.h rebase-hrefs.h repr-action-test.h repr-sorting.h diff --git a/src/xml/rebase-hrefs-test.h b/src/xml/rebase-hrefs-test.h deleted file mode 100644 index a6117b8db..000000000 --- a/src/xml/rebase-hrefs-test.h +++ /dev/null @@ -1,135 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/** @file - * TODO: insert short description here - *//* - * Authors: see git history - * - * Copyright (C) 2011 Authors - * Released under GNU GPL v2+, read the file 'COPYING' for more information. - */ -#include <cxxtest/TestSuite.h> - -#include <cstdlib> -#include <glib.h> - -#include "uri.h" - - -class RebaseHrefsTest : public CxxTest::TestSuite -{ - Inkscape::XML::Document *document; - Inkscape::XML::Node *a, *b, *c, *root; - -public: - - RebaseHrefsTest() - { - Inkscape::GC::init(); - - document = sp_repr_document_new("test"); - root = document->root(); - - a = document->createElement("a"); - b = document->createElement("b"); - c = document->createElement("c"); - } - virtual ~RebaseHrefsTest() {} - -// createSuite and destroySuite get us per-suite setup and teardown -// without us having to worry about static initialization order, etc. - static RebaseHrefsTest *createSuite() { return new RebaseHrefsTest(); } - static void destroySuite( RebaseHrefsTest *suite ) { delete suite; } - - - void dump_str(gchar const *str, gchar const *prefix) - { - Glib::ustring tmp; - tmp = prefix; - tmp += " ["; - size_t const total = strlen(str); - for (unsigned i = 0; i < total; i++) { - gchar *const tmp2 = g_strdup_printf(" %02x", (0x0ff & str[i])); - tmp += tmp2; - g_free(tmp2); - } - - tmp += "]"; - g_message("%s", tmp.c_str()); - } - - void testFlipples() - { - using Inkscape::URI; - using Inkscape::MalformedURIException; - - gchar const* things[] = { - "data:foo,bar", - "http://www.google.com/image.png", - "ftp://ssd.com/doo", - "/foo/dee/bar.svg", - "foo.svg", - "file:/foo/dee/bar.svg", - "file:///foo/dee/bar.svg", - "file:foo.svg", - "/foo/bar\xe1\x84\x92.svg", - "file:///foo/bar\xe1\x84\x92.svg", - "file:///foo/bar%e1%84%92.svg", - "/foo/bar%e1%84%92.svg", - "bar\xe1\x84\x92.svg", - "bar%e1%84%92.svg", - NULL - }; - g_message("+------"); - for ( int i = 0; things[i]; i++ ) - { - try - { - URI uri(things[i]); - gboolean isAbs = g_path_is_absolute( things[i] ); - gchar *str = uri.toString(); - g_message( "abs:%d isRel:%d scheme:[%s] path:[%s][%s] uri[%s] / [%s]", (int)isAbs, - (int)uri.isRelative(), - uri.getScheme(), - uri.getPath(), - uri.getOpaque(), - things[i], - str ); - g_free(str); - } - catch ( MalformedURIException err ) - { - dump_str( things[i], "MalformedURIException" ); - xmlChar *redo = xmlURIEscape((xmlChar const *)things[i]); - g_message(" gone from [%s] to [%s]", things[i], redo ); - if ( redo == NULL ) - { - URI again = URI::fromUtf8( things[i] ); - g_message(" uri from [%s] to [%s]", things[i], again.toString() ); - gboolean isAbs = g_path_is_absolute( things[i] ); - gchar *str = again.toString(); - g_message( "abs:%d isRel:%d scheme:[%s] path:[%s][%s] uri[%s] / [%s]", (int)isAbs, - (int)again.isRelative(), - again.getScheme(), - again.getPath(), - again.getOpaque(), - things[i], - str ); - g_free(str); - g_message(" ----"); - } - } - } - g_message("+------"); - } -}; - -/* - 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/cxxtests-to-migrate/uri-test.h b/testfiles/src/cxxtests-to-migrate/uri-test.h deleted file mode 100644 index 118546b51..000000000 --- a/testfiles/src/cxxtests-to-migrate/uri-test.h +++ /dev/null @@ -1,95 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/** @file - * Test uri.h - * - * Written to aid with refactoring the uri handling to support fullPath - * and data URIs and also cover code which wasn't before tested. - *//* - * Authors: - * 2014 BasisTech Boston - * - * Copyright (C) 2016 Authors - * Released under GNU GPL v2+, read the file 'COPYING' for more information. - */ - -#ifndef SEEN_URI_TEST_H -#define SEEN_URI_TEST_H - -#include <cxxtest/TestSuite.h> - -#include "uri.h" - -using Inkscape::URI; - -class URITest : public CxxTest::TestSuite -{ -public: - void stringTest( std::string result, std::string expected ) - { - if ( !result.empty() && !expected.empty() ) { - TS_ASSERT_EQUALS( result, expected ); - } else if ( result.empty() && !expected.empty() ) { - TS_FAIL( std::string("Expected (") + expected + "), found null" ); - } else if ( !result.empty() && expected.empty() ) { - TS_FAIL( std::string("Expected null, found (") + result + ")" ); - } - } - - std::string ValueOrEmpty(const char* s) { - return s == NULL ? std::string() : s; - } - - void toStringTest( std::string uri, std::string expected ) { - stringTest( URI(uri.c_str()).toString(), expected ); - } - void pathTest( std::string uri, std::string expected ) { - stringTest( ValueOrEmpty(URI(uri.c_str()).getPath()), expected ); - } - - void testToString() - { - char const* cases[][2] = { - { "foo", "foo" }, - { "#foo", "#foo" }, - { "blah.svg#h", "blah.svg#h" }, - //{ "data:data", "data:data" }, - }; - - for ( size_t i = 0; i < G_N_ELEMENTS(cases); i++ ) { - toStringTest( std::string(cases[i][0]), std::string(cases[i][1]) ); - } - } - - void testPath() - { - char const* cases[][2] = { - { "foo.svg", "foo.svg" }, - { "foo.svg#bar", "foo.svg" }, - { "#bar", NULL }, - { "data:data", NULL }, - }; - - for ( size_t i = 0; i < G_N_ELEMENTS(cases); i++ ) { - pathTest( ValueOrEmpty(cases[i][0]), ValueOrEmpty(cases[i][1]) ); - } - } - void testFullPath() { - std::ofstream fhl("/tmp/cxxtest-uri.svg", std::ofstream::out); - stringTest( URI("cxxtest-uri.svg").getFullPath("/tmp"), std::string("/tmp/cxxtest-uri.svg") ); - stringTest( URI("cxxtest-uri.svg").getFullPath("/usr/../tmp"), std::string("/tmp/cxxtest-uri.svg") ); - } - -}; - -#endif // SEEN_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 : |
