X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=rwlaunchpad%2Fplugins%2Frwlaunchpadtasklet%2Ftest%2Futest_serializer.py;h=432f1e38504e12f829aa14b6a6fe799ebdaf7f8d;hb=f314b4af9744068a7ed7a6a6314220c3aa857523;hp=af8e1f87e326a3975fddf9e2f70485d3381a3053;hpb=6f1a3fe149e4a6b9803382cb299c902f4cf58ec9;p=osm%2FSO.git

diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_serializer.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_serializer.py
index af8e1f87..432f1e38 100755
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_serializer.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_serializer.py
@@ -34,22 +34,30 @@ from rift.package.convert import (
 
 import gi
 gi.require_version('RwpersonDbYang', '1.0')
+gi.require_version('RwProjectPersonDbYang', '1.0')
 gi.require_version('RwYang', '1.0')
 
 from gi.repository import (
         RwpersonDbYang,
+        RwProjectPersonDbYang,
         RwYang,
         )
 
+from rift.package.convert import SerializationError
+
+
 class TestSerializer(unittest.TestCase):
     def setUp(self):
         self._serializer = ProtoMessageSerializer(
                 RwpersonDbYang,
-                RwpersonDbYang.Person
+                RwpersonDbYang.Person,
+                RwProjectPersonDbYang,
+                RwProjectPersonDbYang.YangData_RwProject_Project_Person,
                 )
 
         self._sample_person = RwpersonDbYang.Person(name="Fred")
-        self._model = RwYang.model_create_libncx()
+        self._project_person = RwProjectPersonDbYang.YangData_RwProject_Project_Person(name="Fred")
+        self._model = RwYang.model_create_libyang()
         self._model.load_schema_ypbc(RwpersonDbYang.get_schema())
 
     def test_from_xml_file(self):
@@ -63,14 +71,14 @@ class TestSerializer(unittest.TestCase):
         with io.StringIO(sample_person_yaml) as file_hdl:
 
             person = self._serializer.from_file_hdl(file_hdl, ".yml")
-            self.assertEqual(person, self._sample_person)
+            self.assertEqual(person, self._project_person)
 
     def test_from_json_file(self):
         sample_person_json = self._sample_person.to_json(self._model)
         with io.StringIO(sample_person_json) as file_hdl:
 
             person = self._serializer.from_file_hdl(file_hdl, ".json")
-            self.assertEqual(person, self._sample_person)
+            self.assertEqual(person, self._project_person)
 
     def test_unknown_file_extension(self):
         with io.StringIO("asdf") as file_hdl:
@@ -90,7 +98,7 @@ class TestSerializer(unittest.TestCase):
         self.assertEqual(person, self._sample_person)
 
     def test_to_json_string_invalid_type(self):
-        with self.assertRaises(TypeError):
+        with self.assertRaises(SerializationError):
             self._serializer.to_json_string(RwpersonDbYang.FlatPerson(name="bob"))