[Ovirt-devel] [PATCH server 2/8] test_helper and unit test updates for Rails 2.3.2

[Joey Boggs]

Jason Guiditta wrote:
> Rails 2.3.2 changes test_helper use ActiveSupport::TestCase
> rather than Test::Unit::TestCase, so unit test need to be
> updated accordingly as well.
>
> Signed-off-by: Jason Guiditta <jason.guiditta at gmail.com>
> ---
>  src/test/test_helper.rb                   |    2 +-
>  src/test/unit/active_record_env_test.rb   |    2 +-
>  src/test/unit/host_browser_awaken_test.rb |    2 +-
>  src/test/unit/host_test.rb                |    2 +-
>  src/test/unit/nic_test.rb                 |    2 +-
>  src/test/unit/permission_test.rb          |    2 +-
>  src/test/unit/pool_test.rb                |    2 +-
>  src/test/unit/quota_test.rb               |    2 +-
>  src/test/unit/storage_pool_test.rb        |    2 +-
>  src/test/unit/storage_volume_test.rb      |    2 +-
>  src/test/unit/task_test.rb                |    2 +-
>  11 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/src/test/test_helper.rb b/src/test/test_helper.rb
> index fc84648..009dfc8 100644
> --- a/src/test/test_helper.rb
> +++ b/src/test/test_helper.rb
> @@ -21,7 +21,7 @@ ENV["RAILS_ENV"] = "test"
>  require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
>  require 'test_help'
>  
> -class Test::Unit::TestCase
> +class ActiveSupport::TestCase
>    # Transactional fixtures accelerate your tests by wrapping each test method
>    # in a transaction that's rolled back on completion.  This ensures that the
>    # test database remains unchanged so your fixtures don't have to be reloaded
> diff --git a/src/test/unit/active_record_env_test.rb b/src/test/unit/active_record_env_test.rb
> index 26fa139..a9a9c5a 100644
> --- a/src/test/unit/active_record_env_test.rb
> +++ b/src/test/unit/active_record_env_test.rb
> @@ -20,7 +20,7 @@
>  require File.dirname(__FILE__) + '/../test_helper'
>  require File.dirname(__FILE__) + '/../../dutils/active_record_env'
>  
> -class ActiveRecordEnvTest < Test::Unit::TestCase
> +class ActiveRecordEnvTest < ActiveSupport::TestCase
>    fixtures :pools, :hosts, :vms, :boot_types,
>      :networks, :nics, :ip_addresses, :privileges, :roles, :permissions,
>      :quotas, :storage_pools, :storage_volumes, :tasks
> diff --git a/src/test/unit/host_browser_awaken_test.rb b/src/test/unit/host_browser_awaken_test.rb
> index d251e90..a7cf31c 100644
> --- a/src/test/unit/host_browser_awaken_test.rb
> +++ b/src/test/unit/host_browser_awaken_test.rb
> @@ -31,7 +31,7 @@ require 'host-browser'
>  # +HostBrowserAwakenTest+ ensures that the host-browser daemon works correctly
>  # during the identify phase of operation.
>  #
> -class HostBrowserAwakenTest < Test::Unit::TestCase
> +class HostBrowserAwakenTest < ActiveSupport::TestCase
>  
>    def setup
>      @session = flexmock('session')
> diff --git a/src/test/unit/host_test.rb b/src/test/unit/host_test.rb
> index 338fbaf..4d40990 100644
> --- a/src/test/unit/host_test.rb
> +++ b/src/test/unit/host_test.rb
> @@ -19,7 +19,7 @@
>  
>  require File.dirname(__FILE__) + '/../test_helper'
>  
> -class HostTest < Test::Unit::TestCase
> +class HostTest < ActiveSupport::TestCase
>    fixtures :hosts
>    fixtures :pools
>    fixtures :vms
> diff --git a/src/test/unit/nic_test.rb b/src/test/unit/nic_test.rb
> index 07f54c6..46fab10 100644
> --- a/src/test/unit/nic_test.rb
> +++ b/src/test/unit/nic_test.rb
> @@ -19,7 +19,7 @@
>  
>  require File.dirname(__FILE__) + '/../test_helper'
>  
> -class NicTest < Test::Unit::TestCase
> +class NicTest < ActiveSupport::TestCase
>    fixtures :ip_addresses
>    fixtures :nics
>    fixtures :hosts
> diff --git a/src/test/unit/permission_test.rb b/src/test/unit/permission_test.rb
> index 2ac78d5..344e615 100644
> --- a/src/test/unit/permission_test.rb
> +++ b/src/test/unit/permission_test.rb
> @@ -19,7 +19,7 @@
>  
>  require File.dirname(__FILE__) + '/../test_helper'
>  
> -class PermissionTest < Test::Unit::TestCase
> +class PermissionTest < ActiveSupport::TestCase
>    fixtures :privileges, :roles, :permissions
>    fixtures :pools
>  
> diff --git a/src/test/unit/pool_test.rb b/src/test/unit/pool_test.rb
> index c9a5554..bf9164d 100644
> --- a/src/test/unit/pool_test.rb
> +++ b/src/test/unit/pool_test.rb
> @@ -19,7 +19,7 @@
>  
>  require File.dirname(__FILE__) + '/../test_helper'
>  
> -class PoolTest < Test::Unit::TestCase
> +class PoolTest < ActiveSupport::TestCase
>    fixtures :pools
>  
>    def setup
> diff --git a/src/test/unit/quota_test.rb b/src/test/unit/quota_test.rb
> index 5903cc8..ec2f5cd 100644
> --- a/src/test/unit/quota_test.rb
> +++ b/src/test/unit/quota_test.rb
> @@ -19,7 +19,7 @@
>  
>  require File.dirname(__FILE__) + '/../test_helper'
>  
> -class QuotaTest < Test::Unit::TestCase
> +class QuotaTest < ActiveSupport::TestCase
>    fixtures :quotas
>    fixtures :pools
>  
> diff --git a/src/test/unit/storage_pool_test.rb b/src/test/unit/storage_pool_test.rb
> index 4e18a8c..bd969ad 100644
> --- a/src/test/unit/storage_pool_test.rb
> +++ b/src/test/unit/storage_pool_test.rb
> @@ -19,7 +19,7 @@
>  
>  require File.dirname(__FILE__) + '/../test_helper'
>  
> -class StoragePoolTest < Test::Unit::TestCase
> +class StoragePoolTest < ActiveSupport::TestCase
>    fixtures :storage_pools
>    fixtures :pools
>    fixtures :vms
> diff --git a/src/test/unit/storage_volume_test.rb b/src/test/unit/storage_volume_test.rb
> index f0e144e..4ec8760 100644
> --- a/src/test/unit/storage_volume_test.rb
> +++ b/src/test/unit/storage_volume_test.rb
> @@ -19,7 +19,7 @@
>  
>  require File.dirname(__FILE__) + '/../test_helper'
>  
> -class StorageVolumeTest < Test::Unit::TestCase
> +class StorageVolumeTest < ActiveSupport::TestCase
>    fixtures :storage_volumes
>    fixtures :storage_pools
>    fixtures :vms
> diff --git a/src/test/unit/task_test.rb b/src/test/unit/task_test.rb
> index 761e739..0f94052 100644
> --- a/src/test/unit/task_test.rb
> +++ b/src/test/unit/task_test.rb
> @@ -19,7 +19,7 @@
>  
>  require File.dirname(__FILE__) + '/../test_helper'
>  
> -class TaskTest < Test::Unit::TestCase
> +class TaskTest < ActiveSupport::TestCase
>    fixtures :pools, :hosts, :vms, :privileges, :roles, :permissions, :tasks
>  
>    def setup
>   
ack, passed no errors