refactoring export_pmd

[meshio/pymeshio.git] / test / pmx_test.py

diff --git a/test/pmx_test.py b/test/pmx_test.py
index e9185ee..858f55e 100644 (file)
--- a/test/pmx_test.py
+++ b/test/pmx_test.py
@@ -1,12 +1,15 @@
 # coding: utf-8\r
 import unittest\r
 import io\r
-import pymeshio.pmd\r
+import pymeshio.common\r
+import pymeshio.pmd.reader\r
 import pymeshio.pmx.reader\r
 import pymeshio.pmx.writer\r
+import pymeshio.converter\r
 \r
 \r
-PMX_FILE=pymeshio.unicode('resources/初音ミクVer2.pmx')\r
+PMD_FILE=pymeshio.common.unicode('resources/初音ミクVer2.pmd')\r
+PMX_FILE=pymeshio.common.unicode('resources/初音ミクVer2.pmx')\r
 \r
 \r
 class TestPmx(unittest.TestCase):\r
@@ -17,9 +20,9 @@ class TestPmx(unittest.TestCase):
     def test_read(self):\r
         model=pymeshio.pmx.reader.read_from_file(PMX_FILE)\r
         self.assertEqual(pymeshio.pmx.Model,  model.__class__)\r
-        self.assertEqual(pymeshio.unicode('初音ミク'),  model.name)\r
-        self.assertEqual(pymeshio.unicode('Miku Hatsune'),  model.english_name)\r
-        self.assertEqual(pymeshio.unicode(\r
+        self.assertEqual(pymeshio.common.unicode('初音ミク'),  model.name)\r
+        self.assertEqual(pymeshio.common.unicode('Miku Hatsune'),  model.english_name)\r
+        self.assertEqual(pymeshio.common.unicode(\r
                 "PolyMo用モデルデータ：初音ミク ver.2.3\r\n"+\r
                 "(物理演算対応モデル)\r\n"+\r
                 "\r\n"+\r
@@ -27,7 +30,7 @@ class TestPmx(unittest.TestCase):
                 "データ変換       ：あにまさ氏\r\n"+\r
                 "Copyright     ：CRYPTON FUTURE MEDIA, INC"),\r
                 model.comment)\r
-        self.assertEqual(pymeshio.unicode(\r
+        self.assertEqual(pymeshio.common.unicode(\r
                 "MMD Model: Miku Hatsune ver.2.3\r\n"+\r
                 "(Physical Model)\r\n"+\r
                 "\r\n"+\r
@@ -57,3 +60,14 @@ class TestPmx(unittest.TestCase):
         model2=pymeshio.pmx.reader.read(io.BytesIO(out.getvalue()))\r
         self.assertEqual(model, model2)\r
 \r
+    def test_convert(self):\r
+        # convert\r
+        pmd=pymeshio.pmd.reader.read_from_file(PMD_FILE)\r
+        converted=pymeshio.converter.pmd_to_pmx(pmd)\r
+        # validate\r
+        pmx=pymeshio.pmx.reader.read_from_file(PMX_FILE)\r
+        # check diffference\r
+        pmx.diff(converted)\r
+        #self.assertEqual(pmx, converted)\r
+        pymeshio.pmx.writer.write(io.open("tmp.pmx", "wb"), converted)\r
+\r