openscap 0.4.7 → 0.4.8

data/test/ds/sds_test.rb

@@ -44,7 +44,7 @@ class TestSds < OpenSCAP::TestCase
     sds = new_sds
     benchmark_source = sds.select_checklist!
     benchmark = OpenSCAP::Xccdf::Benchmark.new benchmark_source
-    benchmark.profiles.keys.each do |id|
+    benchmark.profiles.each_key do |id|
       guide = sds.html_guide id
       assert !guide.nil?
       assert guide.include?(id)

data/test/xccdf/arf_test.rb

@@ -0,0 +1,53 @@
+#
+# Copyright (c) 2014--2016 Red Hat Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+
+require 'common/testcase'
+require 'openscap'
+require 'openscap/ds/sds'
+require 'openscap/source'
+require 'openscap/xccdf/benchmark'
+
+class TestArf < OpenSCAP::TestCase
+  def test_new_from_file
+    b = benchmark_from_arf_file
+    b.destroy
+  end
+
+  def test_idents
+    b = benchmark_from_arf_file
+    item = b.items['xccdf_com.redhat.rhsa_rule_oval-com.redhat.rhsa-def-20140675']
+    idents = item.idents
+    assert idents.size == 25
+  end
+
+  def test_ident_title_url
+    b = benchmark_from_arf_file
+    item = b.items['xccdf_com.redhat.rhsa_rule_oval-com.redhat.rhsa-def-20140678']
+    idents = item.idents
+    assert idents.size == 2
+    ident = idents[0]
+    expected_id = 'RHSA-2014-0678'
+    expected_system = 'https://rhn.redhat.com/errata'
+    assert_equal(expected_id, ident.id)
+    assert_equal(expected_system, ident.system)
+  end
+
+  private
+
+  def benchmark_from_arf_file
+    arf = OpenSCAP::DS::Arf.new('../data/arf.xml')
+    _test_results = arf.test_result
+    source_datastream = arf.report_request
+    bench_source = source_datastream.select_checklist!
+    benchmark = OpenSCAP::Xccdf::Benchmark.new(bench_source)
+    benchmark
+  end
+end

data/test/xccdf/testresult_test.rb

@@ -44,20 +44,20 @@ class TestTestResult < OpenSCAP::TestCase
     assert tr.rr.size == 28
     assert tr.rr.key?('xccdf_org.ssgproject.content_rule_disable_prelink')
     assert tr.rr.key?('xccdf_org.ssgproject.content_rule_no_direct_root_logins')
-    assert 'fail' == tr.rr['xccdf_org.ssgproject.content_rule_disable_prelink'].result
-    assert 'notchecked' == tr.rr['xccdf_org.ssgproject.content_rule_no_direct_root_logins'].result
+    assert tr.rr['xccdf_org.ssgproject.content_rule_disable_prelink'].result == 'fail'
+    assert tr.rr['xccdf_org.ssgproject.content_rule_no_direct_root_logins'].result == 'notchecked'
     tr.destroy
   end
 
   def test_override
     tr = new_tr
     rr = tr.rr['xccdf_org.ssgproject.content_rule_disable_prelink']
-    assert 'fail' == rr.result
+    assert rr.result == 'fail'
     rr.override!(:new_result => :pass,
                  :time => 'yesterday',
                  :authority => 'John Hacker',
                  :raw_text => 'We are testing prelink on this machine')
-    assert 'pass' == rr.result
+    assert rr.result == 'pass'
     tr.destroy
   end
 
@@ -75,12 +75,12 @@ class TestTestResult < OpenSCAP::TestCase
     assert_default_score tr.score!(benchmark), 34, 35
 
     rr = tr.rr['xccdf_org.ssgproject.content_rule_disable_prelink']
-    assert 'fail' == rr.result
+    assert rr.result == 'fail'
     rr.override!(:new_result => :pass,
                  :time => 'yesterday',
                  :authority => 'John Hacker',
                  :raw_text => 'We are testing prelink on this machine')
-    assert 'pass' == rr.result
+    assert rr.result == 'pass'
 
     assert_default_score tr.score, 34, 35
     assert_default_score tr.score!(benchmark), 47, 48

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openscap
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Simon Lukasik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -63,6 +63,7 @@ files:
 - lib/openscap/xccdf/benchmark.rb
 - lib/openscap/xccdf/fix.rb
 - lib/openscap/xccdf/group.rb
+- lib/openscap/xccdf/ident.rb
 - lib/openscap/xccdf/item.rb
 - lib/openscap/xccdf/policy.rb
 - lib/openscap/xccdf/policy_model.rb
@@ -75,6 +76,7 @@ files:
 - lib/openscap/xccdf/testresult.rb
 - lib/openscap/xccdf/value.rb
 - test/common/testcase.rb
+- test/data/arf.xml
 - test/data/invalid.xml
 - test/data/sds-complex.xml
 - test/data/tailoring.xml
@@ -86,6 +88,7 @@ files:
 - test/openscap_test.rb
 - test/source_test.rb
 - test/text_test.rb
+- test/xccdf/arf_test.rb
 - test/xccdf/benchmark_test.rb
 - test/xccdf/policy_test.rb
 - test/xccdf/profile_test.rb
@@ -113,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: A FFI wrapper around the OpenSCAP library