From d4373e1eab376a9abdbe01ddeb2a8f98744c8574 Mon Sep 17 00:00:00 2001 From: 0x1eef <0x1eef@protonmail.com> Date: Sun, 13 Oct 2024 02:05:01 -0300 Subject: [PATCH] Add shortcut for BSD::Control.feature --- test/superuser/disable_feature_test.rb | 16 +++++++++------- test/superuser/enable_feature_test.rb | 16 +++++++++------- test/superuser/feature_status_test.rb | 19 +++++++++++-------- test/superuser/sysdef_feature_test.rb | 22 +++++++++++----------- test/unprivileged/disable_feature_test.rb | 10 +++++++--- test/unprivileged/enable_feature_test.rb | 10 +++++++--- test/unprivileged/feature_test.rb | 13 ++++++++----- test/unprivileged/sysdef_feature_test.rb | 10 +++++++--- 8 files changed, 69 insertions(+), 47 deletions(-) diff --git a/test/superuser/disable_feature_test.rb b/test/superuser/disable_feature_test.rb index 3af4f84..80e25b3 100644 --- a/test/superuser/disable_feature_test.rb +++ b/test/superuser/disable_feature_test.rb @@ -4,17 +4,19 @@ require_relative "../setup" module BSD::Control class DisableFeatureTest < BSD::Control::Test def test_disable_pageexec - assert_equal true, - BSD::Control.feature(:pageexec).disable!(file) - assert_equal :disabled, - BSD::Control.feature(:pageexec).status(file) + assert_equal true, feature(:pageexec).disable!(file) + assert_equal :disabled, feature(:pageexec).status(file) end def test_disable_pageexec_nonexistent_file rm(file) - assert_raises(Errno::ENOENT) do - BSD::Control.feature(:pageexec).disable!(file) - end + assert_raises(Errno::ENOENT) { feature(:pageexec).disable!(file) } + end + + private + + def feature(name) + BSD::Control.feature(name) end end end diff --git a/test/superuser/enable_feature_test.rb b/test/superuser/enable_feature_test.rb index 9c9762a..a68e1a6 100644 --- a/test/superuser/enable_feature_test.rb +++ b/test/superuser/enable_feature_test.rb @@ -4,21 +4,23 @@ require_relative "../setup" module BSD::Control class EnableFeatureTest < BSD::Control::Test def test_enable_pageexec - assert_equal true, - BSD::Control.feature(:pageexec).enable!(file) + assert_equal true, feature(:pageexec).enable!(file) end def test_enable_pageexec_mode_zero chmod(0, file) - assert_equal true, - BSD::Control.feature(:pageexec).enable!(file) + assert_equal true, feature(:pageexec).enable!(file) end def test_enable_pageexec_nonexistent_file rm(file) - assert_raises(Errno::ENOENT) do - BSD::Control.feature(:pageexec).enable!(file) - end + assert_raises(Errno::ENOENT) { feature(:pageexec).enable!(file) } + end + + private + + def feature(name) + BSD::Control.feature(name) end end end diff --git a/test/superuser/feature_status_test.rb b/test/superuser/feature_status_test.rb index 89ae73c..e4ba9ea 100644 --- a/test/superuser/feature_status_test.rb +++ b/test/superuser/feature_status_test.rb @@ -4,20 +4,23 @@ require_relative "../setup" module BSD::Control class FeatureStatusTest < BSD::Control::Test def test_pageexec_sysdef_status - assert_equal :sysdef, - BSD::Control.feature(:pageexec).status(file) + assert_equal :sysdef, feature(:pageexec).status(file) end def test_pageexec_enabled_status - BSD::Control.feature(:pageexec).enable!(file) - assert_equal :enabled, - BSD::Control.feature(:pageexec).status(file) + feature(:pageexec).enable!(file) + assert_equal :enabled, feature(:pageexec).status(file) end def test_pageexec_disabled_status - BSD::Control.feature(:pageexec).disable!(file) - assert_equal :disabled, - BSD::Control.feature(:pageexec).status(file) + feature(:pageexec).disable!(file) + assert_equal :disabled, feature(:pageexec).status(file) + end + + private + + def feature(name) + BSD::Control.feature(name) end end end diff --git a/test/superuser/sysdef_feature_test.rb b/test/superuser/sysdef_feature_test.rb index ddad3f7..35c32c3 100644 --- a/test/superuser/sysdef_feature_test.rb +++ b/test/superuser/sysdef_feature_test.rb @@ -4,21 +4,21 @@ require_relative "../setup" module BSD::Control class SysDefFeatureTest < BSD::Control::Test def test_sysdef_pageexec - assert_equal true, - BSD::Control.feature(:pageexec).enable!(file) - assert_equal :enabled, - BSD::Control.feature(:pageexec).status(file) - assert_equal true, - BSD::Control.feature(:pageexec).sysdef!(file) - assert_equal :sysdef, - BSD::Control.feature(:pageexec).status(file) + assert_equal true, feature(:pageexec).enable!(file) + assert_equal :enabled, feature(:pageexec).status(file) + assert_equal true, feature(:pageexec).sysdef!(file) + assert_equal :sysdef, feature(:pageexec).status(file) end def test_enable_pageexec_nonexistent_file rm(file) - assert_raises(Errno::ENOENT) do - BSD::Control.feature(:pageexec).sysdef!(file) - end + assert_raises(Errno::ENOENT) { feature(:pageexec).sysdef!(file) } + end + + private + + def feature(name) + BSD::Control.feature(name) end end end diff --git a/test/unprivileged/disable_feature_test.rb b/test/unprivileged/disable_feature_test.rb index 1757f9b..b171d93 100644 --- a/test/unprivileged/disable_feature_test.rb +++ b/test/unprivileged/disable_feature_test.rb @@ -5,9 +5,13 @@ module BSD::Control class DisableFeatureTest < BSD::Control::Test def test_disable_pageexec_nonexistent_file rm(file) - assert_raises(Errno::ENOENT) do - BSD::Control.feature(:pageexec).disable!(file) - end + assert_raises(Errno::ENOENT) { feature(:pageexec).disable!(file) } + end + + private + + def feature(name) + BSD::Control.feature(name) end end end diff --git a/test/unprivileged/enable_feature_test.rb b/test/unprivileged/enable_feature_test.rb index 9182e26..a5c2f9e 100644 --- a/test/unprivileged/enable_feature_test.rb +++ b/test/unprivileged/enable_feature_test.rb @@ -4,9 +4,13 @@ require_relative "../setup" module BSD::Control class EnableFeatureTest < BSD::Control::Test def test_enable_feature_insufficient_permissions - assert_raises(Errno::EPERM) do - BSD::Control.feature(:pageexec).enable!(file) - end + assert_raises(Errno::EPERM) { feature(:pageexec).enable!(file) } + end + + private + + def feature(name) + BSD::Control.feature(name) end end end diff --git a/test/unprivileged/feature_test.rb b/test/unprivileged/feature_test.rb index 1d68c1e..e3d105a 100644 --- a/test/unprivileged/feature_test.rb +++ b/test/unprivileged/feature_test.rb @@ -4,14 +4,17 @@ require_relative "../setup" module BSD::Control class FeatureTest < BSD::Control::Test def test_pageexec_feature - assert_instance_of BSD::Control::Feature, - BSD::Control.feature(:pageexec) + assert_instance_of BSD::Control::Feature, feature(:pageexec) end def test_nonexistent_feature - assert_raises(BSD::Control::Error) do - BSD::Control.feature(:non_existent_feature) - end + assert_raises(BSD::Control::Error) { feature(:non_existent_feature) } + end + + private + + def feature(name) + BSD::Control.feature(name) end end end diff --git a/test/unprivileged/sysdef_feature_test.rb b/test/unprivileged/sysdef_feature_test.rb index 78234a3..bb22e6d 100644 --- a/test/unprivileged/sysdef_feature_test.rb +++ b/test/unprivileged/sysdef_feature_test.rb @@ -4,9 +4,13 @@ require_relative "../setup" module BSD::Control class SysDefTest < BSD::Control::Test def test_sysdef!_insufficient_permissions - assert_raises(Errno::EPERM) do - BSD::Control.feature(:pageexec).sysdef!(file) - end + assert_raises(Errno::EPERM) { feature(:pageexec).sysdef!(file) } + end + + private + + def feature(name) + BSD::Control.feature(name) end end end