Moved some things around, separated parsing into a different module to make way for the GUI

1 files changed, 17 insertions, 17 deletions

diff --git a/test_island.py b/test_island.py
index 44641cb..0710949 100755
--- a/test_island.py
+++ b/test_island.py
@@ -1,61 +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):
-        # but actually, use the pre-fetched file to avoid querying the server too much
         with open("testcards/island", "r") as file:
             cls.page = html.fromstring(file.read())
 
     # Tests
     def test_correctTitleIsParsed(self):
-        self.assertEqual(cardbase.getTitle(self.page), "Island")
+        self.assertEqual(cardparser.getTitle(self.page), "Island")
     
     def test_correctCostIsParsed(self):
-        self.assertEqual(cardbase.getCost(self.page), "")
+        self.assertEqual(cardparser.getCost(self.page), "")
+        
+    def test_correctConvertedCostIsParsed(self):
+        self.assertEqual(cardparser.getConvertedCost(self.page), "")
         
     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), "Basic Land")
+        self.assertEqual(cardparser.getType(self.page), "Basic Land")
         
     def test_correctSubTypeIsParsed(self):
-        self.assertEqual(cardbase.getSubType(self.page), "Island")
+        self.assertEqual(cardparser.getSubType(self.page), "Island")
         
     def test_correctArtistIsParsed(self):
-        self.assertEqual(cardbase.getArtist(self.page), "Florian de Gesincourt")
+        self.assertEqual(cardparser.getArtist(self.page), "Florian de Gesincourt")
         
     def test_correctTextIsParsed(self):
-        self.assertEqual(cardbase.getText(self.page), ["({T}: Add {U} to your mana pool.)"])
+        self.assertEqual(cardparser.getText(self.page), ["({T}: Add {U} to your mana pool.)"])
         
     def test_correctFlavourIsParsed(self):
-        self.assertEqual(cardbase.getFlavour(self.page), "")
+        self.assertEqual(cardparser.getFlavour(self.page), "")
         
     def test_correctRarityIsParsed(self):
-        self.assertEqual(cardbase.getRarity(self.page), "Land")
+        self.assertEqual(cardparser.getRarity(self.page), "Land")
         
     def test_correctPowerIsParsed(self):
-        self.assertEqual(cardbase.getPower(self.page), "")
+        self.assertEqual(cardparser.getPower(self.page), "")
 
     def test_correctToughnessIsParsed(self):
-        self.assertEqual(cardbase.getToughness(self.page), "")
+        self.assertEqual(cardparser.getToughness(self.page), "")
         
     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("dtk", "253")
+        cls.card = cardparser.fetchCard("dtk", "253")
     
     def test_cardHasCorrectEdition(self):
         self.assertEqual(self.card.edition, "dtk")