newrelic_rpm 3.7.1.188 → 3.7.2.190.beta

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

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

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

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper'))
 require 'new_relic/agent/transaction/pop'
-class NewRelic::Agent::Transaction::PopTest < Test::Unit::TestCase
+class NewRelic::Agent::Transaction::PopTest < MiniTest::Unit::TestCase
   include NewRelic::Agent::Transaction::Pop
 
   attr_reader :agent

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

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

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

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 
 class NewRelic::Agent::Transaction
-  class XraySampleBufferTest < Test::Unit::TestCase
+  class XraySampleBufferTest < MiniTest::Unit::TestCase
 
     XRAY_SESSION_ID = 123
     MATCHING_TRANSACTION = "Matching/transaction/name"

data/test/new_relic/agent/transaction_interrobang_test.rb

@@ -2,11 +2,10 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-require 'test/unit'
-require 'newrelic_rpm'
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 require 'new_relic/agent/instrumentation/controller_instrumentation'
 
-class TransactionInterrobangTest < Test::Unit::TestCase
+class TransactionInterrobangTest < MiniTest::Unit::TestCase
   include NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
   def interrogate?

data/test/new_relic/agent/transaction_sample_builder_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 
-class NewRelic::Agent::TransationSampleBuilderTest < Test::Unit::TestCase
+class NewRelic::Agent::TransationSampleBuilderTest < MiniTest::Unit::TestCase
 
   def setup
     freeze_time
@@ -211,10 +211,8 @@ class NewRelic::Agent::TransationSampleBuilderTest < Test::Unit::TestCase
       6.times { |i| build_segment "s#{i}" }
       # now we should have a placeholder segment
       build_segment "this-should-be-truncated" do
-        assert_nothing_raised do
-          @builder.current_segment['eggs'] = 'ham'
-          @builder.current_segment.params.merge!('foo' => 'bar')
-        end
+        @builder.current_segment['eggs'] = 'ham'
+        @builder.current_segment.params.merge!('foo' => 'bar')
       end
     end
   end
@@ -235,21 +233,25 @@ class NewRelic::Agent::TransationSampleBuilderTest < Test::Unit::TestCase
   end
 
   def test_has_correct_transaction_trace_threshold_when_default
-    NewRelic::Agent::TransactionState.get.transaction = stub()
-    NewRelic::Agent::TransactionState.get.transaction.stubs(:apdex_t).returns(1.5)
-    assert_equal 6.0, @builder.transaction_trace_threshold
+    in_transaction do
+      with_config(:apdex_t => 1.5) do
+        assert_equal 6.0, @builder.transaction_trace_threshold
+      end
 
-    NewRelic::Agent::TransactionState.get.transaction.stubs(:apdex_t).returns(2.0)
-    assert_equal 8.0, @builder.transaction_trace_threshold
+      with_config(:apdex_t => 2.0) do
+        assert_equal 8.0, @builder.transaction_trace_threshold
+      end
+    end
   end
 
   def test_has_correct_transaction_trace_threshold_when_explicitly_specified
     config = { :'transaction_tracer.transaction_threshold' => 4.0 }
 
-    with_config(config, :do_not_cast => true) do
-      NewRelic::Agent::TransactionState.get.transaction = stub()
-      NewRelic::Agent::TransactionState.get.transaction.stubs(:apdex_t).returns(1.5)
-      assert_equal 4.0, @builder.transaction_trace_threshold
+    in_transaction do
+      with_config(config, :do_not_cast => true) do
+        NewRelic::Agent::TransactionState.get.transaction.stubs(:apdex_t).returns(1.5)
+        assert_equal 4.0, @builder.transaction_trace_threshold
+      end
     end
   end
 

data/test/new_relic/agent/transaction_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::TransactionSamplerTest < Test::Unit::TestCase
+class NewRelic::Agent::TransactionSamplerTest < MiniTest::Unit::TestCase
 
   module MockGCStats
 
@@ -102,7 +102,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     sample.expects(:finished).returns(true)
     @sampler.expects(:builder).returns(builder).twice
 
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       @sampler.notice_pop_scope('a scope', Time.at(100))
     end
   end
