diff --git a/source/ps/XML/Xeromyces.h b/source/ps/XML/Xeromyces.h index ef420f3c68..f92791093c 100644 --- a/source/ps/XML/Xeromyces.h +++ b/source/ps/XML/Xeromyces.h @@ -41,7 +41,6 @@ typedef xmlDoc* xmlDocPtr; class CXeromyces : public XMBFile { - friend class TestXeromyces; friend class TestXeroXMB; public: /** @@ -54,6 +53,11 @@ public: */ PSRETURN LoadString(const char* xml); + /** + * Convert the given XML file into an XMB in the archive cache. + * Returns the XMB path in @p archiveCachePath. + * Returns false on error. + */ bool GenerateCachedXMB(const PIVFS& vfs, const VfsPath& sourcePath, VfsPath& archiveCachePath); /** diff --git a/source/ps/XML/tests/test_Xeromyces.h b/source/ps/XML/tests/test_Xeromyces.h index ff5d1c21b9..14c83894c8 100644 --- a/source/ps/XML/tests/test_Xeromyces.h +++ b/source/ps/XML/tests/test_Xeromyces.h @@ -34,21 +34,6 @@ public: CXeromyces::Terminate(); } - void test_paths() - { - PIVFS vfs = CreateVfs(20*MiB); - - TS_ASSERT_OK(vfs->Mount(L"", DataDir()/L"mods/_test.xero", VFS_MOUNT_MUST_EXIST)); - - VfsPath xmbPath; - - CXeromyces::GetXMBPath(vfs, L"test1.xml", L"test1.xmb", xmbPath); - TS_ASSERT_WSTR_EQUALS(xmbPath.string(), L"cache/mods/_test.xero/xmb/test1.xmb"); - - CXeromyces::GetXMBPath(vfs, L"a/b/test1.xml", L"a/b/test1.xmb", xmbPath); - TS_ASSERT_WSTR_EQUALS(xmbPath.string(), L"cache/mods/_test.xero/xmb/a/b/test1.xmb"); - } - // TODO: Should test the reading/parsing/writing code, // and parse error handling