extra check on bonds, removing old Start script

CityGenerator · Sep 6, 2014 · 937bd66 · 937bd66 · satthawut · Sep 22, 2014
1 parent 29d9c77
commit 937bd66
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/Start b/Start
diff --git a/megacosm/generators/bond.py b/megacosm/generators/bond.py
@@ -8,20 +8,17 @@
 
 
 class Bond(Generator):
-
     """Generate a bond between two people 'you' and 'other'."""
 
     def __init__(self, redis, features={}):
         Generator.__init__(self, redis, features)
         self.logger = logging.getLogger(__name__)
 
         # if self.you and self.other are not set, set them to defaults.
-
         if not hasattr(self, 'you'):
             self.you = 'you'
 
         # a random NPC
-
         if not hasattr(self, 'other'):
             self.other = npc.NPC(self.redis).name['full']
 

diff --git a/tests/test_bond.py b/tests/test_bond.py
@@ -31,4 +31,15 @@ def test_bond_features(self):
             'bond_when_roll': 5,
             'when': 'Bob',
             })
-        self.assertEqual(bond.text, 'Bob, Jesse Will Tony Shaun Rich')
+        self.assertEqual('Bob, Jesse Will Tony Shaun Rich', bond.text)
+        self.assertEqual('Bob, Jesse Will Tony Shaun Rich', "%s" % bond)
+
+    def test_bond_non_features(self):
+        """  """
+        bond = Bond(self.redis, {
+            'bond_when_roll': 100,
+            'template': 'Bob, Jesse Will Tony Shaun Rich',
+            })
+
+        self.assertEqual('Bob, Jesse Will Tony Shaun Rich', bond.text)
+        self.assertEqual('Bob, Jesse Will Tony Shaun Rich', "%s" % bond)