@@ -640,7 +640,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
       @sampler.notice_scope_empty(@txn)
       @sampler.notice_scope_empty(@txn)
 
-      assert_not_nil @sampler.harvest![0]
+      refute_nil @sampler.harvest![0]
     end
   end
 
@@ -761,9 +761,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     @sampler.start_builder
     segment = @sampler.notice_push_scope
     segment.metric_name = 'External/www.google.com/Net::HTTP/GET'
-    assert_nothing_raised do
-      @sampler.notice_pop_scope( 'External/www.google.com/Net::HTTP/GET' )
-    end
+    @sampler.notice_pop_scope( 'External/www.google.com/Net::HTTP/GET' )
   end
 
   def test_adding_segment_parameters
@@ -782,10 +780,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     with_config(config) do
       run_long_sample_trace(110)
 
-      samples = nil
-      assert_nothing_raised do
-        samples = @sampler.harvest!
-      end
+      samples = @sampler.harvest!
       assert_equal(1, samples.size)
 
       # Verify that the TT stopped recording after 100 nodes
@@ -832,7 +827,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   def test_custom_params_omitted_if_config_says_so
     config = {
       :'transaction_tracer.transaction_threshold' => 0.0,
-      :'capture_attributes.traces' => false
+      :'transaction_tracer.capture_attributes' => false
     }
     with_config(config) do
       in_transaction do
@@ -847,7 +842,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   def test_custom_params_included_if_config_says_so
     config = {
       :'transaction_tracer.transaction_threshold' => 0.0,
-      :'capture_attributes.traces' => true
+      :'transaction_tracer.capture_attributes' => true
     }
     with_config(config) do
       in_transaction do
@@ -856,7 +851,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     end
     sample = NewRelic::Agent.agent.transaction_sampler.harvest![0]
     custom_params = sample.params[:custom_params]
-    assert(custom_params.keys.include?(:foo), "Expected custom param on TT because capture_attributes.traces is true")
+    assert_includes custom_params.keys, :foo
   end
 
   class Dummy
@@ -870,16 +865,16 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   end
 
   # TODO: this test seems to be destabilizing CI in a way that I don't grok.
-  def sadly_do_not_test_harvest_during_transaction_safety
-    n = 3000
-    harvester = Thread.new do
-      n.times { @sampler.harvest! }
-    end
+  #def sadly_do_not_test_harvest_during_transaction_safety
+  #  n = 3000
+  #  harvester = Thread.new do
+  #    n.times { @sampler.harvest! }
+  #  end
 
-    assert_nothing_raised { Dummy.new.run(n) }
+  #  Dummy.new.run(n)
 
-    harvester.join
-  end
+  #  harvester.join
+  #end
 
   private
 

data/test/new_relic/agent/transaction_state_test.rb

@@ -7,7 +7,7 @@ require 'new_relic/agent/transaction'
 require 'new_relic/agent/transaction_state'
 
 module NewRelic::Agent
-  class TransactionStateTest < Test::Unit::TestCase
+  class TransactionStateTest < MiniTest::Unit::TestCase
     attr_reader :state
 
     def setup

data/test/new_relic/agent/transaction_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 
-class NewRelic::Agent::TransactionTest < Test::Unit::TestCase
+class NewRelic::Agent::TransactionTest < MiniTest::Unit::TestCase
 
   attr_reader :txn
 
@@ -12,11 +12,17 @@ class NewRelic::Agent::TransactionTest < Test::Unit::TestCase
     @txn = NewRelic::Agent::Transaction.new
     @stats_engine = NewRelic::Agent.instance.stats_engine
     @stats_engine.reset!
+    NewRelic::Agent.instance.error_collector.reset!
   end
 
   def teardown
     # Failed transactions can leave partial stack, so pave it for next test
+    cleanup_transaction
+  end
+
+  def cleanup_transaction
     NewRelic::Agent::Transaction.stack.clear
+    NewRelic::Agent::TransactionState.clear
   end
 
   def test_request_parsing__none
@@ -321,6 +327,60 @@ class NewRelic::Agent::TransactionTest < Test::Unit::TestCase
     end
   end
 
