newrelic_rpm 2.8.11 → 2.9.2

data/test/new_relic/{tc_shim_agent.rb → shim_agent_test.rb}

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'/../test_helper'))
 # TODO
-class NewRelic::ShimAgentTests < Test::Unit::TestCase
+class NewRelic::ShimAgentTest < Test::Unit::TestCase
   
   def test_shim
   end

data/test/new_relic/stats_test.rb

@@ -0,0 +1,291 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
+##require "new_relic/stats"
+
+module NewRelic; class TestObjectForStats
+                   include Stats
+                   attr_accessor :total_call_time
+                   attr_accessor :total_exclusive_time
+                   attr_accessor :begin_time
+                   attr_accessor :end_time
+                   attr_accessor :call_count
+end; end
+
+
+class NewRelic::StatsTest < Test::Unit::TestCase
+  
+  def test_simple
+    stats = NewRelic::MethodTraceStats.new 
+    validate stats, 0, 0, 0, 0
+    
+    assert_equal stats.call_count,0
+    stats.trace_call 10
+    stats.trace_call 20
+    stats.trace_call 30
+    
+    validate stats, 3, (10+20+30), 10, 30
+  end
+
+  def test_to_s
+    s1 = NewRelic::MethodTraceStats.new
+    s1.trace_call 10
+    assert_equal(s1.to_s, "Begin=0.0, Duration=0.0 s, Count=1, Total=10000, Total Exclusive=10000, Avg=10000, Min=10000, Max=10000, StdDev=0")
+  end
+
+  def test_time_str
+    s1 = NewRelic::MethodTraceStats.new
+    assert_equal(s1.time_str(10), "10 ms")
+    assert_equal(s1.time_str(4999), "4999 ms")    
+    assert_equal(s1.time_str(5000), "5.00 s")
+    assert_equal(s1.time_str(5010), "5.01 s")
+    assert_equal(s1.time_str(9999), "10.00 s")
+    assert_equal(s1.time_str(10000), "10.0 s")
+    assert_equal(s1.time_str(20000), "20.0 s")
+  end    
+
+  def test_fraction_of
+    s1 = NewRelic::MethodTraceStats.new
+    s2 = NewRelic::MethodTraceStats.new
+    s1.trace_call 10
+    s2.trace_call 20
+    assert_equal(s1.fraction_of(s2).to_s, 'NaN')
+  end
+
+  def test_fraction_of2
+    s1 = NewRelic::MethodTraceStats.new
+    s1.trace_call 10
+    s2 = NewRelic::MethodTraceStats.new
+    assert_equal(s1.fraction_of(s2).to_s, 'NaN')
+  end
+
+  def test_multiply_by
+    s1 = NewRelic::MethodTraceStats.new
+    s1.trace_call 10
+    assert_equal(s1.multiply_by(10).to_s, "Begin=0.0, Duration=0.0 s, Count=10, Total=100000, Total Exclusive=10000, Avg=10000, Min=10000, Max=10000, StdDev=0")
+  end
+
+  def test_get_apdex
+    s1 = NewRelic::MethodTraceStats.new
+    s1.trace_call 10
+    assert_equal(s1.get_apdex, [1, 10, 10])
+  end
+
+  def test_apdex_score
+    s1 = NewRelic::MethodTraceStats.new
+    s1.trace_call 10
+    # FIXME make this test the real logic
+    # don't ask me what this means, but it's what's coming out the
+    # other end when I actually run it.
+    assert_in_delta(s1.apdex_score, 0.285714285714286, 0.0000001)
+  end
+
+  def test_as_percentage
+    s1 = NewRelic::MethodTraceStats.new
+    s1.trace_call 10
+    assert_equal(s1.as_percentage, 1000.0)
+  end
+
+  def test_calls_per_minute
+
+    s1 = NewRelic::TestObjectForStats.new
+    s1.call_count =  1
+    s1.begin_time = Time.at(0)
+    s1.end_time = Time.at(30)
+    assert_equal(s1.calls_per_minute, 2)
+  end
+
+  def test_calls_per_second
+    s1 = NewRelic::TestObjectForStats.new
+    s1.call_count = 90
+    s1.begin_time = Time.at(0)
+    s1.end_time = Time.at(30)
+    assert_equal(s1.calls_per_second, 3)
+  end
+
+  def test_total_call_time_per_minute
+    s1 = NewRelic::TestObjectForStats.new
+    s1.begin_time = Time.at(0)
+    s1.end_time = Time.at(0)
+    assert_equal(0, s1.total_call_time_per_minute)
+    s1.begin_time = Time.at(0)
+    s1.end_time = Time.at(30)
+    s1.total_call_time = 10
+    assert_equal(20, s1.total_call_time_per_minute)
+  end
+
+  def test_time_percentage
+    s1 = NewRelic::TestObjectForStats.new
+    s1.begin_time = Time.at(0)
+    s1.end_time = Time.at(0)
+    assert_equal(0, s1.time_percentage)
+    s1.total_call_time = 10
+    s1.begin_time = Time.at(0)
+    s1.end_time = Time.at(30)
+    assert_equal((1.0 / 3.0), s1.time_percentage)
+    s1.total_call_time = 20
+    assert_equal((2.0 / 3.0), s1.time_percentage)
+  end
+
+  def test_exclusive_time_percentage
+    s1 = NewRelic::TestObjectForStats.new
+    s1.begin_time = Time.at(0)
+    s1.end_time = Time.at(0)
+    assert_equal(0, s1.exclusive_time_percentage)
+    s1.total_exclusive_time = 10
+    s1.begin_time = Time.at(0)
+    s1.end_time = Time.at(30)
+    assert_equal((1.0 / 3.0), s1.exclusive_time_percentage)
+    s1.total_exclusive_time = 20
+    assert_equal((2.0 / 3.0), s1.exclusive_time_percentage)
+  end
+  
+  def test_merge
+    s1 = NewRelic::MethodTraceStats.new
+    s2 = NewRelic::MethodTraceStats.new
+    
+    s1.trace_call 10
+    s2.trace_call 20
+    s2.freeze
+    
+    validate s2, 1, 20, 20, 20
+    s3 = s1.merge s2
+    validate s3, 2, (10+20), 10, 20
+    validate s1, 1, 10, 10, 10
+    validate s2, 1, 20, 20, 20
+    
+    s1.merge! s2
+    validate s1, 2, (10+20), 10, 20
+    validate s2, 1, 20, 20, 20
+  end
+  
+  def test_merge_with_exclusive
+    s1 = NewRelic::MethodTraceStats.new
+    
+    s2 = NewRelic::MethodTraceStats.new
+    
+    s1.trace_call 10, 5
+    s2.trace_call 20, 10
+    s2.freeze
+    
+    validate s2, 1, 20, 20, 20, 10
+    s3 = s1.merge s2
+    validate s3, 2, (10+20), 10, 20, (10+5)
+    validate s1, 1, 10, 10, 10, 5
+    validate s2, 1, 20, 20, 20, 10
+    
+    s1.merge! s2
+    validate s1, 2, (10+20), 10, 20, (5+10)
+    validate s2, 1, 20, 20, 20, 10
+  end
+  
+  def test_merge_array
+    s1 = NewRelic::MethodTraceStats.new
+    merges = []
+    merges << (NewRelic::MethodTraceStats.new.trace_call 1)
+    merges << (NewRelic::MethodTraceStats.new.trace_call 1)
+    merges << (NewRelic::MethodTraceStats.new.trace_call 1)
+    
+    s1.merge! merges
+    validate s1, 3, 3, 1, 1
+  end
+  def test_round
+    stats = NewRelic::MethodTraceStats.new
+    stats.record_data_point(0.125222, 0.025)
+    stats.record_data_point(0.125222, 0.025)
+    stats.record_data_point(0.125222, 0.025)
+    assert_equal 0.047041647852, stats.sum_of_squares
+    assert_equal 0.375666, stats.total_call_time
+    stats.round!
+    assert_equal 0.376, stats.total_call_time
+    assert_equal 0.047, stats.sum_of_squares
+    
+  end
+  
+  def test_freeze
+    s1 = NewRelic::MethodTraceStats.new
+    
+    s1.trace_call 10
+    s1.freeze
+    
+    begin
+      # the following should throw an exception because s1 is frozen
+      s1.trace_call 20
+      assert false
+    rescue StandardError
+      assert s1.frozen?
+      validate s1, 1, 10, 10, 10
+    end
+  end
+  
+  def test_std_dev
+    s = NewRelic::MethodTraceStats.new
+    s.trace_call 1
+    assert s.standard_deviation == 0
+    
+    s = NewRelic::MethodTraceStats.new
+    s.trace_call 10
+    s.trace_call 10
+    s.sum_of_squares = nil
+    assert s.standard_deviation == 0
+    
+    s = NewRelic::MethodTraceStats.new
+    s.trace_call 0.001
+    s.trace_call 0.001
+    assert s.standard_deviation == 0
+
+    
+    s = NewRelic::MethodTraceStats.new
+    s.trace_call 10
+    s.trace_call 10
+    s.trace_call 10
+    s.trace_call 10
+    s.trace_call 10
+    s.trace_call 10
+    assert s.standard_deviation == 0
+    
+    s = NewRelic::MethodTraceStats.new
+    s.trace_call 4
+    s.trace_call 7
+    s.trace_call 13
+    s.trace_call 16
+    s.trace_call 8
+    s.trace_call 4
+    assert_equal(s.sum_of_squares, 4**2 + 7**2 + 13**2 + 16**2 + 8**2 + 4**2)
+    
+    s.trace_call 9
+    s.trace_call 3
+    s.trace_call 1000
+    s.trace_call 4
+    
+    # calculated stdev (population, not sample) from a spreadsheet.
+    assert_in_delta(s.standard_deviation, 297.76, 0.01)
+  end
+  
+  def test_std_dev_merge
+    s1 = NewRelic::MethodTraceStats.new
+    s1.trace_call 4
+    s1.trace_call 7
+    
+    s2 = NewRelic::MethodTraceStats.new
+    s2.trace_call 13
+    s2.trace_call 16
+    
+    s3 = s1.merge(s2)
+    
+    assert(s1.sum_of_squares, 4*4 + 7*7)
+    assert_in_delta(s1.standard_deviation, 1.5, 0.01)
+    
+    assert_in_delta(s2.standard_deviation, 1.5, 0.01)
+    assert_equal(s3.sum_of_squares, 4*4 + 7*7 + 13*13 + 16*16, "check sum of squares")
+    assert_in_delta(s3.standard_deviation, 4.743, 0.01)
+  end
+  
+  private
+  def validate (stats, count, total, min, max, exclusive = nil)
+    assert_equal stats.call_count, count
+    assert_equal stats.total_call_time, total
+    assert_equal stats.average_call_time, (count > 0 ? total / count : 0)
+    assert_equal stats.min_call_time, min
+    assert_equal stats.max_call_time, max
+    assert_equal stats.total_exclusive_time, exclusive if exclusive
+  end
+end

