virtualbox 0.4.1 → 0.4.2

data/test/virtualbox/command_test.rb

@@ -8,59 +8,59 @@ class CommandTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   context "executing commands" do
     should "use backticks to execute the command" do
       VirtualBox::Command.expects(:`).with("foo").once
       VirtualBox::Command.execute("foo")
     end
-    
+
     should "return the result of the execution" do
       VirtualBox::Command.expects(:`).with("foo").returns("bar").once
       assert_equal "bar", VirtualBox::Command.execute("foo")
     end
   end
-  
+
   context "vbox commands" do
     should "call 'vboxmanage' followed by command" do
-      VirtualBox::Command.expects(:execute).with("VBoxManage foo")
+      VirtualBox::Command.expects(:execute).with("VBoxManage -q foo")
       VirtualBox::Command.stubs(:success?).returns(true)
       VirtualBox::Command.vboxmanage("foo")
     end
-    
+
     should "call the custom vboxmanage executable if set" do
       VirtualBox::Command.vboxmanage = "barf"
-      VirtualBox::Command.expects(:execute).with("barf foo")
+      VirtualBox::Command.expects(:execute).with("barf -q foo")
       VirtualBox::Command.stubs(:success?).returns(true)
       VirtualBox::Command.vboxmanage("foo")
       VirtualBox::Command.vboxmanage = "VBoxManage"
     end
-    
+
     should "raise a CommandFailedException if it failed" do
-      VirtualBox::Command.expects(:execute).with("VBoxManage foo")
+      VirtualBox::Command.expects(:execute).with("VBoxManage -q foo")
       VirtualBox::Command.stubs(:success?).returns(false)
       assert_raises(VirtualBox::Exceptions::CommandFailedException) {
         VirtualBox::Command.vboxmanage("foo")
       }
     end
   end
-  
+
   context "testing command results" do
     setup do
       @command = "foo"
       VirtualBox::Command.stubs(:execute)
     end
-    
+
     should "return true if the exit code is 0" do
       system("echo 'hello' 1>/dev/null")
       assert_equal 0, $?.to_i
       assert VirtualBox::Command.test(@command)
     end
-    
+
     should "return false if the exit code is 1" do
       system("there_is_no_way_this_can_exist_1234567890")
       assert_not_equal 0, $?.to_i
-      assert !VirtualBox::Command.test(@command)      
+      assert !VirtualBox::Command.test(@command)
     end
   end
 end

data/test/virtualbox/dvd_test.rb

@@ -4,26 +4,26 @@ class DVDTest < Test::Unit::TestCase
   setup do
     VirtualBox::Command.stubs(:execute)
   end
-  
+
   context "destroying a dvd" do
     setup do
       @dvd = VirtualBox::DVD.new
     end
-    
+
     should "return false if attempting to destroy an empty drive" do
       assert !VirtualBox::DVD.empty_drive.destroy
     end
-    
+
     should "call vboxmanage to destroy it" do
       VirtualBox::Command.expects(:vboxmanage).with("closemedium dvd #{@dvd.uuid} --delete")
       assert @dvd.destroy
     end
-    
+
     should "return false if destroy failed" do
       VirtualBox::Command.stubs(:vboxmanage).raises(VirtualBox::Exceptions::CommandFailedException)
       assert !@dvd.destroy
     end
-    
+
     should "raise an exception if failed and flag is set" do
       VirtualBox::Command.stubs(:vboxmanage).raises(VirtualBox::Exceptions::CommandFailedException)
       assert_raises(VirtualBox::Exceptions::CommandFailedException) {
@@ -31,19 +31,19 @@ class DVDTest < Test::Unit::TestCase
       }
     end
   end
-  
+
   context "empty drive" do
     should "return an empty drive instance by calling new with :empty_drive" do
       dvd = VirtualBox::DVD.new(:empty_drive)
       assert dvd.empty_drive?
     end
