From f9d03a10ac7b47afc7b8d632493ce0078bf98f28 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Wed, 16 Dec 2020 17:36:26 +0000
Subject: [PATCH] Apply remaining rubocop fixes

---
 .rubocop.yml                    |   6 ++
 .rubocop_todo.yml               |   0
 lib/facter/java_version.rb      |   2 +-
 spec/acceptance/install_spec.rb | 162 ++++++++++++++++----------------
 4 files changed, 89 insertions(+), 81 deletions(-)
 delete mode 100644 .rubocop_todo.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 33c33fa..07b68b8 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -89,6 +89,8 @@ Performance/CaseWhenSplat:
 Performance/Casecmp:
   Enabled: true
 Performance/CollectionLiteralInLoop:
+  Exclude:
+  - spec/**/*
   Enabled: true
 Performance/CompareWithBlock:
   Enabled: true
@@ -294,6 +296,8 @@ Metrics/AbcSize:
   Enabled: false
 Metrics/BlockLength:
   Enabled: false
+Metrics/BlockNesting:
+  Enabled: false
 Metrics/ClassLength:
   Enabled: false
 Metrics/CyclomaticComplexity:
@@ -308,6 +312,8 @@ Metrics/PerceivedComplexity:
   Enabled: false
 Migration/DepartmentName:
   Enabled: false
+Naming/AccessorMethodName:
+  Enabled: false
 Naming/BlockParameterName:
   Enabled: false
 Naming/HeredocDelimiterCase:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/facter/java_version.rb b/lib/facter/java_version.rb
index 07468da..1c427a8 100644
--- a/lib/facter/java_version.rb
+++ b/lib/facter/java_version.rb
@@ -37,7 +37,7 @@ Facter.add(:java_version) do
   confine operatingsystem: 'Darwin'
   has_weight 100
   setcode do
-    unless %r{Unable to find any JVMs matching version} =~ Facter::Util::Resolution.exec('/usr/libexec/java_home --failfast 2>&1')
+    unless Facter::Util::Resolution.exec('/usr/libexec/java_home --failfast 2>&1').include?('Unable to find any JVMs matching version')
       version = nil
       Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = Regexp.last_match(1) if %r{^.+ version \"(.+)\"} =~ line }
       version
diff --git a/spec/acceptance/install_spec.rb b/spec/acceptance/install_spec.rb
index e79b4ce..ddefb71 100644
--- a/spec/acceptance/install_spec.rb
+++ b/spec/acceptance/install_spec.rb
@@ -189,94 +189,96 @@ install_sap_jdk_jre = <<EOL
   }
 EOL
 
-context 'installing java jre', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
-  it 'installs jre' do
-    idempotent_apply(java_class_jre)
-  end
-end
-
-context 'installing java jdk', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
-  it 'installs jdk' do
-    idempotent_apply(java_class)
-  end
-end
-
-context 'with failure cases' do
-  it 'fails to install java with a blank version' do
-    apply_manifest(blank_version, expect_failures: true)
+describe 'installing' do
+  context 'installing java jre' do
+    it 'installs jre' do
+      idempotent_apply(java_class_jre)
+    end
   end
 
-  it 'fails to install java with an incorrect distribution' do
-    apply_manifest(incorrect_distro, expect_failures: true)
+  context 'installing java jdk' do
+    it 'installs jdk' do
+      idempotent_apply(java_class)
+    end
   end
 
-  it 'fails to install java with a blank distribution' do
-    apply_manifest(blank_distro, expect_failures: true)
+  context 'with failure cases' do
+    it 'fails to install java with a blank version' do
+      apply_manifest(blank_version, expect_failures: true)
+    end
+
+    it 'fails to install java with an incorrect distribution' do
+      apply_manifest(incorrect_distro, expect_failures: true)
+    end
+
+    it 'fails to install java with a blank distribution' do
+      apply_manifest(blank_distro, expect_failures: true)
+    end
+
+    it 'fails to install java with an incorrect package' do
+      apply_manifest(incorrect_package, expect_failures: true)
+    end
+
+    it 'fails on debian or RHEL when passed fake java_alternative and path' do
+      if os[:family] == 'sles'
+        apply_manifest(bogus_alternative, catch_failures: true)
+      else
+        apply_manifest(bogus_alternative, expect_failures: true)
+      end
+    end
   end
 
