newrelic_rpm 2.14.1 → 3.0.0.beta1

data/test/new_relic/agent/worker_loop_test.rb

@@ -1,5 +1,5 @@
 ENV['SKIP_RAILS'] = 'true'
-require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper')) 
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 
 class NewRelic::Agent::WorkerLoopTest < Test::Unit::TestCase
   def setup
@@ -9,7 +9,7 @@ class NewRelic::Agent::WorkerLoopTest < Test::Unit::TestCase
     @worker_loop.stubs(:log).returns(@logger)
     @test_start_time = Time.now
   end
-  
+
   def test_add_task
     @x = false
     @worker_loop.run(0) do
@@ -18,7 +18,7 @@ class NewRelic::Agent::WorkerLoopTest < Test::Unit::TestCase
     end
     assert @x
   end
-  
+
   def test_density
     # This shows how the tasks stay aligned with the period and don't drift.
     count = 0
@@ -46,7 +46,7 @@ class NewRelic::Agent::WorkerLoopTest < Test::Unit::TestCase
     assert done
   end
   class BadBoy < Exception; end
-    
+
   def test_task_error__exception
     @logger.expects(:error).once
     @logger.expects(:debug).once

data/test/new_relic/collection_helper_test.rb

@@ -1,18 +1,18 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper')) 
+require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
 require 'ostruct'
 require 'active_record_fixtures' if defined?(::ActiveRecord)
 
 require 'new_relic/collection_helper'
 class NewRelic::CollectionHelperTest < Test::Unit::TestCase
-  
+
   def setup
-    NewRelic::Agent.manual_start    
+    NewRelic::Agent.manual_start
     super
   end
   def teardown
     super
   end
-  
+
   include NewRelic::CollectionHelper
   def test_string
     val = (('A'..'Z').to_a.join * 100).to_s
@@ -58,7 +58,7 @@ class NewRelic::CollectionHelperTest < Test::Unit::TestCase
     assert_equal Hash["ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEF..." => (("0"*256) + "...")], normalize_params({ val => '0' * 512 })
   end
   class MyHash < Hash
-    
+
   end
   # Test to ensure that hash subclasses are properly converted
   def test_hash_subclass
@@ -67,19 +67,19 @@ class NewRelic::CollectionHelperTest < Test::Unit::TestCase
     custom_params = { :one => {:hash => { :a => :b}, :myhash => h }}
     nh = normalize_params(custom_params)
     myhash = custom_params[:one][:myhash]
-    assert_equal MyHash, myhash.class 
+    assert_equal MyHash, myhash.class
     myhash = nh[:one][:myhash]
-    assert_equal Hash, myhash.class 
+    assert_equal Hash, myhash.class
   end
-  
+
   class MyEnumerable
     include Enumerable
-    
+
     def each
       yield "1"
     end
   end
-  
+
   def test_enumerable
     e = MyEnumerable.new
     custom_params = { :one => {:hash => { :a => :b}, :myenum => e }}
@@ -87,25 +87,25 @@ class NewRelic::CollectionHelperTest < Test::Unit::TestCase
     myenum = nh[:one][:myenum]
     assert_match /MyEnumerable/, myenum
   end
-  
+
   def test_stringio
     # Verify StringIO works like this normally:
     s = StringIO.new "start" + ("foo bar bat " * 1000)
     val = nil
-    s.each { | entry | val = entry; break } 
+    s.each { | entry | val = entry; break }
     assert_match /^startfoo bar/, val
 
     # make sure stringios aren't affected by calling normalize_params:
     s = StringIO.new "start" + ("foo bar bat " * 1000)
     v = normalize_params({ :foo => s.string })
-    s.each { | entry | val = entry; break } 
+    s.each { | entry | val = entry; break }
     assert_match /^startfoo bar/, val
   end
-  
+
   def test_object
     assert_equal ["foo", '#<OpenStruct>'], normalize_params(['foo', OpenStruct.new('z'=>'q')])
   end
-  
+
   def test_strip_backtrace
     begin
       ActiveRecordFixtures.setup

data/test/new_relic/command/deployments_test.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'/../../test_helper'))
 require File.expand_path(File.join(File.dirname(__FILE__),'/../../../lib/new_relic/command'))
 
 class NewRelic::Command::DeploymentsTest < Test::Unit::TestCase
-  
+
   def setup
     NewRelic::Command::Deployments.class_eval do
       attr_accessor :messages, :exit_status, :errors, :revision