+  def test_notice_error_in_current_transaction_saves_it_for_finishing
+    in_transaction('failing') do
+      NewRelic::Agent::Transaction.notice_error("")
+      assert_equal 1, NewRelic::Agent::Transaction.current.exceptions.count
+    end
+  end
+
+  def test_notice_error_after_current_transaction_notifies_error_collector
+    in_transaction('failing') do
+      # no-op
+    end
+    NewRelic::Agent::Transaction.notice_error("")
+    assert_equal 1, NewRelic::Agent.instance.error_collector.errors.count
+  end
+
+  def test_notice_error_after_current_transaction_gets_custom_params
+    in_transaction('failing') do
+      NewRelic::Agent.add_custom_parameters(:custom => "parameter")
+    end
+    NewRelic::Agent::Transaction.notice_error("")
+
+    error = NewRelic::Agent.instance.error_collector.errors.first
+    assert_equal({ :custom => "parameter" }, error.params[:custom_params])
+  end
+
+  def test_notice_error_after_current_transcation_doesnt_tromp_passed_params
+    in_transaction('failing') do
+      NewRelic::Agent.add_custom_parameters(:custom => "parameter")
+    end
+    NewRelic::Agent::Transaction.notice_error("", :custom_params => { :passing => true })
+
+    error = NewRelic::Agent.instance.error_collector.errors.first
+    expected = {
+      :custom => "parameter",
+      :passing => true,
+    }
+    assert_equal(expected, error.params[:custom_params])
+  end
+
+  def test_notice_error_after_current_transaction_gets_name
+    in_transaction('failing') do
+      #no-op
+    end
+    NewRelic::Agent::Transaction.notice_error("")
+    error = NewRelic::Agent.instance.error_collector.errors.first
+    assert_equal 'failing', error.path
+  end
+
+  def test_notice_error_without_transaction_notifies_error_collector
+    cleanup_transaction
+    NewRelic::Agent::Transaction.notice_error("")
+    assert_equal 1, NewRelic::Agent.instance.error_collector.errors.count
+  end
+
   def assert_has_custom_parameter(key, value = key)
     assert_equal(value, NewRelic::Agent::Transaction.current.custom_parameters[key])
   end

data/test/new_relic/agent/transaction_timings_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 require 'new_relic/agent/transaction_timings'
 
 module NewRelic::Agent
-  class TransactionTimingsTest < Test::Unit::TestCase
+  class TransactionTimingsTest < MiniTest::Unit::TestCase
 
     def setup
       @start_time = freeze_time

data/test/new_relic/agent/worker_loop_test.rb

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

data/test/new_relic/agent_test.rb

@@ -9,7 +9,7 @@ module NewRelic
   # mostly this class just passes through to the active agent
   # through the agent method or the control instance through
   # NewRelic::Control.instance . But it's nice to make sure.
-  class MainAgentTest < Test::Unit::TestCase
+  class MainAgentTest < MiniTest::Unit::TestCase
     include NewRelic::Agent::MethodTracer
 
     def setup
@@ -18,7 +18,6 @@ module NewRelic
     end
 
     def teardown
-      super
       NewRelic::Agent::TransactionState.clear
     end
 
@@ -108,7 +107,7 @@ module NewRelic
     def test_agent_not_started
       old_agent = NewRelic::Agent.agent
       NewRelic::Agent.instance_eval { @agent = nil }
-      assert_raise(RuntimeError) do
+      assert_raises(RuntimeError) do
         NewRelic::Agent.agent
       end
       NewRelic::Agent.instance_eval { @agent = old_agent }

data/test/new_relic/cli/deployments_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 require 'new_relic/cli/command'
 require 'new_relic/cli/deployments'
 
-class NewRelic::Cli::DeploymentsTest < Test::Unit::TestCase
+class NewRelic::Cli::DeploymentsTest < MiniTest::Unit::TestCase
 
   def setup
     NewRelic::Cli::Deployments.class_eval do
@@ -35,7 +35,7 @@ class NewRelic::Cli::DeploymentsTest < Test::Unit::TestCase
     end
   end
   def test_bad_command