-    
+
     should "call new with :empty_drive with empty_drive class method" do
       dvd = VirtualBox::DVD.empty_drive
       assert dvd.empty_drive?
     end
   end
-  
+
   context "retrieving all dvds" do
     setup do
       @expectations = {
@@ -51,18 +51,14 @@ class DVDTest < Test::Unit::TestCase
           :location   => "/Users/mitchellh/Downloads/jeos-8.04.3-jeos-i386.iso",
           :accessible => "yes"
         },
-        
+
         "4a08f52c-bca3-4908-8da4-4f48aaa4ebba" => {
           :location   => "/Applications/VirtualBox.app/Contents/MacOS/VBoxGuestAdditions.iso",
           :accessible => "yes"
         }
       }
-      
-      @valid = <<-valid
-VirtualBox Command Line Management Interface Version 3.1.2
-(C) 2005-2009 Sun Microsystems, Inc.
-All rights reserved.
 
+      @valid = <<-valid
 UUID:       d3252617-8176-4f8c-9d73-1c9c82b23960
 Path:       /Users/mitchellh/Downloads/jeos-8.04.3-jeos-i386.iso
 Accessible: yes
@@ -75,23 +71,23 @@ valid
 
       VirtualBox::Command.expects(:vboxmanage).with("list dvds").returns(@valid)
     end
-    
+
     should "return an array of DVD objects" do
       result = VirtualBox::DVD.all
       assert result.is_a?(Array)
-      
+
       result.each { |v| assert v.is_a?(VirtualBox::DVD) }
     end
-    
+
     should "return the proper results" do
       result = VirtualBox::DVD.all
       assert result.is_a?(Array)
       assert_equal @expectations.length, result.length
-      
+
       result.each do |image|
         expected_image = @expectations[image.uuid]
         assert expected_image
-        
+
         expected_image.each do |k,v|
           assert_equal v, image.read_attribute(k)
         end

data/test/virtualbox/ext/subclass_listing_test.rb

@@ -12,13 +12,13 @@ class SubclassListingTest < Test::Unit::TestCase
     include VirtualBox::SubclassListing
   end
   class F < E; end
-  
+
   should "list subclasses, including sub-subclasses, etc" do
     assert_equal [F], E.subclasses
     assert_equal [C], B.subclasses
     assert_equal [B, C, D], A.subclasses.sort_by { |c| c.name }
   end
-  
+
   should "list direct subclasses if flag is set" do
     assert_equal [B, D], A.subclasses(true).sort_by { |c| c.name }
   end

data/test/virtualbox/extra_data_test.rb

@@ -9,7 +9,7 @@ Key: GUI/LastWindowPostion, Value: 99,457,770,550
 Key: GUI/SUNOnlineData, Value: triesLeft=0
 Key: GUI/SuppressMessages, Value: ,confirmInputCapture,remindAboutAutoCapture,confirmRemoveMedium,remindAboutInaccessibleMedia,confirmGoingFullscreen,remindAboutMouseIntegrationOn
 Key: GUI/UpdateCheckCount, Value: 13
-Key: GUI/UpdateDate, Value: 1 d, 2010-01-29, stable 
+Key: GUI/UpdateDate, Value: 1 d, 2010-01-29, stable
 raw
 
     VirtualBox::Command.stubs(:execute)
@@ -18,115 +18,115 @@ raw
     @ed["foo"] = "bar"
     @ed.clear_dirty!
   end
-  
+
   context "attributes" do
     should "return parent name if its a VM object" do
       vm = mock("vm")
       vm.stubs(:is_a?).with(VirtualBox::VM).returns(true)
       vm.stubs(:name).returns("FOO")
-      
+
       @ed.parent = vm
       assert_equal "FOO", @ed.parent_name
     end
-    
+
     should "return default otherwise" do
       assert_equal "global", @ed.parent_name
     end
   end
-  
+
   context "relationships" do
     setup do
       @caller = mock("caller")
       @caller.stubs(:name).returns("foocaller")
