merges r22741 from trunk into ruby_1_9_1.

--

* lib/prime.rb (Prime::prime?): used to return a wrong answer.
  [ruby-core:22646].

* test/test_prime.rb (test_prime?): test case for [ruby-core:22646].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23176 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 15 insertions, 0 deletions

diff --git a/test/test_prime.rb b/test/test_prime.rb
index aca5109689..0dad7cf987 100644
--- a/test/test_prime.rb
+++ b/test/test_prime.rb
@@ -89,6 +89,11 @@ class TestPrime < Test::Unit::TestCase
     end
   end
 
+  def test_default_instance_does_not_have_compatibility_methods
+    assert !Prime.instance.respond_to?(:succ)
+    assert !Prime.instance.respond_to?(:next)
+  end
+
   class TestInteger < Test::Unit::TestCase
     def test_prime_division
       pd = PRIMES.inject(&:*).prime_division
@@ -100,6 +105,10 @@ class TestPrime < Test::Unit::TestCase
     end
 
     def test_prime?
+      # zero and unit
+      assert !0.prime?
+      assert !1.prime?
+
       # small primes
       assert 2.prime?
       assert 3.prime?
@@ -121,6 +130,12 @@ class TestPrime < Test::Unit::TestCase
 
       # factorial
       assert !(2...100).inject(&:*).prime?
+
+      # negative
+      assert !-1.prime?
+      assert -2.prime?
+      assert -3.prime?
+      assert !-4.prime?
     end
   end
 end