(MODULES-1570) Add java_major_version fact

Gives the major version of the Java release (ie. Java 1.7.0_71, major version is 7)

We also want to specifically return nil when java not present

spec/unit/facter/java_major_version_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+describe Facter::Util::Fact do
+  before {
+    Facter.clear
+  }
+
+  describe "java_major_version" do
+    context 'returns major version when java_version fact present' do
+      before :each do
+        Facter.fact(:java_version).stubs(:value).returns('1.7.0_71')
+      end
+      it do
+        Facter.fact(:java_major_version).value.should == "7"
+      end
+    end
+
+    context 'returns nil when java not present' do
+      before :each do
+        Facter.fact(:java_version).stubs(:value).returns(nil)
+      end
+      it do
+        Facter.fact(:java_major_version).value.should be_nil
+      end
+    end
+  end
+end

spec/unit/facter/java_patch_level_spec.rb

@@ -23,7 +23,7 @@ describe Facter::Util::Fact do
           Facter.fact(:java_version).stubs(:value).returns(nil)
         end
         it do
-          Facter.fact(:java_patch_level).value.should == "JAVA_NOT_INSTALLED"
+          Facter.fact(:java_patch_level).value.should be_nil
         end
       end
     end

spec/unit/facter/java_version_spec.rb

@@ -13,6 +13,7 @@ java version "1.7.0_71"
 Java(TM) SE Runtime Environment (build 1.7.0_71-b14)
 Java HotSpot(TM) 64-Bit Server VM (build 24.71-b01, mixed mode)
         EOS
+        Facter::Util::Resolution.expects(:which).with("java").returns(true)
         Facter::Util::Resolution.expects(:exec).with("java -version 2>&1").returns(java_version_output)
         Facter.fact(:java_version).value.should == "1.7.0_71"
       end
@@ -20,9 +21,8 @@ Java HotSpot(TM) 64-Bit Server VM (build 24.71-b01, mixed mode)
 
     context 'returns nil when java not present' do
       it do
-        java_version_output = "bash: java: command not found"
-        Facter::Util::Resolution.expects(:exec).with("java -version 2>&1").returns(java_version_output)
-        Facter.fact(:java_version).value.should be_nil
+        Facter::Util::Resolution.expects(:which).with("java").returns(false)
+        Facter.fact(:java_version).should be_nil
       end
     end
   end