newrelic_rpm 3.7.1.188 → 3.7.2.190.beta

data/test/new_relic/agent/pipe_service_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
 
-class PipeServiceTest < Test::Unit::TestCase
+class PipeServiceTest < MiniTest::Unit::TestCase
   def setup
     NewRelic::Agent::PipeChannelManager.listener.stop
     NewRelic::Agent::PipeChannelManager.register_report_channel(:pipe_service_test)
@@ -33,9 +33,7 @@ class PipeServiceTest < Test::Unit::TestCase
     ::NewRelic::Agent.logger.expects(:error) \
       .with(regexp_matches(/No communication channel to parent process/)).once
     service = NewRelic::Agent::PipeService.new(:non_existant)
-    assert_nothing_raised do
-      service.metric_data({})
-    end
+    service.metric_data({})
   end
 
   if NewRelic::LanguageSupport.can_fork? &&

data/test/new_relic/agent/request_sampler_test.rb

@@ -7,7 +7,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 require File.expand_path(File.join(File.dirname(__FILE__),'..','data_container_tests'))
 require 'new_relic/agent/request_sampler'
 
-class NewRelic::Agent::RequestSamplerTest < Test::Unit::TestCase
+class NewRelic::Agent::RequestSamplerTest < MiniTest::Unit::TestCase
 
   def setup
     freeze_time
@@ -38,12 +38,15 @@ class NewRelic::Agent::RequestSamplerTest < Test::Unit::TestCase
     end
   end
 
+  EVENT_DATA_INDEX = 0
+  CUSTOM_ATTRIBUTES_INDEX = 1
+
   def test_custom_parameters_in_event_are_normalized_to_string_keys
     with_sampler_config do
       generate_request('whatever', :custom_params => {:bing => 2, 1 => 3})
-      txn_event = @sampler.samples.first
-      assert_equal 2, txn_event['bing']
-      assert_equal 3, txn_event['1']
+      custom_attrs = single_sample[CUSTOM_ATTRIBUTES_INDEX]
+      assert_equal 2, custom_attrs['bing']
+      assert_equal 3, custom_attrs['1']
     end
   end
 
@@ -51,16 +54,16 @@ class NewRelic::Agent::RequestSamplerTest < Test::Unit::TestCase
   def test_includes_custom_parameters_in_event
     with_sampler_config do
       generate_request('whatever', :custom_params => {'bing' => 2})
-      txn_event = @sampler.samples.first
-      assert_equal 2, txn_event['bing']
+      custom_attrs = single_sample[CUSTOM_ATTRIBUTES_INDEX]
+      assert_equal 2, custom_attrs['bing']
     end
   end
 
   def test_doesnt_include_custom_parameters_in_event_when_configured_not_to
-    with_sampler_config('capture_attributes.transaction_events' => false) do
+    with_sampler_config('analytics_events.capture_attributes' => false) do
       generate_request('whatever', :custom_params => {'bing' => 2})
-      txn_event = @sampler.samples.first
-      assert_equal nil, txn_event['bing']
+      custom_attrs = single_sample[CUSTOM_ATTRIBUTES_INDEX]
+      assert_equal nil, custom_attrs['bing']
     end
   end
 
@@ -70,17 +73,22 @@ class NewRelic::Agent::RequestSamplerTest < Test::Unit::TestCase
         :overview_metrics => {'webDuration' => 0.01},
         :custom_params => {'type' => 'giraffe', 'duration' => 'hippo', 'webDuration' => 'zebra'}
       )
-      txn_event = @sampler.samples.first
+      txn_event = single_sample[EVENT_DATA_INDEX]
       assert_equal 'Transaction', txn_event['type']
       assert_equal 0.1, txn_event['duration']
       assert_equal 0.01, txn_event['webDuration']
+
+      custom_attrs = single_sample[CUSTOM_ATTRIBUTES_INDEX]
+      assert_equal 'giraffe', custom_attrs['type']
+      assert_equal 'hippo', custom_attrs['duration']
+      assert_equal 'zebra', custom_attrs['webDuration']
     end
   end
 
   def test_samples_on_transaction_finished_event_includes_overview_metrics
     with_sampler_config do
       generate_request('name', :overview_metrics => {:foo => :bar})
-      assert_equal :bar, @sampler.samples.first[:foo]
+      assert_equal :bar, single_sample[EVENT_DATA_INDEX][:foo]
     end
   end
 
@@ -186,11 +194,7 @@ class NewRelic::Agent::RequestSamplerTest < Test::Unit::TestCase
   end
 
   def with_sampler_config(options = {})