-      
-      VirtualBox::Command.stubs(:vboxmanage).returns(@raw)      
+
+      VirtualBox::Command.stubs(:vboxmanage).returns(@raw)
     end
-    
+
     context "populating" do
       should "call VBoxManage for the caller" do
         VirtualBox::Command.expects(:vboxmanage).with("getextradata #{@caller.name} enumerate").returns(@raw)
         VirtualBox::ExtraData.populate_relationship(@caller, {})
       end
-      
+
       should "call pairs_to_objects with parent set to the caller" do
         VirtualBox::ExtraData.expects(:parse_kv_pairs).with(@raw, @caller).once
-        VirtualBox::ExtraData.populate_relationship(@caller, {})        
+        VirtualBox::ExtraData.populate_relationship(@caller, {})
       end
-      
+
       should "return an array of ExtraData objects" do
         result = VirtualBox::ExtraData.populate_relationship(@caller, {})
         assert result.is_a?(VirtualBox::ExtraData)
       end
     end
-    
+
     context "saving" do
       should "call save on the ExtraData object" do
         object = mock("object")
         object.expects(:save).once
-        
+
         VirtualBox::ExtraData.save_relationship(@caller, object)
       end
     end
   end
-  
+
   context "destroying (deleting)" do
     setup do
       @key = "foo"
     end
-    
+
     should "call the proper vbox command" do
       VirtualBox::Command.expects(:vboxmanage).with("setextradata global foo")
       assert @ed.delete(@key)
     end
-    
+
     should "remove the key from the hash" do
       assert @ed.has_key?(@key)
       assert @ed.delete(@key)
       assert !@ed.has_key?(@key)
     end
-    
+
     should "raise an exception if true sent to save and error occured" do
       VirtualBox::Command.stubs(:vboxmanage).raises(VirtualBox::Exceptions::CommandFailedException)
       assert_raises(VirtualBox::Exceptions::CommandFailedException) {
         @ed.delete(@key, true)
       }
     end
-    
+
     should "return false if the command failed" do
       VirtualBox::Command.stubs(:vboxmanage).raises(VirtualBox::Exceptions::CommandFailedException)
       assert !@ed.delete(@key)
     end
   end
-  
+
   context "saving" do
     setup do
       @ed["foo"] = "BAR"
       assert @ed.changed?
     end
-    
+
     should "do nothing if there are no changes" do
       @ed.clear_dirty!
       VirtualBox::Command.expects(:vboxmanage).never
       assert @ed.save
     end
-    
+
     should "call the proper vbox command" do
       VirtualBox::Command.expects(:vboxmanage).with("setextradata global foo BAR")
       assert @ed.save
     end
-    
+
     should "return false if the command failed" do
       VirtualBox::Command.stubs(:vboxmanage).raises(VirtualBox::Exceptions::CommandFailedException)
       assert !@ed.save
     end
-    
+
     should "raise an exception if true sent to save and error occured" do
       VirtualBox::Command.stubs(:vboxmanage).raises(VirtualBox::Exceptions::CommandFailedException)
       assert_raises(VirtualBox::Exceptions::CommandFailedException) {
         @ed.save(true)
       }
     end
-    
+
     should "clear dirty state" do
       @ed["value"] = "rawr"
       assert @ed.changed?
@@ -143,14 +143,14 @@ raw
     should "not be dirty initially" do
       assert !@ed.changed?
     end
-    
+
     should "be dirty when setting a value" do
       @ed["foo"] = "bar"
       assert @ed.changed?
       assert @ed.changes.has_key?("foo")
     end
   end
-  
+
   context "global extra data" do
     setup do
       get_seq = sequence("get_seq")
@@ -158,59 +158,59 @@ raw
       VirtualBox::ExtraData.expects(:parse_kv_pairs).returns(@ed).once.in_sequence(get_seq)
       @global = VirtualBox::ExtraData.global(true)
     end