-    assert_raise NewRelic::Cli::Command::CommandFailure do
+    assert_raises NewRelic::Cli::Command::CommandFailure do
       NewRelic::Cli::Deployments.new ["-foo", "bar"]
     end
   end
@@ -70,7 +70,7 @@ class NewRelic::Cli::DeploymentsTest < Test::Unit::TestCase
 
   def test_error_if_no_license_key
     with_config(:license_key => '') do
-      assert_raise NewRelic::Cli::Command::CommandFailure do
+      assert_raises NewRelic::Cli::Command::CommandFailure do
       deployment = NewRelic::Cli::Deployments.new(%w[-a APP -r 3838 --user=Bill] << "Some lengthy description")
         deployment.run
       end

data/test/new_relic/coerce_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
 require 'new_relic/coerce'
 
-class CoerceTest < Test::Unit::TestCase
+class CoerceTest < MiniTest::Unit::TestCase
 
   include NewRelic::Coerce
 

data/test/new_relic/collection_helper_test.rb

@@ -7,7 +7,7 @@ require 'ostruct'
 require 'active_record_fixtures' if defined?(::ActiveRecord)
 
 require 'new_relic/collection_helper'
-class NewRelic::CollectionHelperTest < Test::Unit::TestCase
+class NewRelic::CollectionHelperTest < MiniTest::Unit::TestCase
 
   def setup
     NewRelic::Agent.manual_start

data/test/new_relic/control/class_methods_test.rb

@@ -10,7 +10,7 @@ class BaseClassMethods
   include NewRelic::Control::ClassMethods
 end
 
-class NewRelic::Control::ClassMethodsTest < Test::Unit::TestCase
+class NewRelic::Control::ClassMethodsTest < MiniTest::Unit::TestCase
   def setup
     @base = ::BaseClassMethods.new
     super
@@ -41,7 +41,7 @@ class NewRelic::Control::ClassMethodsTest < Test::Unit::TestCase
     # this is used to allow other people to insert frameworks without
     # having the file in our agent, i.e. define your own
     # NewRelic::Control::Framework::FooBar
-    assert_raise(NameError) do
+    assert_raises(NameError) do
       @base.load_framework_class('missing')
     end
   end

data/test/new_relic/control/frameworks/rails_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'/../../../test_helper'))
 
-class NewRelic::Control::Frameworks::RailsTest < Test::Unit::TestCase
+class NewRelic::Control::Frameworks::RailsTest < MiniTest::Unit::TestCase
   def test_install_browser_monitoring
     require 'new_relic/rack/browser_monitoring'
     middleware = stub('middleware config')

data/test/new_relic/control_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'/../test_helper'))
 
-class NewRelic::ControlTest < Test::Unit::TestCase
+class NewRelic::ControlTest < MiniTest::Unit::TestCase
   attr_reader :control
 
   def setup
@@ -35,7 +35,7 @@ class NewRelic::ControlTest < Test::Unit::TestCase
   end
 
   def test_settings_accessor
-    assert_not_nil control.settings
+    refute_nil control.settings
   end
 
   def test_root
@@ -179,7 +179,7 @@ class NewRelic::ControlTest < Test::Unit::TestCase
   end
 
   def test_init_plugin_loads_samplers_enabled
-    NewRelic::Agent.shutdown
+    reset_agent
     with_config(:disable_samplers => false, :agent_enabled => true) do
       NewRelic::Control.instance.init_plugin
       assert NewRelic::Agent.instance.harvest_samplers.any?
@@ -187,10 +187,15 @@ class NewRelic::ControlTest < Test::Unit::TestCase
   end
 
   def test_init_plugin_loads_samplers_disabled
-    NewRelic::Agent.shutdown
+    reset_agent
     with_config(:disable_samplers => true, :agent_enabled => true) do
       NewRelic::Control.instance.init_plugin
       assert !NewRelic::Agent.instance.harvest_samplers.any?
     end
   end
+
+  def reset_agent
+    NewRelic::Agent.shutdown
+    NewRelic::Agent.instance.harvest_samplers.clear
+  end
 end