diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2014-12-11 22:30:50 +0100 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2014-12-11 22:30:50 +0100 |
| commit | be370445362aff67b70f80567b8cf6099c72ddd8 (patch) | |
| tree | 28339e19fc9566c7bc83e38a25f2fdf2f039f514 /test/core | |
| parent | d43b75cb459136e1d0c9df5447151069094f341d (diff) | |
| parent | 3d1e59ff0b3116255b70f6247137009903cd530b (diff) | |
Merge branch 'master' of somweyr.de:ousia
Diffstat (limited to 'test/core')
| -rw-r--r-- | test/core/RegistryTest.cpp | 4 | ||||
| -rw-r--r-- | test/core/ResourceLocatorTest.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/core/RegistryTest.cpp b/test/core/RegistryTest.cpp index 22365f2..8280188 100644 --- a/test/core/RegistryTest.cpp +++ b/test/core/RegistryTest.cpp @@ -54,9 +54,9 @@ TEST(Registry, locateResource) instance.registerResourceLocator(&locator); ResourceLocator::Location location = - instance.locateResource("path", "", ResourceLocator::Type::DOMAIN); + instance.locateResource("path", "", ResourceLocator::Type::DOMAIN_DESC); ASSERT_TRUE(location.found); - ASSERT_EQ(ResourceLocator::Type::DOMAIN, location.type); + ASSERT_EQ(ResourceLocator::Type::DOMAIN_DESC, location.type); ASSERT_EQ("path", location.location); } diff --git a/test/core/ResourceLocatorTest.cpp b/test/core/ResourceLocatorTest.cpp index 38cfc3e..ebb164d 100644 --- a/test/core/ResourceLocatorTest.cpp +++ b/test/core/ResourceLocatorTest.cpp @@ -48,9 +48,9 @@ TEST(ResourceLocator, locate) { TestResourceLocator instance; ResourceLocator::Location location = - instance.locate("path", "", ResourceLocator::Type::DOMAIN); + instance.locate("path", "", ResourceLocator::Type::DOMAIN_DESC); ASSERT_TRUE(location.found); - ASSERT_EQ(ResourceLocator::Type::DOMAIN, location.type); + ASSERT_EQ(ResourceLocator::Type::DOMAIN_DESC, location.type); ASSERT_EQ("path", location.location); } @@ -58,7 +58,7 @@ TEST(ResourceLocator, stream) { TestResourceLocator instance; ResourceLocator::Location location = - instance.locate("path", "", ResourceLocator::Type::DOMAIN); + instance.locate("path", "", ResourceLocator::Type::DOMAIN_DESC); std::unique_ptr<std::istream> is = location.stream(); std::string str; |