-    
+
     should "call the command, parse it, then turn it into objects" do
       assert_equal "bar", @global["foo"]
     end
-    
+
     should "return the same object if it exists for global data, rather than recreating it" do
       VirtualBox::Command.expects(:vboxmanage).never
       assert_equal @global, VirtualBox::ExtraData.global
     end
-    
+
     should "return a new object if reload is true" do
       VirtualBox::Command.expects(:vboxmanage).once
       VirtualBox::ExtraData.expects(:parse_kv_pairs).returns(@ed.dup).once
       assert !@global.equal?(VirtualBox::ExtraData.global(true))
     end
   end
-  
+
   context "constructor" do
     should "set the parent with the given argument" do
       ed = VirtualBox::ExtraData.new("JOEY")
       assert_equal "JOEY", ed.parent
     end
-    
+
     should "be global by default" do
       ed = VirtualBox::ExtraData.new
       assert_equal "global", ed.parent
     end
   end
-  
+
   context "parsing KV pairs" do
     setup do
       @data = VirtualBox::ExtraData.parse_kv_pairs(@raw)
     end
-    
+
     should "return the proper number of items" do
       # Shows that it skips over non-matching lines as well
       assert_equal 6, @data.length
     end
-    
+
     should "return as an ExtraData Hash" do
       assert @data.is_a?(Hash)
       assert @data.is_a?(VirtualBox::ExtraData)
     end
-    
+
     should "return proper values, trimmed" do
       assert_equal "1 d, 2010-01-29, stable", @data["GUI/UpdateDate"]
     end
-    
+
     should  "send the 2nd param as the parent to the ED object" do
       @data = VirtualBox::ExtraData.parse_kv_pairs(@raw, "FOO")
       assert_equal "FOO", @data.parent
     end
-    
+
     should "return an unchanged ED object" do
       assert !@data.changed?
     end

data/test/virtualbox/forwarded_port_test.rb

@@ -4,7 +4,7 @@ class ForwardedPortTest < Test::Unit::TestCase
   setup do
     @caller = mock("caller")
   end
-  
+
   context "validations" do
     setup do
       @port = VirtualBox::ForwardedPort.new
@@ -13,16 +13,16 @@ class ForwardedPortTest < Test::Unit::TestCase
       @port.hostport = "2222"
       @port.added_to_relationship(@caller)
     end
-    
+
     should "be valid with all fields" do
       assert @port.valid?
     end
-    
+
     should "be invalid with no name" do
       @port.name = nil
       assert !@port.valid?
     end
-    
+
     should "be invalid with no guest port" do
       @port.guestport = nil
       assert !@port.valid?
@@ -32,13 +32,13 @@ class ForwardedPortTest < Test::Unit::TestCase
       @port.hostport = nil
       assert !@port.valid?
     end
-    
+
     should "be invalid if not in a relationship" do
       @port.write_attribute(:parent, nil)
       assert !@port.valid?
     end
   end
-  
+
   context "with an instance" do
     setup do
       @port = VirtualBox::ForwardedPort.new({
@@ -47,67 +47,67 @@ class ForwardedPortTest < Test::Unit::TestCase
         :guestport => "22",
         :hostport => "2222"
       })
-      
+
       @ed = mock("extradata")
       @ed.stubs(:[]=)
       @ed.stubs(:save)
       @ed.stubs(:delete)
       @caller.stubs(:extra_data).returns(@ed)
     end
-    
+
     context "saving" do
       context "an existing record" do
         setup do
           @port.existing_record!
         end
-        
+
         should "not do anything and return true if its unchanged" do
           @caller.expects(:extra_data).never
           assert @port.save
         end
-        
+
         should "clear the dirty state after saving" do
           @port.name = "diff"
           @port.save
           assert !@port.changed?
         end
-        
+
         should "call destroy if the name changed" do
           @port.name = "diff"
           @port.expects(:destroy).once
           @port.save
         end
