Added fallback logic for unrecognized idents. Added unit testing for …

…the new Ident constructor.

Signed-off-by: Jarod Neuner <[email protected]>

lib/happy_mapper_tools/benchmark.rb

@@ -67,11 +67,17 @@ class Ident
       content :ident, String
       def initialize(ident_str)
         @ident = ident_str
-	if ident_str =~ /^(CCI-[0-9]{6})$/
+        if ident_str =~ /^(CCI-[0-9]{6})$/
+          # Match CCI IDs; e.g. CCI-123456
           @system = 'http://cyber.mil/cci'
-	else
+        elsif ident_str =~ /^(S?V-[0-9]{5})$/
+          # Match SV- IDs; e.g. SV-12345
+          # Match V- IDs; e.g. V-12345
           @system = 'http://cyber.mil/legacy'
-	end
+        else
+          # for all other ident_str, use the old identifier
+          @system = 'https://public.cyber.mil/stigs/cci/'
+        end
       end
     end
 

test/unit/inspec_tools/happymapper_test.rb

@@ -0,0 +1,21 @@
+require 'minitest/spec'
+require 'minitest/autorun'
+
+describe "HappyMapperTools::Benchmark::Ident correctly determines the system for each identifier" do
+  # test values (tv); tv[0] == identifier, tv[1] == system
+  tvList = [
+    ['CCI-000213',  'http://cyber.mil/cci'],
+    ['V-72859',     'http://cyber.mil/legacy'],
+    ['SV-87511',    'http://cyber.mil/legacy'],
+    ['CCI-00213',   'https://public.cyber.mil/stigs/cci/'],
+    ['CCI-0000213',   'https://public.cyber.mil/stigs/cci/'],
+  ]
+
+  tvList.each do |tv|
+    it tv[0] do
+      # Ident.new automatically determines ident.system
+      ident = HappyMapperTools::Benchmark::Ident.new tv[0]
+      assert_equal(tv[1], ident.system)
+    end
+  end
+end