@@ -40,7 +40,7 @@ class NewRelic::Command::DeploymentsTest < Test::Unit::TestCase
     @deployment.run
     @deployment = nil
   end
-  
+
   def test_command_line_run
     mock_the_connection
     #    @mock_response.expects(:body).returns("<xml>deployment</xml>")
@@ -49,11 +49,11 @@ class NewRelic::Command::DeploymentsTest < Test::Unit::TestCase
     assert_nil @deployment.errors
     assert_equal '3838', @deployment.revision
     @deployment.run
-    
+
     # This should pass because it's a bogus deployment
     #assert_equal 1, @deployment.exit_status
     #assert_match /Unable to upload/, @deployment.errors
-    
+
     @deployment = nil
   end
   private
@@ -64,5 +64,5 @@ class NewRelic::Command::DeploymentsTest < Test::Unit::TestCase
     mock_connection.expects(:request).returns(@mock_response)
     NewRelic::Control.instance.stubs(:http_connection).returns(mock_connection)
   end
-  
+
 end

data/test/new_relic/control_test.rb

@@ -1,10 +1,10 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'/../test_helper'))
 class NewRelic::ControlTest < Test::Unit::TestCase
-  
+
   attr_reader :c
-  
+
   def setup
-    
+
     NewRelic::Agent.manual_start(:dispatcher_instance_id => 'test')
     @c =  NewRelic::Control.instance
     raise 'oh geez, wrong class' unless NewRelic::Control.instance.is_a?(::NewRelic::Control::Frameworks::Test)
@@ -17,7 +17,7 @@ class NewRelic::ControlTest < Test::Unit::TestCase
     assert @c.cert_file_path
     assert_equal File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'cert', 'cacert.pem')), @c.cert_file_path
   end
-  
+
   def test_cert_file
     result = `openssl verify -CAfile #{@c.cert_file_path} #{@c.send(:newrelic_root)}/cert/site.pem`
     assert (result =~ /OK/), 'Should verify certificate: ' + result
@@ -26,7 +26,7 @@ class NewRelic::ControlTest < Test::Unit::TestCase
   def test_old_cert_file
     result = `openssl verify -CAfile #{@c.cert_file_path} #{@c.send(:newrelic_root)}/cert/oldsite.pem`
     assert (result =~ /OK/), 'Should verify the old certificate: ' + result
-  end  
+  end
 
   def test_monitor_mode
     assert ! @c.monitor_mode?
@@ -47,50 +47,50 @@ class NewRelic::ControlTest < Test::Unit::TestCase
     @c['enabled'] = false
     @c['monitor_mode'] = false
   end
-  
+
   def test_test_config
     if defined?(Rails) && Rails::VERSION::MAJOR.to_i == 3
       assert_equal :rails3, c.app
     elsif defined?(Rails)
-      assert_equal :rails, c.app      
+      assert_equal :rails, c.app
     else
       assert_equal :test, c.app
     end
     assert_equal :test, c.framework
     assert_match /test/i, c.dispatcher_instance_id
-    assert_equal nil, c.dispatcher
+    assert("" == c.dispatcher.to_s)
     assert !c['enabled']
     assert_equal false, c['monitor_mode']
     c.local_env
   end
-  
+
   def test_root
     assert File.directory?(NewRelic::Control.newrelic_root), NewRelic::Control.newrelic_root
     if defined?(Rails)
       assert File.directory?(File.join(NewRelic::Control.newrelic_root, "lib")), NewRelic::Control.newrelic_root +  "/lib"
     end
   end
-  
+
   def test_info
     props = NewRelic::Control.instance.local_env.snapshot
     if defined?(Rails)
       assert_match /jdbc|postgres|mysql|sqlite/, props.assoc('Database adapter').last, props.inspect
     end
   end
-  
+
   def test_resolve_ip
     assert_equal nil, c.send(:convert_to_ip_address, 'localhost')
     assert_equal nil, c.send(:convert_to_ip_address, 'q1239988737.us')
     # This will fail if you don't have a valid, accessible, DNS server
     assert_equal '204.93.223.153', c.send(:convert_to_ip_address, 'collector.newrelic.com')
   end
-  
+
   class FakeResolv
     def self.getaddress(host)
       raise 'deliberately broken'
     end
   end
