X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/d131ce6a550d4d3572584c04984550d151eccd7b..cdf8761bc6f07dfd039e278f9c6d7c2c86c7b50f:/pokedex/tests/test_lookup.py?ds=sidebyside

diff --git a/pokedex/tests/test_lookup.py b/pokedex/tests/test_lookup.py
index 094e630..5d9ff95 100644
--- a/pokedex/tests/test_lookup.py
+++ b/pokedex/tests/test_lookup.py
@@ -28,7 +28,8 @@ def test_exact_lookup():
 
         # Forms
         (u'Rotom',          'pokemon',      479),
-        (u'Wash Rotom',     'pokemon',      504),
+        (u'Wash Rotom',     'pokemon_forms',10059),
+        (u'East Shellos',   'pokemon_forms',10039),
 
         # Other languages
         (u'イーブイ',       'pokemon',      133),
@@ -66,10 +67,12 @@ def test_type_lookup():
     assert_equal(results[0].object.__tablename__, 'pokemon',
                                                 u'Type restriction works correctly')
     assert_equal(len(results), 1,               u'Only one id result when type is specified')
-    assert_equal(results[0].name, u'Bulbasaur', u'Type + id returns the right result')
+    assert_equal(results[0].object.name, u'Bulbasaur',
+                                                u'Type + id returns the right result')
 
     results = lookup.lookup(u'1', valid_types=['pokemon'])
-    assert_equal(results[0].name, u'Bulbasaur', u'valid_types works as well as type: prefix')
+    assert_equal(results[0].object.name, u'Bulbasaur',
+                                                u'valid_types works as well as type: prefix')
 
 def test_language_lookup():
     # There are two objects named "charge": the move Charge, and the move
@@ -91,6 +94,10 @@ def test_language_lookup():
     assert_equal(results[0].object.name, u'Tackle',
                                                 u'Languages and types both work together')
 
+    results = lookup.lookup(u'@fr:charge', valid_types=['move'])
+    assert_equal(results[0].object.name, u'Tackle',
+                                                u'valid_types and language prefixes get along')
+
 def test_fuzzy_lookup():
     tests = [
         # Regular English names
@@ -140,3 +147,8 @@ def test_random_lookup():
         assert_equal(len(results), 1,           u'Constrained random returns one result')
         assert_equal(results[0].object.__tablename__, table_name,
                                                 u'Constrained random returns result from the right table')
+
+def test_crash_empty_prefix():
+    """Searching for ':foo' used to crash, augh!"""
+    results = lookup.lookup(u':Eevee')
+    assert_equal(results[0].object.name, u'Eevee', u'Empty prefix dun crash')