-    defaults =
-    {
-      :'analytics_events.max_samples_stored' => 100
-    }
-
+    defaults = { :'analytics_events.max_samples_stored' => 100 }
     defaults.merge!(options)
     with_config(defaults) do
       @event_listener.notify( :finished_configuring )
@@ -198,9 +202,9 @@ class NewRelic::Agent::RequestSamplerTest < Test::Unit::TestCase
     end
   end
 
-  def assert_is_valid_transaction_sample( sample )
-    assert_kind_of Hash, sample
-    assert_equal 'Transaction', sample['type']
+  def single_sample
+    assert_equal 1, @sampler.samples.size
+    @sampler.samples.first
   end
 
 end

data/test/new_relic/agent/rpm_agent_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class NewRelic::Agent::RpmAgentTest < Test::Unit::TestCase
+class NewRelic::Agent::RpmAgentTest < MiniTest::Unit::TestCase
   def setup
     NewRelic::Agent.manual_start
     @agent = NewRelic::Agent.instance
@@ -17,13 +17,13 @@ class NewRelic::Agent::RpmAgentTest < Test::Unit::TestCase
 
   def test_agent_setup
     assert(NewRelic::Agent.instance.class == NewRelic::Agent::Agent)
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       NewRelic::Control.instance.init_plugin(:agent_enabled => false)
     end
   end
 
   def test_public_apis
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       NewRelic::Agent.set_sql_obfuscator(:unknown) { |sql| puts sql }
     end
 

data/test/new_relic/agent/rules_engine_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 
-class RulesEngineTest < Test::Unit::TestCase
+class RulesEngineTest < MiniTest::Unit::TestCase
   def setup
     @engine = NewRelic::Agent::RulesEngine.new
   end

data/test/new_relic/agent/sampled_buffer_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 
-class NewRelic::Agent::SampledBufferTest < Test::Unit::TestCase
+class NewRelic::Agent::SampledBufferTest < MiniTest::Unit::TestCase
   def test_should_keep_all_samples_up_to_capacity
     buffer = NewRelic::Agent::SampledBuffer.new(100)
     all = []

data/test/new_relic/agent/sampler_collection_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 
-class SamplerCollectionTest < Test::Unit::TestCase
+class SamplerCollectionTest < MiniTest::Unit::TestCase
 
   class DummySampler
     attr_reader :id
@@ -45,7 +45,7 @@ class SamplerCollectionTest < Test::Unit::TestCase
 
   def test_add_sampler_swallows_exceptions_during_sampler_creation
     DummySampler.stubs(:new).raises(StandardError)
-    assert_nothing_raised { @collection.add_sampler(DummySampler) }
+    @collection.add_sampler(DummySampler)
     assert_equal(0, @collection.to_a.size)
   end
 
@@ -61,7 +61,7 @@ class SamplerCollectionTest < Test::Unit::TestCase
     @collection.add_sampler(DummySampler2)
     good_sampler, bad_sampler = @collection.to_a
     bad_sampler.stubs(:poll).raises('boo')
-    assert_nothing_raised { @collection.poll_samplers }
+    @collection.poll_samplers
     assert_equal(1, @collection.to_a.size)
     assert_equal([good_sampler], @collection.to_a)
   end

data/test/new_relic/agent/sampler_test.rb

@@ -3,7 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
-class NewRelic::Agent::SamplerTest < Test::Unit::TestCase
+class NewRelic::Agent::SamplerTest < MiniTest::Unit::TestCase
   require 'new_relic/agent/sampler'
 
   def test_inherited_should_append_subclasses_to_sampler_classes

data/test/new_relic/agent/shim_agent_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 module NewRelic
   module Agent
-    class ShimAgentTest < Test::Unit::TestCase
+    class ShimAgentTest < MiniTest::Unit::TestCase
 
       def setup
         super

data/test/new_relic/agent/sql_sampler_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require File.expand_path(File.join(File.dirname(__FILE__),'..','data_container_tests'))
 
-class NewRelic::Agent::SqlSamplerTest < Test::Unit::TestCase
+class NewRelic::Agent::SqlSamplerTest < MiniTest::Unit::TestCase
   def setup
     agent = NewRelic::Agent.instance
     stats_engine = NewRelic::Agent::StatsEngine.new
@@ -36,7 +36,7 @@ class NewRelic::Agent::SqlSamplerTest < Test::Unit::TestCase
   def test_notice_first_scope_push
     assert_nil @sampler.transaction_data
     @sampler.notice_first_scope_push nil
-    assert_not_nil @sampler.transaction_data
+    refute_nil @sampler.transaction_data
     @sampler.notice_scope_empty('txn')
     assert_nil @sampler.transaction_data
   end
