[spec] just some improved test coverage (DataDog#483)

* [tomcat][spec] adding simple jmx_url test coverage

* [tocat][spec] adding basic jmx_url test

* [reports][spec] cleaning up hostname_extract_regex testing

Author: truthbk

spec/classes/datadog_agent_integrations_tomcat_spec.rb

@@ -66,6 +66,19 @@
         it { should contain_file(conf_file).with_content(%r{trust_store_password: hunter2}) }
         it { should contain_file(conf_file).with_content(%r{tags:\s+foo: bar\s+baz: bat}) }
       end
+
+      context 'with jmx_url parameter set' do
+        let(:params) {{
+          hostname: 'tomcat1',
+          jmx_url: 'service:jmx:rmi:///jndi/rmi://tomcat.foo:9999/custompath',
+          username: 'userfoo',
+          password: 'passbar',
+        }}
+        it { should contain_file(conf_file).with_content(%r{host: tomcat1}) }
+        it { should contain_file(conf_file).with_content(%r{jmx_url: "service:jmx:rmi:///jndi/rmi://tomcat.foo:9999/custompath"}) }
+        it { should contain_file(conf_file).with_content(%r{user: userfoo}) }
+        it { should contain_file(conf_file).with_content(%r{password: passbar}) }
+      end
     end
   end
 end

spec/classes/datadog_agent_reports_spec.rb

@@ -5,11 +5,11 @@
     let(:params) do
       {
         api_key: 'notanapikey',
-        hostname_extraction_regex: nil,
         puppetmaster_user: 'puppet',
         dogapi_version: 'installed',
       }
     end
+    let(:conf_file) { '/etc/datadog-agent/datadog-reports.yaml' }
     ALL_OS.each do |operatingsystem|
       describe "datadog_agent class common actions on #{operatingsystem}" do
         let(:facts) do
@@ -46,23 +46,26 @@
         end
 
         it do
-          should contain_file('/etc/datadog-agent/datadog-reports.yaml')\
+          should contain_file(conf_file)\
             .with_owner('puppet')\
             .with_group('root')
         end
 
+        it { should contain_file(conf_file).without_content(/hostname_extraction_regex:/) }
+
       end
     end
   end
   context 'specific dogapi version' do
     let(:params) do
       {
         api_key: 'notanapikey',
-        hostname_extraction_regex: nil,
         puppetmaster_user: 'puppet',
         dogapi_version: '1.2.2'
       }
     end
+    let(:conf_file) { '/etc/datadog-agent/datadog-reports.yaml' }
+
     describe "datadog_agent class dogapi version override" do
       let(:facts) do
         {
@@ -89,7 +92,7 @@
       end
 
       it do
-        should contain_file('/etc/datadog-agent/datadog-reports.yaml')\
+        should contain_file(conf_file)\
           .with_owner('puppet')\
           .with_group('root')
       end
@@ -100,12 +103,13 @@
     let(:params) do
       {
         api_key: 'notanapikey',
-        hostname_extraction_regex: nil,
         puppetmaster_user: 'puppet',
         dogapi_version: 'installed',
         datadog_site: 'datadoghq.eu',
       }
     end
+    let(:conf_file) { '/etc/datadog-agent/datadog-reports.yaml' }
+
     describe "datadog_agent class dogapi version override" do
       let(:facts) do
         {
@@ -126,11 +130,12 @@
       end
 
       it do
-        should contain_file('/etc/datadog-agent/datadog-reports.yaml')\
+        should contain_file(conf_file)\
           .with_owner('puppet')\
           .with_group('root')\
           .with_content(/:api_url: api.datadoghq.eu/)
       end
+      it { should contain_file(conf_file).without_content(/hostname_extraction_regex:/)  }
     end
   end
 end