test_sid.rb in win32-security-0.2.0

- old
+ new

@@ -2,27 +2,27 @@
 # test_sid.rb
 #
 # Test suite for the Win32::Security::SID class. You should run these
 # tests via the 'rake test' task.
 ########################################################################
+require 'etc'
 require 'test-unit'
 require 'win32/security'
-require 'sys/admin'
 include Win32
 
 class TC_Win32_Security_Sid < Test::Unit::TestCase
   def self.startup
     @@host = Socket.gethostname
-    @@name = Sys::Admin.users[0].name
+    @@name = Etc.getlogin
   end
 
   def setup
     @sid = Security::SID.new(@@name)
   end
 
   test "version is set to expected value" do
-    assert_equal('0.1.4', Security::SID::VERSION)
+    assert_equal('0.2.0', Security::SID::VERSION)
   end
 
   test "sid method basic functionality" do
     assert_respond_to(@sid, :sid)
     assert_kind_of(String, @sid.sid)
@@ -57,14 +57,10 @@
   test "string_to_sid works as expected" do
     assert_respond_to(Security::SID, :string_to_sid)
     assert_kind_of(String, Security::SID.string_to_sid(@sid.to_s))
   end
 
-  test "string/sid roundtrip works as expected" do
-    assert_true(Security::SID.new(Security::SID.string_to_sid('S-1-5-18')).to_s == 'S-1-5-18')
-  end
-
   test "to_s works as expected" do
     assert_respond_to(@sid, :to_s)
     assert_kind_of(String, @sid.to_s)
     assert_true(@sid.to_s.include?('-'))
   end
@@ -99,11 +95,11 @@
     }
   end
 
   test "constructor defaults to current account" do
     assert_nothing_raised{ @sid = Security::SID.new }
-    assert_equal(Sys::Admin.get_login, @sid.account)
+    assert_equal(Etc.getlogin, @sid.account)
   end
 
   test "constructor accepts an account argument" do
     assert_nothing_raised{ Security::SID.new(@@name) }
   end
@@ -115,10 +111,10 @@
   test "constructor accepts a maximum of two arguments" do
     assert_raise(ArgumentError){ Security::SID.new(@@name, @@host, @@host) }
   end
 
   test "constructor raises an error if an invalid account is passed" do
-    assert_raise(Security::SID::Error){ Security::SID.new('bogus') }
+    assert_raise(SystemCallError){ Security::SID.new('bogus') }
   end
 
   test "well known sid constants are defined" do
     assert_equal('S-1-0', Security::SID::Null)
     assert_equal('S-1-0-0', Security::SID::Nobody)