@@ -52,7 +52,7 @@ class NewRelic::Agent::SqlSamplerTest < Test::Unit::TestCase
     @sampler.notice_sql "select * from test2", "Database/test2/select", nil, 1.3
     # this sql will not be captured
     @sampler.notice_sql "select * from test", "Database/test/select", nil, 0
-    assert_not_nil @sampler.transaction_data
+    refute_nil @sampler.transaction_data
     assert_equal 2, @sampler.transaction_data.sql_data.size
   end
 
@@ -235,9 +235,7 @@ class NewRelic::Agent::SqlSamplerTest < Test::Unit::TestCase
       @sampler.harvest_slow_sql(data)
       sql_traces = @sampler.harvest!
 
-      assert_nothing_raised do
-        Marshal.dump(sql_traces)
-      end
+      Marshal.dump(sql_traces)
     end
   end
 

data/test/new_relic/agent/stats_engine/gc_profiler_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 
-class NewRelic::Agent::StatsEngine::GCProfilerTest < Test::Unit::TestCase
+class NewRelic::Agent::StatsEngine::GCProfilerTest < MiniTest::Unit::TestCase
   def test_init_profiler_for_rails_bench
     return unless defined?(::GC) && ::GC.respond_to?(:collections)
 

data/test/new_relic/agent/stats_engine/metric_stats_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 
-class NewRelic::Agent::MetricStatsTest < Test::Unit::TestCase
+class NewRelic::Agent::MetricStatsTest < MiniTest::Unit::TestCase
   def setup
     NewRelic::Agent.manual_start
     @engine = NewRelic::Agent.instance.stats_engine
@@ -23,12 +23,12 @@ class NewRelic::Agent::MetricStatsTest < Test::Unit::TestCase
     s2 = @engine.get_stats "a"
     s3 = @engine.get_stats "b"
 
-    assert_not_nil s1
-    assert_not_nil s2
-    assert_not_nil s3
+    refute_nil s1
+    refute_nil s2
+    refute_nil s3
 
     assert s1 == s2
-    assert_not_same(s1, s3)
+    refute_same(s1, s3)
   end
 
   def test_harvest

data/test/new_relic/agent/stats_engine/samplers_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', '..','..','test_helper'))
 require 'new_relic/agent/samplers/cpu_sampler'
 
-class NewRelic::Agent::StatsEngine::SamplersTest < Test::Unit::TestCase
+class NewRelic::Agent::StatsEngine::SamplersTest < MiniTest::Unit::TestCase
 
   class OurSamplers
     include NewRelic::Agent::StatsEngine::Samplers
@@ -85,7 +85,7 @@ class NewRelic::Agent::StatsEngine::SamplersTest < Test::Unit::TestCase
   def test_memory__windows
     return if defined? JRuby
     NewRelic::Agent::Samplers::MemorySampler.any_instance.stubs(:platform).returns 'win32'
-    assert_raise NewRelic::Agent::Sampler::Unsupported do
+    assert_raises NewRelic::Agent::Sampler::Unsupported do
       NewRelic::Agent::Samplers::MemorySampler.new
     end
   end

data/test/new_relic/agent/stats_engine_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..', 'test_helper'))
 require File.expand_path(File.join(File.dirname(__FILE__),'..','data_container_tests'))
 
-class NewRelic::Agent::StatsEngineTest < Test::Unit::TestCase
+class NewRelic::Agent::StatsEngineTest < MiniTest::Unit::TestCase
   def setup
     NewRelic::Agent.manual_start
     @engine = NewRelic::Agent::StatsEngine.new
@@ -69,8 +69,8 @@ class NewRelic::Agent::StatsEngineTest < Test::Unit::TestCase
 
     disney = @engine.lookup_stats("disney")
 
-    assert_not_same orlando_disney, anaheim_disney
-    assert_not_equal orlando_disney, anaheim_disney
+    refute_same orlando_disney, anaheim_disney
+    refute_equal orlando_disney, anaheim_disney
     assert_equal 1, orlando_disney.call_count
     assert_equal 1, anaheim_disney.call_count
     assert_equal 2, disney.call_count

data/test/new_relic/agent/stats_hash_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..', '..','test_helper'))
 
-class NewRelic::Agent::StatsHashTest < Test::Unit::TestCase
+class NewRelic::Agent::StatsHashTest < MiniTest::Unit::TestCase
   def setup
     @hash = NewRelic::Agent::StatsHash.new
     NewRelic::Agent.instance.error_collector.errors.clear
@@ -141,7 +141,7 @@ class NewRelic::Agent::StatsHashTest < Test::Unit::TestCase
 
     @hash.record(DEFAULT_SPEC, 1)
 