-  
+
   def test_resolve_ip_with_broken_dns
     # Here be dragons: disable the ruby DNS lookup methods we use so
     # that it will actually fail to resolve.
@@ -99,16 +99,16 @@ class NewRelic::ControlTest < Test::Unit::TestCase
     Object.instance_eval { remove_const :Resolv}
     Object.instance_eval {remove_const:'IPSocket' }
     assert_equal(nil, c.send(:convert_to_ip_address, 'collector.newrelic.com'), "DNS is down, should be no IP for server")
-    
+
     Object.instance_eval {const_set('Resolv', old_resolv); const_set('IPSocket', old_ipsocket)}
     # these are here to make sure that the constant tomfoolery above
     # has not broket the system unduly
     assert_equal old_resolv, Resolv
     assert_equal old_ipsocket, IPSocket
   end
-    
-    
-  
+
+
+
   def test_config_yaml_erb
     assert_equal 'heyheyhey', c['erb_value']
     assert_equal '', c['message']
@@ -118,12 +118,12 @@ class NewRelic::ControlTest < Test::Unit::TestCase
   def test_appnames
     assert_equal %w[a b c], NewRelic::Control.instance.app_names
   end
-  
+
   def test_config_booleans
     assert_equal c['tval'], true
     assert_equal c['fval'], false
     assert_nil c['not_in_yaml_val']
-    assert_equal c['yval'], true 
+    assert_equal c['yval'], true
     assert_equal c['sval'], 'sure'
   end
   def test_config_apdex
@@ -137,20 +137,20 @@ class NewRelic::ControlTest < Test::Unit::TestCase
     NewRelic::Control.instance.setup_log
     assert_match /newrelic_agent.log$/, c.instance_variable_get('@log_file')
   end
-   
+
   def test_transaction_threshold__apdex
     forced_start
     assert_equal 'Apdex_f', c['transaction_tracer']['transaction_threshold']
     assert_equal 4.4, NewRelic::Agent::Agent.instance.instance_variable_get('@slowest_transaction_threshold')
   end
-  
+
   def test_transaction_threshold__default
-    
+
     forced_start :transaction_tracer => { :transaction_threshold => nil}
     assert_nil c['transaction_tracer']['transaction_threshold']
     assert_equal 2.0, NewRelic::Agent::Agent.instance.instance_variable_get('@slowest_transaction_threshold')
   end
-  
+
   def test_transaction_threshold__override
     forced_start :transaction_tracer => { :transaction_threshold => 1}
     assert_equal 1, c['transaction_tracer']['transaction_threshold']
@@ -166,8 +166,8 @@ class NewRelic::ControlTest < Test::Unit::TestCase
   private
   def forced_start overrides = {}
     NewRelic::Agent.manual_start overrides
-    # This is to force the agent to start again. 
+    # This is to force the agent to start again.
     NewRelic::Agent.instance.stubs(:started?).returns(nil)
-    NewRelic::Agent.instance.start 
+    NewRelic::Agent.instance.start
   end
 end

data/test/new_relic/local_environment_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
 class NewRelic::LocalEnvironmentTest < Test::Unit::TestCase
-  
+
   def teardown
     # To remove mock server instances from ObjectSpace
     ObjectSpace.garbage_collect
@@ -12,16 +12,16 @@ class NewRelic::LocalEnvironmentTest < Test::Unit::TestCase
     end
   end
   MOCK_OPTIONS = MockOptions.new
-  
+
   def test_environment
     e = NewRelic::LocalEnvironment.new
-    assert_equal nil, e.environment
+    assert(nil == e.environment) # working around a bug in 1.9.1
     assert_match /test/i, e.dispatcher_instance_id
   end
   def test_no_webrick
     Object.const_set :OPTIONS, 'foo'
     e = NewRelic::LocalEnvironment.new
-    assert_equal nil, e.environment
+    assert(nil == e.environment) # working around a bug in 1.9.1
     assert_match /test/i, e.dispatcher_instance_id
     Object.class_eval { remove_const :OPTIONS }
   end
@@ -35,15 +35,15 @@ class NewRelic::LocalEnvironmentTest < Test::Unit::TestCase
     e = NewRelic::LocalEnvironment.new
     assert_equal :passenger, e.environment
     assert_nil e.dispatcher_instance_id, "dispatcher instance id should be nil: #{e.dispatcher_instance_id}"
