test/country_test.rb in uncharted-0.0.6 vs test/country_test.rb in uncharted-0.0.7.beta1

@@ -13,10 +13,15 @@
     assert @br, "BR must exist"
     assert_equal 'BR',     @br.alpha2
     assert_equal 'BRA',    @br.alpha3
     assert_equal 'Brazil', @br.name
   end
+  
+  def test_country_find
+    @us = Country.find('US')
+    assert_equal [@br, @us], Country.find([@br.alpha2, @us.alpha2])
+  end
 
   def test_to_s
     assert_equal 'BR', @br.to_s
   end
   
@@ -24,22 +29,28 @@
     assert_equal 247, Country.count
     assert_equal  27, Country.subdivisions.values.count
   end
 
   def test_territories
-    assert_equal  1, @br.districts.count
+    df = Territory.find('BR-DF')
+    assert_equal [df], @br.districts
     assert_equal 26, @br.states.count
+    assert_equal 27, @br.subdivisions.count
     assert @br.territories.empty?
 
-    assert_equal [:district, :state], @br.subdivisions.keys.sort
     assert_equal 'Paraná', Uncharted::Territory.find('BR-PR').name
     assert_equal 'PR', Uncharted::Territory.find('BR-PR').abbr
+    assert_equal 'PR', Uncharted::Territory.find('BR-PR').to_s
   end
   
   def test_classes
     assert_equal Country,   Uncharted::Country
     assert_equal Territory, Uncharted::Territory
     assert_equal Country::Field, Uncharted::Country::Field
     assert_equal Territory::Field, Uncharted::Territory::Field
+  end
+  
+  def test_country_collection
+    assert_equal 247, Country.countries.count
   end
 
 end