-    assert_has_error NewRelic::Agent::StatsHash::CorruptedDefaultProcError
+    assert_has_error NewRelic::Agent::StatsHash::StatsHashLookupError
   end
 
   # We can only fix up the default proc on Rubies that let us set it

data/test/new_relic/agent/stats_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..', '..', 'test_helper'))
 
-class NewRelic::Agent::StatsTest < Test::Unit::TestCase
+class NewRelic::Agent::StatsTest < MiniTest::Unit::TestCase
   def mock_plusequals(first, second, method, first_value, second_value)
     first.expects(method).returns(first_value)
     second.expects(method).returns(second_value)

data/test/new_relic/agent/threading/agent_thread_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_h
 require 'new_relic/agent/threading/agent_thread'
 
 module NewRelic::Agent::Threading
-  class AgentThreadTest < Test::Unit::TestCase
+  class AgentThreadTest < MiniTest::Unit::TestCase
 
     def test_sets_label
       t = AgentThread.new("labelled") {}
@@ -92,9 +92,7 @@ module NewRelic::Agent::Threading
     def test_scrub_backtrace_handles_errors_during_backtrace
       dummy_thread = stub
       dummy_thread.stubs(:backtrace).raises(StandardError.new('nah'))
-      assert_nothing_raised do
-        AgentThread.scrub_backtrace(dummy_thread, true)
-      end
+      AgentThread.scrub_backtrace(dummy_thread, true)
     end
 
     def test_scrub_backtrace_handles_nil_backtrace

data/test/new_relic/agent/threading/backtrace_node_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_h
 require 'new_relic/agent/threading/backtrace_node'
 
 module NewRelic::Agent::Threading
-  class BacktraceNodeTest < Test::Unit::TestCase
+  class BacktraceNodeTest < MiniTest::Unit::TestCase
     SINGLE_LINE = "irb.rb:69:in `catch'"
 
     def setup

data/test/new_relic/agent/threading/backtrace_service_test.rb

@@ -10,7 +10,7 @@ require 'new_relic/agent/threading/threaded_test_case'
 if NewRelic::Agent::Threading::BacktraceService.is_supported?
 
   module NewRelic::Agent::Threading
-    class BacktraceServiceTest < Test::Unit::TestCase
+    class BacktraceServiceTest < MiniTest::Unit::TestCase
       include ThreadedTestCase
 
       def setup
@@ -87,7 +87,7 @@ if NewRelic::Agent::Threading::BacktraceService.is_supported?
 
         assert(profile1)
         assert(profile2)
-        assert_not_same(profile1, profile2)
+        refute_same(profile1, profile2)
       end
 
       def test_harvest_passes_on_original_args_to_new_thread_profiles
@@ -461,7 +461,7 @@ if NewRelic::Agent::Threading::BacktraceService.is_supported?
       end
 
       def assert_has_default_period
-        assert_equal 0.1, @service.worker_loop.period
+        assert_in_delta(0.1, @service.worker_loop.period, 0.001)
       end
 
       def fake_last_poll_took(last_poll_length)
@@ -504,7 +504,7 @@ if NewRelic::Agent::Threading::BacktraceService.is_supported?
 
     # These tests do not use ThreadedTestCase as FakeThread is synchronous and
     # prevents the detection of concurrency issues.
-    class BacktraceServiceConcurrencyTest < Test::Unit::TestCase
+    class BacktraceServiceConcurrencyTest < MiniTest::Unit::TestCase
       def setup
         NewRelic::Agent.instance.stats_engine.clear_stats
         @service = BacktraceService.new
@@ -535,7 +535,7 @@ if NewRelic::Agent::Threading::BacktraceService.is_supported?
   end
 else
   module NewRelic::Agent::Threading
-    class BacktraceServiceUnsupportedTest < Test::Unit::TestCase
+    class BacktraceServiceUnsupportedTest < MiniTest::Unit::TestCase
       def test_is_not_supported?
         assert_false BacktraceService.is_supported?
       end

data/test/new_relic/agent/threading/thread_profile_test.rb

@@ -11,7 +11,7 @@ require 'new_relic/agent/threading/threaded_test_case'
 if NewRelic::Agent::Threading::BacktraceService.is_supported?
 
   module NewRelic::Agent::Threading
-    class ThreadProfileTest < Test::Unit::TestCase
+    class ThreadProfileTest < MiniTest::Unit::TestCase
       include ThreadedTestCase
 
       def setup

data/test/new_relic/agent/transaction/developer_mode_sample_buffer_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 
 class NewRelic::Agent::Transaction
-  class DeveloperModeSampleBufferTest < Test::Unit::TestCase
+  class DeveloperModeSampleBufferTest < MiniTest::Unit::TestCase
     def setup
       @buffer = DeveloperModeSampleBuffer.new
     end