test/answer/parser/whois.nic.hu_test.rb in whois-1.0.5 vs test/answer/parser/whois.nic.hu_test.rb in whois-1.0.6

@@ -105,10 +105,17 @@
                   @klass.new(load_part('/in_progress.txt')).updated_on
     assert_equal  Time.parse("2009-08-25 10:11:32"),
                   @klass.new(load_part('/registered.txt')).updated_on
   end
 
+  def test_expires_on
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/registered.txt')).expires_on }
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/available.txt')).expires_on }
+    assert_raise(Whois::PropertyNotSupported) { @klass.new(load_part('/in_progress.txt')).expires_on }
+  end
+
+
   def test_admin_with_registered
     admin = @klass.new(load_part('/registered.txt')).admin
     assert_instance_of Whois::Answer::Contact, admin
     assert_equal '2000466366', admin.id
     assert_equal '3C Kft. (Registrar)', admin.name
@@ -146,10 +153,42 @@
                   @klass.new(load_part('/available.txt')).technical
     assert_equal  nil,
                   @klass.new(load_part('/in_progress.txt')).technical
   end
 
+  def test_registrar_with_registered
+    registrar = @klass.new(load_part('/registered.txt')).registrar
+    assert_instance_of Whois::Answer::Registrar, registrar
+    assert_equal '1960108002', registrar.id
+    assert_equal '3C Kft. (Registrar)', registrar.name
+    assert_equal '3C Ltd.', registrar.organization
+  end
+
+  def test_registrar_with_unregistered
+    assert_equal  nil,
+                  @klass.new(load_part('/available.txt')).registrar
+    assert_equal  nil,
+                  @klass.new(load_part('/in_progress.txt')).registrar
+  end
+
+  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 }
+
+    parser    = @klass.new(load_part('/available.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+
+    parser    = @klass.new(load_part('/in_progress.txt'))
+    expected  = %w()
+    assert_equal  expected, parser.nameservers
+    assert_equal  expected, parser.instance_eval { @nameservers }
+  end
+
   def test_zone_contact_with_registered
     zone_contact = @klass.new(load_part('/registered.txt')).zone_contact
     assert_instance_of Whois::Answer::Contact, zone_contact
     assert_equal '2000578125', zone_contact.id
     assert_equal 'Markmonitor', zone_contact.name
@@ -186,40 +225,8 @@
   def test_registrar_contact_with_unregistered
     assert_equal  nil,
                   @klass.new(load_part('/available.txt')).registrar_contact
     assert_equal  nil,
                   @klass.new(load_part('/in_progress.txt')).registrar_contact
-  end
-
-  def test_registrar_with_registered
-    registrar = @klass.new(load_part('/registered.txt')).registrar
-    assert_instance_of Whois::Answer::Registrar, registrar
-    assert_equal '1960108002', registrar.id
-    assert_equal '3C Kft. (Registrar)', registrar.name
-    assert_equal '3C Ltd.', registrar.organization
-  end
-
-  def test_registrar_with_unregistered
-    assert_equal  nil,
-                  @klass.new(load_part('/available.txt')).registrar
-    assert_equal  nil,
-                  @klass.new(load_part('/in_progress.txt')).registrar
-  end
-
-  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 }
-
-    parser    = @klass.new(load_part('/available.txt'))
-    expected  = %w()
-    assert_equal  expected, parser.nameservers
-    assert_equal  expected, parser.instance_eval { @nameservers }
-
-    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