[geneagrapher] 166/226: - Changed exception message when a bad ID is given. - Added end-to-end test with a bad ID as input.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository geneagrapher.

commit ca812aee1c1b7678bba9ca67a1c1c965e7a51d82
Author: David Alber <alber.david at gmail.com>
Date:   Fri Nov 4 22:01:14 2011 -0700

    - Changed exception message when a bad ID is given.
    - Added end-to-end test with a bad ID as input.
---
 geneagrapher/grabber.py            |  2 +-
 tests/test_geneagrapher_methods.py | 22 +++++++++++++++++-----
 tests/test_grabber_methods.py      |  7 +++++++
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/geneagrapher/grabber.py b/geneagrapher/grabber.py
index 4737f5d..d1ffb9b 100644
--- a/geneagrapher/grabber.py
+++ b/geneagrapher/grabber.py
@@ -36,7 +36,7 @@ class Grabber:
 
         if soup.firstText().text == u"You have specified an ID that does not exist in the database. Please back up and try again.":
             # Then a bad URL (e.g., a bad record id) was given. Throw an exception.
-            msg = "Invalid page address for id {}".format(self.id)
+            msg = "Invalid id {}".format(self.id)
             raise ValueError(msg)
 
         # Get mathematician name.
diff --git a/tests/test_geneagrapher_methods.py b/tests/test_geneagrapher_methods.py
index 97cbe7b..999030a 100644
--- a/tests/test_geneagrapher_methods.py
+++ b/tests/test_geneagrapher_methods.py
@@ -185,7 +185,19 @@ geneagrapher: error: no record IDs given
         self.assertEquals(record.year, 2003)
         self.assertEquals(record.id, 99457)
 
-    def test009_end_to_end_self_stdout(self):
+    def test009_build_graph_bad_id(self):
+        # Graph building with a bad ID.
+        self.ggrapher.leaf_ids.append(79568583832)
+        self.assertRaises(ValueError, self.ggrapher.build_graph)
+
+        try:
+            self.ggrapher.build_graph()
+        except ValueError as e:
+            self.assertEquals(str(e), "Invalid id 79568583832")
+        else:
+            self.fail()
+
+    def test010_end_to_end_self_stdout(self):
         # Complete test getting no ancestors or descendants and writing the
         # result to stdout.
         sys.argv = ['geneagrapher', '30484']
@@ -216,7 +228,7 @@ geneagrapher: error: no record IDs given
 """
         self.assertEquals(stdout_intercept.getvalue().decode('utf-8'), expected)
 
-    def test010_end_to_end_ancestors_stdout(self):
+    def test011_end_to_end_ancestors_stdout(self):
         # Complete test getting with ancestors, writing the result to stdout.
         sys.argv = ['geneagrapher', '-a', '127946']
         self.ggrapher.parse_input()
@@ -252,7 +264,7 @@ geneagrapher: error: no record IDs given
 """
         self.assertEquals(stdout_intercept.getvalue().decode('utf-8'), expected)
 
-    def test011_end_to_end_descendants_stdout(self):
+    def test012_end_to_end_descendants_stdout(self):
         # Complete test getting with descendants, writing the result to stdout.
         sys.argv = ['geneagrapher', '-d', '79568']
         self.ggrapher.parse_input()
@@ -286,7 +298,7 @@ geneagrapher: error: no record IDs given
 """
         self.assertEquals(stdout_intercept.getvalue().decode('utf-8'), expected)
 
-    def test012_end_to_end_self_file(self):
+    def test013_end_to_end_self_file(self):
         # Complete test getting no ancestors or descendants and writing the
         # result to stdout.
         outfname = 'outfile.test'
@@ -314,7 +326,7 @@ geneagrapher: error: no record IDs given
             self.assertEquals(fin.read().decode('utf-8'), expected)
         os.remove(outfname)
 
-    def test013_end_to_end_through_ggrapher_self_stdout(self):
+    def test014_end_to_end_through_ggrapher_self_stdout(self):
         # Complete test calling ggrapher getting no ancestors or descendants
         # and writing the result to stdout.
         sys.argv = ['geneagrapher', '30484']
diff --git a/tests/test_grabber_methods.py b/tests/test_grabber_methods.py
index 64121fc..e58cff0 100644
--- a/tests/test_grabber_methods.py
+++ b/tests/test_grabber_methods.py
@@ -21,6 +21,13 @@ class TestGrabberMethods(unittest.TestCase):
         # Verify exception thrown for bad id.
         grabber = Grabber(999999999)
         self.assertRaises(ValueError, grabber.extract_node_information)
+
+        try:
+            grabber.extract_node_information()
+        except ValueError as e:
+            self.assertEquals(str(e), "Invalid id 999999999")
+        else:
+            self.fail()
         
     def test003_extract_info_all_fields(self):
         # Test the extract_node_information() method for a record containing all fields.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/geneagrapher.git