Merge pull request #125 from Capitains/issue-124

Fixed issue-124

MyCapytain/__init__.py

@@ -9,4 +9,4 @@
 
 """
 
-__version__ = "2.0.0b18"
+__version__ = "2.0.0b19"

MyCapytain/resources/texts/locals/tei.py

@@ -446,7 +446,7 @@ def __findCRefPattern(self, xml):
         :return: None
         """
         if self.citation.isEmpty():
-            citation = xml.xpath("//tei:refsDecl[@n='CTS']", namespaces=NS),
+            citation = xml.xpath("//tei:refsDecl[@n='CTS']", namespaces=NS)
             if len(citation):
                 self.citation = Citation.ingest(resource=citation[0], xpath=".//tei:cRefPattern")
 

tests/resources/commonTests.py → tests/resources/texts/locals/commonTests.py

@@ -226,6 +226,14 @@ def test_complex_reffs(self):
         """
         self.assertEqual(("pr.1" in list(map(lambda x: str(x), self.text_complex.reffs))), True)
 
+    def test_xml_no_refs_Decl(self):
+        """ Test the result of parsing when there is no citation """
+        text = self.parse("tests/testing_data/texts/refsDeclButNoCTS.xml")
+        self.assertEqual(
+            text.citation.isEmpty(), True, "There should be no citation"
+        )
+
+
     def test_urn(self):
         """ Test setters and getters for urn """
 

tests/resources/texts/locals/test_capitains_xml_default.py

@@ -12,7 +12,7 @@
 import MyCapytain.errors
 import MyCapytain.resources.texts.encodings
 import MyCapytain.resources.texts.locals.tei
-from tests.resources.commonTests import CapitainsXmlTextTest, CapitainsXmlPassageTests, CapitainsXMLRangePassageTests
+from tests.resources.texts.locals.commonTests import CapitainsXmlTextTest, CapitainsXmlPassageTests, CapitainsXMLRangePassageTests
 
 
 class TestLocalXMLTextImplementation(CapitainsXmlTextTest, unittest.TestCase, xmlunittest.XmlTestMixin):
@@ -37,6 +37,13 @@ def setUp(self):
                 resource=f
             )
 
+    def parse(self, file):
+        with open(file) as f:
+            text = MyCapytain.resources.texts.locals.tei.Text(
+                resource=f
+            )
+        return text
+
     def tearDown(self):
         self.text.close()
 

tests/resources/texts/locals/test_capitains_xml_notObjectified.py

@@ -7,12 +7,12 @@
 import xmlunittest
 from lxml import etree
 
-from MyCapytain.common.utils import xmlparser
 import MyCapytain.common.reference
 import MyCapytain.errors
 import MyCapytain.resources.texts.encodings
 import MyCapytain.resources.texts.locals.tei
-from tests.resources.commonTests import CapitainsXmlTextTest, CapitainsXmlPassageTests, CapitainsXMLRangePassageTests
+from MyCapytain.common.utils import xmlparser
+from tests.resources.texts.locals.commonTests import CapitainsXmlTextTest, CapitainsXmlPassageTests, CapitainsXMLRangePassageTests
 
 
 objectifiedParser = lambda x: xmlparser(x, objectify=False)
@@ -40,6 +40,16 @@ def setUp(self):
                 resource=objectifiedParser(f)
             )
 
+        self.cls = lambda x: MyCapytain.resources.texts.locals.tei.Text(resource=objectifiedParser(x))
+
+    def parse(self, file):
+        with open(file) as f:
+            text = MyCapytain.resources.texts.locals.tei.Text(
+                resource=objectifiedParser(f)
+            )
+        return text
+
+
     def tearDown(self):
         self.text.close()
 

tests/resources/texts/test_encoding.py

@@ -141,4 +141,4 @@ def test_exportable_capacities(self):
             P.export_capacities,
             [Mimetypes.PYTHON.ETREE, Mimetypes.XML.Std, Mimetypes.PYTHON.NestedDict, Mimetypes.PLAINTEXT, Mimetypes.XML.TEI],
             "Passage should be able to export to given resources"
-        )
+        )