From f69518b192ba5015e7ececddbfcf3a3695487d00 Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Mon, 16 Feb 2015 14:03:36 +0100 Subject: Renamed oxm files to generic osxml --- data/domain/book.osxml | 3 + data/domain/book.oxm | 3 - data/domain/structure.osxml | 3 + data/domain/structure.oxm | 3 - data/typesystem/color.osxml | 246 ++++++++++++++++++++++++++++ data/typesystem/color.oxm | 246 ---------------------------- test/plugins/filesystem/FileLocatorTest.cpp | 12 +- 7 files changed, 258 insertions(+), 258 deletions(-) create mode 100644 data/domain/book.osxml delete mode 100644 data/domain/book.oxm create mode 100644 data/domain/structure.osxml delete mode 100644 data/domain/structure.oxm create mode 100644 data/typesystem/color.osxml delete mode 100644 data/typesystem/color.oxm diff --git a/data/domain/book.osxml b/data/domain/book.osxml new file mode 100644 index 0000000..9659334 --- /dev/null +++ b/data/domain/book.osxml @@ -0,0 +1,3 @@ + + + diff --git a/data/domain/book.oxm b/data/domain/book.oxm deleted file mode 100644 index 9659334..0000000 --- a/data/domain/book.oxm +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/data/domain/structure.osxml b/data/domain/structure.osxml new file mode 100644 index 0000000..63d0c5c --- /dev/null +++ b/data/domain/structure.osxml @@ -0,0 +1,3 @@ + + + diff --git a/data/domain/structure.oxm b/data/domain/structure.oxm deleted file mode 100644 index 63d0c5c..0000000 --- a/data/domain/structure.oxm +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/data/typesystem/color.osxml b/data/typesystem/color.osxml new file mode 100644 index 0000000..782c856 --- /dev/null +++ b/data/typesystem/color.osxml @@ -0,0 +1,246 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/typesystem/color.oxm b/data/typesystem/color.oxm deleted file mode 100644 index 782c856..0000000 --- a/data/typesystem/color.oxm +++ /dev/null @@ -1,246 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/plugins/filesystem/FileLocatorTest.cpp b/test/plugins/filesystem/FileLocatorTest.cpp index 87a9223..361a3ca 100644 --- a/test/plugins/filesystem/FileLocatorTest.cpp +++ b/test/plugins/filesystem/FileLocatorTest.cpp @@ -213,11 +213,11 @@ TEST(FileLocator, testDefaultSearchPaths) FileLocator locator; locator.addDefaultSearchPaths(); - assert_not_located(locator, "book.oxm", "", ResourceType::UNKNOWN); - assert_located(locator, "domain/book.oxm", "", ResourceType::UNKNOWN); - assert_located(locator, "book.oxm", "", ResourceType::DOMAIN_DESC); - assert_not_located(locator, "color.oxm", "", ResourceType::UNKNOWN); - assert_located(locator, "typesystem/color.oxm", "", ResourceType::UNKNOWN); - assert_located(locator, "color.oxm", "", ResourceType::TYPESYSTEM); + assert_not_located(locator, "book.osxml", "", ResourceType::UNKNOWN); + assert_located(locator, "domain/book.osxml", "", ResourceType::UNKNOWN); + assert_located(locator, "book.osxml", "", ResourceType::DOMAIN_DESC); + assert_not_located(locator, "color.osxml", "", ResourceType::UNKNOWN); + assert_located(locator, "typesystem/color.osxml", "", ResourceType::UNKNOWN); + assert_located(locator, "color.osxml", "", ResourceType::TYPESYSTEM); } } -- cgit v1.2.3