-  it 'fails to install java with an incorrect package' do
-    apply_manifest(incorrect_package, expect_failures: true)
+  context 'java::oracle', if: oracle_enabled, unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
+    let(:install_path) do
+      (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm'
+    end
+
+    let(:version_suffix) do
+      (os[:family] == 'redhat') ? '-amd64' : ''
+    end
+
+    it 'installs oracle jdk and jre' do
+      idempotent_apply(install_oracle_jdk_jre)
+      jdk_result = shell("test ! -e #{install_path}/jdk1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/jre/lib/security/local_policy.jar")
+      jre_result = shell("test ! -e #{install_path}/jre1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/lib/security/local_policy.jar")
+      expect(jdk_result.exit_code).to eq(0)
+      expect(jre_result.exit_code).to eq(0)
+    end
+
+    it 'installs oracle jdk with jce' do
+      idempotent_apply(install_oracle_jdk_jce)
+      result = shell("test -e #{install_path}/jdk1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/jre/lib/security/local_policy.jar")
+      expect(result.exit_code).to eq(0)
+    end
+
+    it 'installs oracle jre with jce' do
+      idempotent_apply(install_oracle_jre_jce)
+      result = shell("test -e #{install_path}/jre1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/lib/security/local_policy.jar")
+      expect(result.exit_code).to eq(0)
+    end
   end
 
-  it 'fails on debian or RHEL when passed fake java_alternative and path' do
-    if os[:family] == 'sles'
-      apply_manifest(bogus_alternative, catch_failures: true)
-    else
-      apply_manifest(bogus_alternative, expect_failures: true)
+  context 'java::adopt', if: adopt_enabled, unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
+    let(:install_path) do
+      (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm'
+    end
+
+    let(:version_suffix) do
+      (os[:family] == 'redhat') ? '-amd64' : ''
+    end
+
+    it 'installs adopt jdk and jre' do
+      idempotent_apply(install_adopt_jdk_jre)
+    end
+  end
+
+  context 'java::adopt', if: sap_enabled && ['Sles'].include?(os[:family]), unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
+    let(:install_path) do
+      (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm'
+    end
+
+    it 'installs adopt jdk and jre' do
+      idempotent_apply(install_sap_jdk_jre)
     end
   end
 end
-
-context 'java::oracle', if: oracle_enabled, unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
-  let(:install_path) do
-    (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm'
-  end
-
-  let(:version_suffix) do
-    (os[:family] == 'redhat') ? '-amd64' : ''
-  end
-
-  it 'installs oracle jdk and jre' do
-    idempotent_apply(install_oracle_jdk_jre)
-    jdk_result = shell("test ! -e #{install_path}/jdk1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/jre/lib/security/local_policy.jar")
-    jre_result = shell("test ! -e #{install_path}/jre1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/lib/security/local_policy.jar")
-    expect(jdk_result.exit_code).to eq(0)
-    expect(jre_result.exit_code).to eq(0)
-  end
-
-  it 'installs oracle jdk with jce' do
-    idempotent_apply(install_oracle_jdk_jce)
-    result = shell("test -e #{install_path}/jdk1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/jre/lib/security/local_policy.jar")
-    expect(result.exit_code).to eq(0)
-  end
-
-  it 'installs oracle jre with jce' do
-    idempotent_apply(install_oracle_jre_jce)
-    result = shell("test -e #{install_path}/jre1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/lib/security/local_policy.jar")
-    expect(result.exit_code).to eq(0)
-  end
-end
-
-context 'java::adopt', if: adopt_enabled, unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
-  let(:install_path) do
-    (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm'
-  end
-
-  let(:version_suffix) do
-    (os[:family] == 'redhat') ? '-amd64' : ''
-  end
-
-  it 'installs adopt jdk and jre' do
-    idempotent_apply(install_adopt_jdk_jre)
-  end
-end
-
-context 'java::adopt', if: sap_enabled && ['Sles'].include?(os[:family]), unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
-  let(:install_path) do
-    (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm'
-  end
-
-  it 'installs adopt jdk and jre' do
-    idempotent_apply(install_sap_jdk_jre)
-  end
-end