data/test/new_relic/version_number_test.rb

@@ -0,0 +1,46 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
+class NewRelic::VersionNumberTest < Test::Unit::TestCase
+  
+  def test_comparison__first
+    versions = %w[1.0.0 0.1.0 0.0.1 10.0.1 1.10.0].map {|s| NewRelic::VersionNumber.new s }
+    assert_equal %w[0.0.1 0.1.0 1.0.0 1.10.0 10.0.1], versions.sort.map(&:to_s)
+    v0 = NewRelic::VersionNumber.new '1.2.3'
+    v1 = NewRelic::VersionNumber.new '1.2.2'
+    v3 = NewRelic::VersionNumber.new '1.2.2'
+    assert v0 > v1
+    assert v1 == v1
+    assert v1 == v3
+  end
+  def test_comparison__second
+    v0 = NewRelic::VersionNumber.new '1.2.0'
+    v1 = NewRelic::VersionNumber.new '2.2.2'
+    v3 = NewRelic::VersionNumber.new '1.1.2'
+    assert v0 < v1
+    assert v1 > v3
+    assert v3 < v0
+  end
+  def test_long_version
+    v0 = NewRelic::VersionNumber.new '1.2.3.4'
+    v1 = NewRelic::VersionNumber.new '1.2.3.3'
+    v3 = NewRelic::VersionNumber.new '1.3'
+    assert v0 > v1
+    assert v3 > v0
+  end
+  def test_sort
+    values = %w[1.1.1 2.6.5 2.7 2.7.1]
+    assert_equal values, values.map{|v| NewRelic::VersionNumber.new v}.sort.map(&:to_s)
+  end
+  def test_compare_string
+    v0 = NewRelic::VersionNumber.new '1.2.0'
+    v1 = NewRelic::VersionNumber.new '2.2.2'
+    v3 = NewRelic::VersionNumber.new '1.1.2'
+    assert v0 < '2.2.2'
+    assert v1 > '1.1.2'
+    assert v3 < '1.2.0'
+    assert v0 == '1.2.0'
+  end
+  def test_string
+    assert_equal '1.2.0', NewRelic::VersionNumber.new('1.2.0').to_s
+    assert_equal '1.2', NewRelic::VersionNumber.new('1.2').to_s
+  end
+end

