Do not hardcode class name to the class body

You will get it wrong.

Author: isimluk

lib/openscap/ds/arf.rb

@@ -25,7 +25,7 @@ def initialize(param)
           @source = OpenSCAP::Source.new(param)
           @session = OpenSCAP.ds_rds_session_new_from_source @source.raw
         else
-          raise OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::DS:Arf with '#{param}'"
+          raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with '#{param}'"
         end
         OpenSCAP.raise! if @session.null?
       end

lib/openscap/source.rb

@@ -26,7 +26,7 @@ def initialize(param)
       when FFI::Pointer
         @raw = param
       else
-        raise OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::Source with '#{param}'"
+        raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with '#{param}'"
       end
       OpenSCAP.raise! if @raw.null?
     end

lib/openscap/xccdf/fix.rb

@@ -13,7 +13,7 @@ module OpenSCAP
   module Xccdf
     class Fix
       def initialize(raw)
-        raise OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::Xccdf::Reference with '#{raw}'" \
+        raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with '#{raw}'" \
           unless raw.is_a?(FFI::Pointer)
         @raw = raw
       end

lib/openscap/xccdf/item.rb

@@ -19,7 +19,7 @@ module OpenSCAP
   module Xccdf
     class Item
       def self.build(t)
-        raise OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::Xccdf::Item with #{t}" \
+        raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with #{t}" \
           unless t.is_a?(FFI::Pointer)
         # This is Abstract base class that enables you to build its child
         case OpenSCAP.xccdf_item_get_type t
@@ -28,13 +28,13 @@ def self.build(t)
         when :rule
           OpenSCAP::Xccdf::Rule.new t
         else
-          raise OpenSCAP::OpenSCAPError, "Unknown Xccdf::Item type: #{OpenSCAP.xccdf_item_get_type t}"
+          raise OpenSCAP::OpenSCAPError, "Unknown #{self.class.name} type: #{OpenSCAP.xccdf_item_get_type t}"
         end
       end
 
       def initialize(t)
         if self.class == OpenSCAP::Xccdf::Item
-          raise OpenSCAP::OpenSCAPError, 'Cannot initialize Xccdf::Item abstract base class.'
+          raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} abstract base class."
         end
         @raw = t
       end

lib/openscap/xccdf/profile.rb

@@ -21,7 +21,7 @@ def initialize(p)
         when FFI::Pointer
           @raw = p
         else
-          raise OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::Xccdf::Profile with #{p}"
+          raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with #{p}"
         end
       end
 

lib/openscap/xccdf/reference.rb

@@ -13,7 +13,7 @@ module OpenSCAP
   module Xccdf
     class Reference
       def initialize(raw)
-        raise OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::Xccdf::Reference with '#{raw}'" \
+        raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with '#{raw}'" \
           unless raw.is_a?(FFI::Pointer)
         @raw = raw
       end

lib/openscap/xccdf/ruleresult.rb

@@ -20,7 +20,7 @@ def initialize(t)
         when FFI::Pointer
           @rr = t
         else
-          raise OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::Xccdf::RuleResult with #{t}"
+          raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with #{t}"
         end
       end
 

lib/openscap/xccdf/tailoring.rb

@@ -22,7 +22,7 @@ def initialize(source, benchmark)
         when OpenSCAP::Source
           @raw = OpenSCAP.xccdf_tailoring_import_source source.raw, benchmark
         else
-          raise OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::Xccdf::Tailoring with '#{source}'"
+          raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with '#{source}'"
         end
         OpenSCAP.raise! if @raw.null?
       end

lib/openscap/xccdf/testresult.rb

@@ -29,7 +29,7 @@ def initialize(t)
           @raw = OpenSCAP.xccdf_result_import_source(t)
           OpenSCAP.raise! if @raw.null?
         else
-          raise OpenSCAP::OpenSCAPError, "Cannot initialize TestResult with #{t}"
+          raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} with #{t}"
         end
         init_ruleresults
       end

test/ds/arf_test.rb

@@ -24,7 +24,7 @@ def test_arf_new_nil
     rescue OpenSCAP::OpenSCAPError => e
       msg = e.to_s
     end
-    assert msg.start_with?("Cannot initialize OpenSCAP::DS:Arf with ''"), 'Message was: ' + msg
+    assert msg.start_with?("Cannot initialize OpenSCAP::DS::Arf with ''"), 'Message was: ' + msg
   end
 
   def test_arf_new_wrong_format