add pmd::IO::read(const char*).

[meshio/meshio.git] / test / main.cpp

diff --git a/test/main.cpp b/test/main.cpp
index b4e6fef..21c9049 100644 (file)
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -57,20 +57,14 @@ TEST(text, LineReader)
                if(l.isEnd()){
                        break;
                }
-               //std::cout << l.getLineCount() << ',' << line << std::endl;
        }
        EXPECT_EQ(43, l.getLineCount());
 }
 
 TEST(mqo, read) 
 { 
-       //binary::FileReader reader("cube.mqo");
-       std::vector<char> all;
-       binary::readAll("cube.mqo", all);
-       binary::MemoryReader reader(&all[0], all.size());
-
        mqo::IO io;
-       EXPECT_TRUE(io.read(reader));
+       EXPECT_TRUE(io.read("cube.mqo"));
        EXPECT_EQ(1, io.objects.size());
        EXPECT_EQ(8, io.objects[0].vertices.size());
        EXPECT_EQ(6, io.objects[0].faces.size());
@@ -79,13 +73,8 @@ TEST(mqo, read)
 TEST(pmd, read) 
 { 
        std::locale::global(std::locale("japanese"));
-       std::vector<char> all;
-       binary::readAll("\8f\89\89¹\83~\83NVer2.pmd", all);
-       binary::MemoryReader reader(&all[0], all.size());
-
        pmd::IO io;
-       EXPECT_TRUE(io.read(reader));
-       //std::cout << io << std::endl;
+       EXPECT_TRUE(io.read("\8f\89\89¹\83~\83NVer2.pmd"));
        EXPECT_STREQ("\8f\89\89¹\83~\83N", io.name);
        EXPECT_EQ(17, io.materials.size());
        EXPECT_EQ(12354, io.vertices.size());
@@ -96,14 +85,8 @@ TEST(pmd, read)
 
 TEST(vmd, read)
 {
-       std::locale::global(std::locale("japanese"));
-       std::vector<char> all;
-       binary::readAll("mikumiku.vmd", all);
-       binary::MemoryReader reader(&all[0], all.size());
-
        vmd::IO io;
-       EXPECT_TRUE(io.read(reader));
-       //std::cout << io << std::endl;
+       EXPECT_TRUE(io.read("mikumiku.vmd"));
        EXPECT_EQ(122, io.boneMap.size());
        EXPECT_EQ(16, io.morphMap.size());
 }