data/test/test_helper.rb

@@ -1,40 +1,17 @@
 module NewRelic; TEST = true; end unless defined? NewRelic::TEST
-NEWRELIC_PLUGIN_DIR = File.expand_path(File.dirname(__FILE__)+"/..")
+
+NEWRELIC_PLUGIN_DIR = File.expand_path(File.join(File.dirname(__FILE__),".."))
 $LOAD_PATH << File.join(NEWRELIC_PLUGIN_DIR,"test")
+$LOAD_PATH << File.join(NEWRELIC_PLUGIN_DIR,"ui/helpers")
 $LOAD_PATH.uniq!
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../../config/environment")
+require File.expand_path(File.join(NEWRELIC_PLUGIN_DIR, "..","..","..","config","environment"))
 
 require 'test_help'
 require 'mocha'
 require 'test/unit'
 
-module NewRelic
-  class Config
-    def setup_log_with_block_logging(*args)
-      silence_stream(::STDERR) { self.setup_log_without_block_logging(*args) }
-    end
-    alias_method_chain :setup_log, :block_logging rescue nil
-  end
-end
-
-=begin
-# This is a mixin for hacking the select method
-if defined? ActiveRecord::ConnectionAdapters
-  class ActiveRecord::ConnectionAdapters::MysqlAdapter
-    
-    def log_info_with_slowdown(sql, name, seconds)
-      log_info_without_slowdown(sql, name, seconds)
-      sleep 0.1
-    end
-    
-    def setup_slow
-      self.class.alias_method_chain :log_info, :slowdown
-    end
-    
-    def teardown_slow
-      alias :log_info :log_info_without_slowdown
-    end
-  end
+def assert_between(floor, ceiling, value, message = nil)
+  assert floor <= value && value <= ceiling,
+  message || "expected #{floor} <= #{value} <= #{ceiling}"
 end
