Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix tests.

Browse Source 
This was SVN commit r8784.
This commit is contained in:
Ykkrosh 2010-12-04 15:08:18 +00:00
parent 1de0ce051f
commit 4b37898ab9
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/ps/XML/Xeromyces.h
View File

@ -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);
/**

15
source/ps/XML/tests/test_Xeromyces.h
View File

@ -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