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_coecon.py b/test_coecon.py
index 2d22be5..8c1dac8 100755
--- a/test_coecon.py
+++ b/test_coecon.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/coecon", "r") as file:
             cls.page = html.fromstring(file.read())
 
     # Tests
     def test_correctTitleIsParsed(self):
-        self.assertEqual(cardbase.getTitle(self.page), "Coerced Confession")
+        self.assertEqual(cardparser.getTitle(self.page), "Coerced Confession")
     
     def test_correctCostIsParsed(self):
-        self.assertEqual(cardbase.getCost(self.page), "4{U/B}")
+        self.assertEqual(cardparser.getCost(self.page), "4{U/B}")
+        
+    def test_correctConvertedCostIsParsed(self):
+        self.assertEqual(cardparser.getConvertedCost(self.page), "5")
         
     def test_correctColourIsParsed(self):
-        self.assertEqual(cardbase.getColour(self.page), "UB")
+        self.assertEqual(cardparser.getColour(self.page), "UB")
         
     def test_correctTypeIsParsed(self):
-        self.assertEqual(cardbase.getType(self.page), "Sorcery")
+        self.assertEqual(cardparser.getType(self.page), "Sorcery")
         
     def test_correctSubTypeIsParsed(self):
-        self.assertEqual(cardbase.getSubType(self.page), "")
+        self.assertEqual(cardparser.getSubType(self.page), "")
         
     def test_correctArtistIsParsed(self):
-        self.assertEqual(cardbase.getArtist(self.page), "Mathias Kollros")
+        self.assertEqual(cardparser.getArtist(self.page), "Mathias Kollros")
         
     def test_correctTextIsParsed(self):
-        self.assertEqual(cardbase.getText(self.page), ["Target player puts the top four cards of his or her library into his or her graveyard. You draw a card for each creature card put into that graveyard this way."])
+        self.assertEqual(cardparser.getText(self.page), ["Target player puts the top four cards of his or her library into his or her graveyard. You draw a card for each creature card put into that graveyard this way."])
         
     def test_correctFlavourIsParsed(self):
-        self.assertEqual(cardbase.getFlavour(self.page), "\"Ask the right questions in the right way and truth is inevitable.\" —Lazav")
+        self.assertEqual(cardparser.getFlavour(self.page), "\"Ask the right questions in the right way and truth is inevitable.\" —Lazav")
         
     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), "")
+        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("gtc", "217")
+        cls.card = cardparser.fetchCard("gtc", "217")
     
     def test_cardHasCorrectEdition(self):
         self.assertEqual(self.card.edition, "gtc")