-=end

data/test/ui/newrelic_controller_test.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper')) 
+require 'newrelic_helper'
+require 'active_record_fixtures'
+
+class NewRelic::Agent::NewrelicControllerTest < Test::Unit::TestCase
+
+  # Clearly we need a functional test for the controller.  For now
+  # I want to at least make sure the class loads in all versions of rails.
+  def test_controller_loading
+    NewrelicController
+  rescue
+    fail "Controller would not load:#{$!}"
+  end
+end

data/test/ui/{tc_newrelic_helper.rb → newrelic_helper_test.rb}

@@ -1,16 +1,22 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper')) 
 require 'newrelic_helper'
-require 'new_relic/agent/model_fixture'
+require 'active_record_fixtures'
 
-class NewRelic::Agent::NewrelicHelperTests < Test::Unit::TestCase
+class NewRelic::Agent::NewrelicHelperTest < Test::Unit::TestCase
   include NewrelicHelper
+  
+  def params
+    {}
+  end
+  
   def setup
     super
-    NewRelic::Agent::ModelFixture.setup
+    ActiveRecordFixtures.setup
+    # setup instrumentation
+    NewRelic::Agent.manual_start 
+    # let's get a real stack trace
     begin
-      # setup instrumentation
-      NewRelic::Agent.instance.start :test, :test
-      NewRelic::Agent::ModelFixture.find 0
+      ActiveRecordFixtures::Order.find 0
     rescue => e
       @exception = e
       return
@@ -18,7 +24,7 @@ class NewRelic::Agent::NewrelicHelperTests < Test::Unit::TestCase
     flunk "should throw"
   end
   def teardown
-    NewRelic::Agent::ModelFixture.teardown
+    ActiveRecordFixtures.teardown
     NewRelic::Agent.instance.shutdown
     super
   end
@@ -32,6 +38,9 @@ class NewRelic::Agent::NewrelicHelperTests < Test::Unit::TestCase
   def test_application_stack_trace__no_rails
     assert_clean(application_stack_trace(@exception.backtrace, false), false)
   end 
+  def test_with_delimiter
+    assert_equal "123,456.123456", with_delimiter(123456.123456)
+  end
   
   private
   def assert_clean(backtrace, rails=false)