-      
+
     NewRelic::Control.instance.instance_eval do
       @settings['app_name'] = 'myapp'
     end
-    
-    e = NewRelic::LocalEnvironment.new 
+
+    e = NewRelic::LocalEnvironment.new
     assert_equal :passenger, e.environment
     assert_nil e.dispatcher_instance_id
-    
+
     ::Passenger.class_eval { remove_const :AbstractServer }
   end
   def test_snapshot
@@ -59,8 +59,8 @@ class NewRelic::LocalEnvironmentTest < Test::Unit::TestCase
       assert s.assoc('Processors').last.to_i > 0
     end
   end
-  
-  
+
+
   def test_default_port
     e = NewRelic::LocalEnvironment.new
     assert_equal 3000, e.send(:default_port)
@@ -68,5 +68,5 @@ class NewRelic::LocalEnvironmentTest < Test::Unit::TestCase
     assert_equal '3121', e.send(:default_port)
     ARGV.pop
   end
-  
+
 end

data/test/new_relic/metric_spec_test.rb

@@ -1,10 +1,10 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
-class NewRelic::MetricSpecTest < Test::Unit::TestCase  
-  
+class NewRelic::MetricSpecTest < Test::Unit::TestCase
+
   def test_equal
     spec1 = NewRelic::MetricSpec.new('Controller')
     spec2 = NewRelic::MetricSpec.new('Controller', nil)
-    
+
     assert spec1.eql?(NewRelic::MetricSpec.new('Controller'))
     assert spec2.eql?(NewRelic::MetricSpec.new('Controller', nil))
     assert spec1.eql?(spec2)
@@ -21,53 +21,53 @@ class NewRelic::MetricSpecTest < Test::Unit::TestCase
     s2 = NewRelic::MetricSpec.new('Controller', 'hap')
     assert_equal [s2, s1].sort, [s1, s2]
     assert_equal [s1, s2].sort, [s1, s2]
-    
+
     s1 = NewRelic::MetricSpec.new('Controller', 'hap')
     s2 = NewRelic::MetricSpec.new('Controller', nil)
     assert_equal [s2, s1].sort, [s2, s1]
     assert_equal [s1, s2].sort, [s2, s1]
-    
+
     s1 = NewRelic::MetricSpec.new('Controller')
     s2 = NewRelic::MetricSpec.new('Controller')
     assert_equal [s2, s1].sort, [s2, s1] # unchanged due to no sort criteria
     assert_equal [s1, s2].sort, [s1, s2] # unchanged due to no sort criteria
-    
+
     s1 = NewRelic::MetricSpec.new('Controller', nil)
     s2 = NewRelic::MetricSpec.new('Controller', nil)
     assert_equal [s2, s1].sort, [s2, s1] # unchanged due to no sort criteria
-    assert_equal [s1, s2].sort, [s1, s2] # unchanged due to no sort criteria  
+    assert_equal [s1, s2].sort, [s1, s2] # unchanged due to no sort criteria
   end
 
   # test to make sure the MetricSpec class can serialize to json
   def test_json
     spec = NewRelic::MetricSpec.new("controller", "metric#find")
-    
+
     import = ::ActiveSupport::JSON.decode(spec.to_json)
-    
+
     compare_spec(spec, import)
-    
+
     stats = NewRelic::MethodTraceStats.new
-    
+
     import = ::ActiveSupport::JSON.decode(stats.to_json)
-    
+
     compare_stat(stats, import)
-    
+
     metric_data = NewRelic::MetricData.new(spec, stats, 10)
-    
+
     import = ::ActiveSupport::JSON.decode(metric_data.to_json)
-    
+
     compare_metric_data(metric_data, import)
   end
-  
-  
-  private 
-  
+
+
+  private
+
   def compare_spec(spec, import)
     assert_equal 2, import.length
     assert_equal spec.name, import['name']
     assert_equal spec.scope, import['scope']
   end
-  
+
   def compare_stat(stats, import)
     assert_equal 6, import.length
     assert_equal stats.total_call_time, import['total_call_time']
@@ -77,7 +77,7 @@ class NewRelic::MetricSpecTest < Test::Unit::TestCase
     assert_equal stats.call_count, import['call_count']
     assert_equal stats.total_exclusive_time, import['total_exclusive_time']
   end
-  
+
   def compare_metric_data(metric_data, import)
     assert_equal 3, import.length
     assert_equal metric_data.metric_id, import['metric_id']