Changeset 216

Timestamp:

08/07/08 22:49:56 (4 months ago)

Author:

pwh

Message:

• Reworked testing, split some functions from application_controller in to lib/nethorus_functions.rb
  

Files:

• nethorus/app/controllers/application.rb (added)
• nethorus/app/controllers/application_controller.rb (added)
• nethorus/lib/nethorus_functions.rb (added)
• nethorus/test/functional/common_functions_test.rb (moved) (moved from nethorus/test/unit/application_common_functions_test.rb) (2 diffs, 1 prop)
• nethorus/test/unit/application_helper_test.rb (added)
• nethorus/test/unit/bridge_test.rb (modified) (1 diff)
• nethorus/test/unit/device_test.rb (modified) (2 diffs)

nethorus/test/functional/common_functions_test.rb

@@ -22 +22 @@
-=begin rdoc
-
-Unit tests for application
+Functional tests for
-
-=end
-
-require File.dirname(__FILE__) + '/../test_helper'
+require 'nethorus_functions.rb'
-
-Application
+
-
-  # Test the purify_mac_address function, which should convert a hexadecimal
-  # string, perhaps padded with spaces, dots or dashes, in to a 12-character
-  # upper-case hexadecimal string.
-
-purify_mac_address_test
+
+test_purify_mac_address
-
-    test_address = purify_mac_address("000000000000")
@@ -74 +75 @@
-  end
-
+
+  # Test the validate_ip_address function.
+  
+  def test_validate_ip_address
+  
+    assert(validate_ip_address("0.0.0.0"), "The IPv4 address 0.0.0.0 should be valid")
+    assert(validate_ip_address("0.0.0.1"), "The IPv4 address 0.0.0.1 should be valid")
+    assert(validate_ip_address("255.255.255.254"), "The IPv4 address 255.255.255.254 should be valid")
+    assert(validate_ip_address("255.255.255.255"), "The IPv4 address 255.255.255.255 should be valid")
+
+    assert(!validate_ip_address("0.0.0.-1"), "The IPv4 address 0.0.0.-1 should not be valid")
+    assert(!validate_ip_address("0.0.-1.0"), "The IPv4 address 0.0.-1.0 should not be valid")
+    assert(!validate_ip_address("0.-1.0.0"), "The IPv4 address 0.-1.0.0 should not be valid")
+    assert(!validate_ip_address("-1.0.0.0"), "The IPv4 address -1.0.0.0 should not be valid")
+    
+    assert(validate_ip_address("0"), "The IPv4 address 0 should be valid")
+    assert(!validate_ip_address("0.0"), "The IPv4 address 0.0 should not be valid")
+    assert(!validate_ip_address("0.0.0"), "The IPv4 address 0.0.0 should not be valid")
+    assert(!validate_ip_address("0.0.0.0.0"), "The IPv4 address 0.0.0.0.0 should not be valid")
+    
+  end
+  
-end

nethorus/test/unit/bridge_test.rb

@@ -254 +254 @@
-
-
+  # Test the bridge hack for devices which return values in seconds rather than centi-seconds
+  
+  def test_bridge_values_in_seconds_not_centiseconds_hack
+  
+    bridge = @device.create_bridge
+
+    bridge.dot1d_base_bridge_address = "80001234567890AB"
+    bridge.dot1d_base_num_ports = 1
+    bridge.dot1d_base_type = "transparent-only"
+    bridge.dot1d_stp_protocol_specification = "ieee8021d"
+    bridge.dot1d_stp_priority = 32768
+    bridge.dot1d_stp_designated_root = "80001234567890AB"
+    bridge.dot1d_stp_root_cost = 100
+    bridge.dot1d_stp_root_port = 50
+    bridge.dot1d_stp_max_age = 2000
+    bridge.dot1d_stp_hello_time = 200
+    bridge.dot1d_stp_hold_time = 200
+    bridge.dot1d_stp_forward_delay = 1500
+    bridge.dot1d_stp_bridge_max_age = 2000
+    bridge.dot1d_stp_bridge_hello_time = 200
+    bridge.dot1d_stp_bridge_forward_delay = 1500
+
+    assert(bridge.valid?, "A new Bridge should be valid with the minimum required attributes set")
+    
+    
+    # Test recalculation for low values of dot1d_stp_max_age
+    
+    bridge.dot1d_stp_max_age = 1
+    assert(bridge.valid? && bridge_dot1d_stp_max_age = 100, "Specifying dot1d_stp_max_age =< 50 should multiply the value by 100 (centisecond hack) - we used 1")
+
+    bridge.dot1d_stp_max_age = 50
+    assert(bridge.valid? && bridge_dot1d_stp_max_age = 5000, "Specifying dot1d_stp_max_age =< 50 should multiply the value by 100 (centisecond hack) - we used 50")
+  
+    bridge.dot1d_stp_max_age = 51
+    assert(bridge.valid? && bridge_dot1d_stp_max_age = 51, "Specifying dot1d_stp_max_age =< 50 should multiply the value by 100 (centisecond hack) - we used 51")
+
+
+    # Test recalculation for low values of dot1d_stp_hello_time
+
+    bridge.dot1d_stp_hello_time = 1
+    assert(bridge.valid? && bridge_dot1d_stp_hello_time = 100, "Specifying dot1d_stp_hello_time =< 50 should multiply the value by 100 (centisecond hack) - we used 1")
+
+    bridge.dot1d_stp_hello_time = 50
+    assert(bridge.valid? && bridge_dot1d_stp_hello_time = 5000, "Specifying dot1d_stp_hello_time =< 50 should multiply the value by 100 (centisecond hack) - we used 50")
+  
+    bridge.dot1d_stp_hello_time = 51
+    assert(bridge.valid? && bridge_dot1d_stp_hello_time = 51, "Specifying dot1d_stp_hello_time =< 50 should multiply the value by 100 (centisecond hack) - we used 51")
+
+  end
+
+
-  # Test the device/bridge relationship
-  

nethorus/test/unit/device_test.rb

@@ -210 +210 @@
-
-    device = Device.new
-
+e
-    device.ipv4_address = "127.0.0.1"
-
@@ -225 +225 @@
-    assert(device.valid?, "A device should be valid with a nil SNMP version")
-
+    device.snmp_version = 4
+    assert(!device.valid?, "A device should not be valid with an SNMP version of 4")
+
+    device.snmp_version = "garbage"
+    assert(!device.valid?, "A device should not be valid with an SNMP version of 'garbage'")
+
-  end
-