test/answer/parser/whois.nic.hu_test.rb in whois-1.0.3 vs test/answer/parser/whois.nic.hu_test.rb in whois-1.0.4

@@ -1,19 +1,18 @@
 # coding: utf-8
 
 require 'test_helper'
 require 'whois/answer/parser/whois.nic.hu.rb'
 
-class AnswerParserWhoisNicHuTest < Test::Unit::TestCase
+class AnswerParserWhoisNicHuTest < Whois::Answer::Parser::TestCase
 
-  TESTCASE_PATH = File.expand_path(File.dirname(__FILE__) + '/../../testcases/responses/whois.nic.hu')
-
   def setup
     @klass  = Whois::Answer::Parser::WhoisNicHu
     @host   = "whois.nic.hu"
   end
 
+
   def test_disclaimer
     expected = <<-EOS.strip
 Rights restricted by copyright. Szerzõi jog fenntartva.
 -Legal usage of this service requires that you agree to
 abide by the rules and conditions set forth at
@@ -88,19 +87,10 @@
                   @klass.new(load_part('/available.txt')).registrant
     assert_equal  nil,
                   @klass.new(load_part('/in_progress.txt')).registrant
   end
 
-  def test_nameserver
-    assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).nameservers
-    assert_equal  nil,
-                  @klass.new(load_part('/in_progress.txt')).nameservers
-    assert_equal  %w(ns1.google.com ns2.google.com ns3.google.com ns4.google.com),
-                  @klass.new(load_part('/registered.txt')).nameservers.sort
-  end
-
   def test_created_on
     assert_equal  nil,
                   @klass.new(load_part('/available.txt')).created_on
     assert_equal  nil,
                   @klass.new(load_part('/in_progress.txt')).created_on
@@ -213,16 +203,23 @@
                   @klass.new(load_part('/available.txt')).registrar
     assert_equal  nil,
                   @klass.new(load_part('/in_progress.txt')).registrar
   end
 
-  protected
+  def test_nameserver
+    parser    = @klass.new(load_part('/registered.txt'))
+    expected  = %w( ns1.google.com ns4.google.com ns3.google.com ns2.google.com )
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
 
-    def load_part(path)
-      part(File.read(TESTCASE_PATH + path), @host)
-    end
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
 
-    def part(*args)
-      Whois::Answer::Part.new(*args)
-    end
+    parser    = @klass.new(load_part('/in_progress.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
 
 end
\ No newline at end of file