-        
+
         should "not call destroy if the name didn't change" do
           assert !@port.name_changed?
           @port.expects(:destroy).never
           @port.save
         end
       end
-      
+
       context "a new record" do
         setup do
           assert @port.new_record!
         end
-        
+
         should "no longer be a new record after saving" do
           @port.save
           assert !@port.new_record?
         end
-        
+
         should "return false and do nothing if invalid" do
           @caller.expects(:extra_data).never
           @port.expects(:valid?).returns(false)
           assert !@port.save
         end
-        
+
         should "raise a ValidationFailedException if invalid and raise_errors is true" do
           @port.expects(:valid?).returns(false)
           assert_raises(VirtualBox::Exceptions::ValidationFailedException) {
             @port.save(true)
           }
         end
-        
+
         should "call save on the extra_data" do
           @ed = mock("ed")
           @ed.expects(:[]=).times(3)
@@ -117,49 +117,49 @@ class ForwardedPortTest < Test::Unit::TestCase
         end
       end
     end
-    
+
     context "key prefix" do
       should "return a proper key prefix constructed with the attributes" do
         assert_equal "VBoxInternal\/Devices\/#{@port.device}\/#{@port.instance}\/LUN#0\/Config\/#{@port.name}\/", @port.key_prefix
       end
-      
+
       should "return with previous name if parameter is true" do
         @port.name = "diff"
         assert @port.name_changed?
         assert_equal "VBoxInternal\/Devices\/#{@port.device}\/#{@port.instance}\/LUN#0\/Config\/#{@port.name_was}\/", @port.key_prefix(true)
       end
-      
+
       should "not use previous name if parameter is true and name didn't change" do
         assert !@port.name_changed?
         assert_equal "VBoxInternal\/Devices\/#{@port.device}\/#{@port.instance}\/LUN#0\/Config\/#{@port.name}\/", @port.key_prefix(true)
       end
     end
-    
+
     context "destroying" do
       setup do
         @port.existing_record!
       end
-      
+
       should "call delete on the extra data for each key" do
         @ed = mock("ed")
         @ed.expects(:delete).times(3)
         @caller.expects(:extra_data).times(3).returns(@ed)
         @port.destroy
       end
-      
+
       should "do nothing if the record is new" do
         @port.new_record!
         @caller.expects(:extra_data).never
         @port.destroy
       end
-      
+
       should "be a new record after destroying" do
         @port.destroy
         assert @port.new_record?
       end
     end
   end
-  
+
   context "relationships" do
     context "saving" do
       should "call #save on every object" do
@@ -169,11 +169,11 @@ class ForwardedPortTest < Test::Unit::TestCase
           object.expects(:save).once
           objects.push(object)
         end
-        
+
         VirtualBox::ForwardedPort.save_relationship(@caller, objects)
       end
     end
-    
+
     context "populating" do
       setup do
         @caller.stubs(:extra_data).returns({
@@ -182,22 +182,22 @@ class ForwardedPortTest < Test::Unit::TestCase
           "VBoxInternal/Devices/pcnet/0/LUN#0/Config/guestssh/HostPort" => "2222",
           "VBoxInternal/Devices/pcnet/0/LUN#0/Config/guestssh/Protocol" => "TCP"
         })
-        
+
         @objects = VirtualBox::ForwardedPort.populate_relationship(@caller, {})
       end
-      
+
       should "return an array of ForwardedPorts" do
         assert @objects.is_a?(VirtualBox::Proxies::Collection)
         assert @objects.all? { |o| o.is_a?(VirtualBox::ForwardedPort) }
       end
-      
+
       should "have the proper data" do
         object = @objects.first
         assert_equal "22", object.guestport
         assert_equal "2222", object.hostport
         assert_equal "TCP", object.protocol
       end
-      
+
       should "be existing records" do
         assert !@objects.first.new_record?
       end