1 files changed, 17 insertions, 20 deletions
diff --git a/test_ugin.py b/test_ugin.py
index 948d341..153e226 100755
--- a/test_ugin.py
+++ b/test_ugin.py
@@ -1,64 +1,61 @@
 #!/usr/bin/env python3
 
-import sys
 import unittest
-import cardbase
 from lxml import html
-
+import cardparser
 
 class Test_cardInformationParsing(unittest.TestCase):
     
     @classmethod
     def setUpClass(cls):
-        # fetch shivan dragon info by the card's collector number (281 in M15)
-        # cls.page = html.fromstring(requests.get("http://magiccards.info/m15/en/281.html").text)
-        
-        # but actually, use the pre-fetched file to avoid querying the server too much
         with open("testcards/ugincons", "r") as file:
             cls.page = html.fromstring(file.read())
 
     # Tests
     def test_correctTitleIsParsed(self):
-        self.assertEqual(cardbase.getTitle(self.page), "Ugin's Construct")
+        self.assertEqual(cardparser.getTitle(self.page), "Ugin's Construct")
     
     def test_correctCostIsParsed(self):
-        self.assertEqual(cardbase.getCost(self.page), "4")
+        self.assertEqual(cardparser.getCost(self.page), "4")
+        
+    def test_correctConvertedCostIsParsed(self):
+        self.assertEqual(cardparser.getConvertedCost(self.page), "4")
         
     def test_correctColourIsParsed(self):
-        self.assertEqual(cardbase.getColour(self.page), "")
+        self.assertEqual(cardparser.getColour(self.page), "")
         
     def test_correctTypeIsParsed(self):
-        self.assertEqual(cardbase.getType(self.page), "Artifact Creature")
+        self.assertEqual(cardparser.getType(self.page), "Artifact Creature")
         
     def test_correctSubTypeIsParsed(self):
-        self.assertEqual(cardbase.getSubType(self.page), "Construct")
+        self.assertEqual(cardparser.getSubType(self.page), "Construct")
         
     def test_correctArtistIsParsed(self):
-        self.assertEqual(cardbase.getArtist(self.page), "Peter Mohrbacher")
+        self.assertEqual(cardparser.getArtist(self.page), "Peter Mohrbacher")
         
     def test_correctTextIsParsed(self):
-        self.assertEqual(cardbase.getText(self.page), ["When Ugin's Construct enters the battlefield, sacrifice a permanent that's one or more colors."])
+        self.assertEqual(cardparser.getText(self.page), ["When Ugin's Construct enters the battlefield, sacrifice a permanent that's one or more colors."])
         
     def test_correctFlavourIsParsed(self):
-        self.assertEqual(cardbase.getFlavour(self.page), "While trapping the Eldrazi on Zendikar, Ugin learned little from Sorin, but he gleaned the rudiments of lithomancy from Nahiri.")
+        self.assertEqual(cardparser.getFlavour(self.page), "While trapping the Eldrazi on Zendikar, Ugin learned little from Sorin, but he gleaned the rudiments of lithomancy from Nahiri.")
         
     def test_correctRarityIsParsed(self):
-        self.assertEqual(cardbase.getRarity(self.page), "Uncommon")
+        self.assertEqual(cardparser.getRarity(self.page), "Uncommon")
         
     def test_correctPowerIsParsed(self):
-        self.assertEqual(cardbase.getPower(self.page), "4")
+        self.assertEqual(cardparser.getPower(self.page), "4")
 
     def test_correctToughnessIsParsed(self):
-        self.assertEqual(cardbase.getToughness(self.page), "5")
+        self.assertEqual(cardparser.getToughness(self.page), "5")
         
     def test_correctLoyaltyIsParsed(self):
-        self.assertEqual(cardbase.getLoyalty(self.page), "")
+        self.assertEqual(cardparser.getLoyalty(self.page), "")
 
 class Test_additionalCardData(unittest.TestCase):
     
     @classmethod
     def setUpClass(cls):
-        cls.card = cardbase.fetchCard("frf", "164")
+        cls.card = cardparser.fetchCard("frf", "164")
     
     def test_cardHasCorrectEdition(self):
         self.assertEqual(self.card.edition, "frf")