newrelic_rpm 3.7.1.188 → 3.7.2.190.beta

data/test/new_relic/dependency_detection_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
 
-class DependencyDetectionTest < Test::Unit::TestCase
+class DependencyDetectionTest < MiniTest::Unit::TestCase
 
   def setup
     @original_items = DependencyDetection.items

data/test/new_relic/dispatcher_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
 
 # Test logic around detecting or configuring dispatcher
-class DispatcherTest < Test::Unit::TestCase
+class DispatcherTest < MiniTest::Unit::TestCase
 
   def setup
     NewRelic::Agent.shutdown

data/test/new_relic/environment_report_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
 
 require 'new_relic/environment_report'
 
-class EnvironmentReportTest < Test::Unit::TestCase
+class EnvironmentReportTest < MiniTest::Unit::TestCase
   def setup
     @old_logic = ::NewRelic::EnvironmentReport.registered_reporters.dup
     @report = ::NewRelic::EnvironmentReport.new
@@ -31,12 +31,10 @@ class EnvironmentReportTest < Test::Unit::TestCase
   end
 
   def test_report_on_handles_errors_gracefully
-    assert_nothing_raised do
-      ::NewRelic::EnvironmentReport.report_on("What time is it?") do
-        raise ArgumentError, "woah! something blew up"
-      end
-      assert_nil ::NewRelic::EnvironmentReport.new["What time is it?"]
+    ::NewRelic::EnvironmentReport.report_on("What time is it?") do
+      raise ArgumentError, "woah! something blew up"
     end
+    assert_nil ::NewRelic::EnvironmentReport.new["What time is it?"]
   end
 
   def test_it_does_not_set_keys_for_nil_values

data/test/new_relic/fake_collector.rb

@@ -270,7 +270,6 @@ module NewRelic
       class SubmittedTransactionTraceTree
         def initialize(body, format)
           @body = body
-          @body = AgentPost.unblob(@body) if format == :json
         end
 
         def request_params
@@ -295,7 +294,7 @@ module NewRelic
 
       def initialize(opts={})
         super
-        @body[4] = unblob(@body[4]) if @format == :json
+        @body[1][0][4] = unblob(@body[1][0][4]) if @format == :json
       end
 
       def samples
@@ -318,159 +317,3 @@ module NewRelic
   end
 
 end
-
-if $0 == __FILE__
-  require 'test/unit'
-  require 'net/http'
-
-  class FakeCollectorTest < Test::Unit::TestCase
-    def setup
-      @collector = NewRelic::FakeCollector.new
-      @collector.run
-    end
-
-    def teardown
-      @collector.stop
-    end
-
-    def test_get_redirect
-      @collector.mock['get_redirect_host'].evaluate = [200, 'test.example.com']
-      response = invoke('get_redirect_host')
-
-      assert_equal 'test.example.com', response
-      assert_equal 'get_redirect_host', @collector.agent_data[0].action
-    end
-
-    def test_connect
-      response = invoke('connect')
-
-      assert_equal 1, response['agent_run_id']
-      assert_equal 'connect', @collector.agent_data[0].action
-    end
-
-    def test_metric_data
-      response = invoke('metric_data?run_id=1',
-                        {'Foo/Bar' => [1,2,3], 'Baz/Cux' => [4,5,6]})
-
-      assert_equal 1, response['Some/Metric/Spec']
-      post = @collector.agent_data[0]
-      assert_equal 'metric_data', post.action
-      assert_equal({'Foo/Bar' => [1,2,3], 'Baz/Cux' => [4,5,6]}, post.body)
-      assert_equal 1, post.run_id.to_i
-    end
-
-    def test_sql_trace_data
-      response = invoke('sql_trace_data?run_id=2',
-                        ['trace', 'trace', 'trace'])
-
-      assert_nil response
-      post = @collector.agent_data[0]
-      assert_equal 'sql_trace_data', post.action
-      assert_equal ['trace', 'trace', 'trace'], post.body
-      assert_equal 2, post.run_id.to_i
-    end
-
-    def test_transaction_sample_data
-      response = invoke('transaction_sample_data?run_id=3',
-                        ['node', ['node', 'node'], 'node'])
-
-      assert_nil response
-      post = @collector.agent_data[0]
-      assert_equal 'transaction_sample_data', post.action
-      assert_equal ['node', ['node', 'node'], 'node'], post.body
-      assert_equal 3, post.run_id.to_i
-    end
-
-    def test_transaction_sample_data_json
-      response = invoke('transaction_sample_data?run_id=3&marshal_format=json',
-                        '["node",["node","node"],"node"]')
-
-      assert_equal '', response
-      post = @collector.agent_data[0]
-      assert_equal 'transaction_sample_data', post.action
-      assert_equal '["node",["node","node"],"node"]', post.body
-      assert_equal 3, post.run_id.to_i
-    end
-
-    def test_error_data
-      response = invoke('error_data?run_id=4', ['error'])
-
-      assert_nil response
-      post = @collector.agent_data[0]
-      assert_equal 'error_data', post.action
-      assert_equal ['error'], post.body
-    end
-
-    def test_analytic_event_data
-      events = [
-        {
-          'type' => 'Transaction',
-          'name' => 'Controller/foo/bar',
-          'duration' => '718',
-          'timestamp' => 1368489547.888435
-        }
-      ]
-      response = invoke('analytic_event_data', [33, events])
-
-      assert_nil response['return_value']
-      post = @collector.agent_data[0]
-      assert_equal 'analytic_event_data', post.action
-      assert_equal events, post.body
-      assert_equal 33, post.run_id.to_i
-    end
-
-    def test_shutdown
-      response = invoke('shutdown?run_id=1')
-
-      assert_nil response
-      assert_equal 'shutdown', @collector.agent_data[0].action
-    end
-
-    def test_multiple_invokations
-      pid = Process.fork do
-        invoke('get_redirect_host')
-        invoke('connect')
-        invoke('metric_data?run_id=1')
-        invoke('transaction_sample_data?run_id=1')
-        invoke('shutdown?run_id=1')
-      end
-      invoke('get_redirect_host')
-      invoke('connect')
-      invoke('metric_data?run_id=2')
-      invoke('transaction_sample_data?run_id=2')
-      invoke('shutdown?run_id=2')
-
-      Process.wait(pid)
-
-      expected = ['get_redirect_host', 'connect', 'metric_data',
-                  'transaction_sample_data', 'shutdown',
-                  'get_redirect_host', 'connect', 'metric_data',
-                  'transaction_sample_data', 'shutdown']
-      assert_equal expected.sort, @collector.agent_data.map(&:action).sort
-    end
-
-    def test_reset
-      @collector.mock['get_redirect_host'].evaluate = [200, 'never!']
-      @collector.reset
-      assert_equal [200, 'localhost'], @collector.mock['get_redirect_host'].evaluate
-    end
-
-    def invoke(method, post={}, code=200)
-      uri = URI.parse("http://127.0.0.1:#{@collector.determine_port}/agent_listener/8/12345/#{method}")
-      request = Net::HTTP::Post.new("#{uri.path}?#{uri.query}")
-      if uri.query && uri.query.include?('marshal_format=json')
-        request.body = JSON.dump(post)
-      else
-        request.body = Marshal.dump(post)
-      end
-      response = Net::HTTP.start(uri.host, uri.port) do |http|
-        http.request(request)
-      end
-      if uri.query && uri.query.include?('marshal_format=json')
-        JSON.load(response.body)
-      else
-        Marshal.load(response.body)
-      end
-    end
-  end
-end

data/test/new_relic/framework_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
 
 # Test logic around detecting or configuring framework
-class FrameworkTest < Test::Unit::TestCase
+class FrameworkTest < MiniTest::Unit::TestCase
 
   def setup
 
@@ -25,6 +25,7 @@ class FrameworkTest < Test::Unit::TestCase
   def teardown
     # Put things back how we found them
     ::NewRelic.send(:const_set, :TEST,  @old_newrelic_test_const)
+    NewRelic::Agent.reset_config
   end
 
   def test_detects_framework_via_loaded_libraries

data/test/new_relic/http_client_test_cases.rb

@@ -5,7 +5,6 @@
 require "newrelic_rpm"
 require "fake_external_server"
 require "evil_server"
-require 'mocha'
 require 'multiverse_helpers'
 
 module HttpClientTestCases
@@ -413,7 +412,7 @@ module HttpClientTestCases
   # https://newrelic.atlassian.net/browse/RUBY-1244
   def test_failure_in_our_start_code_still_records_externals
     # Fake a failure in our start-up code...
-    NewRelic.stubs(:json_dump).raises("Boom!")
+    NewRelic::JSONWrapper.stubs(:dump).raises("Boom!")
 
     with_config(:"cross_application_tracer.enabled" => true) do
       get_response
@@ -425,7 +424,7 @@ module HttpClientTestCases
   # https://newrelic.atlassian.net/browse/RUBY-1244
   def test_failure_to_add_tt_node_doesnt_append_params_to_wrong_segment
     # Fake a failure in our start-up code...
-    NewRelic.stubs(:json_dump).raises("Boom!")
+    NewRelic::JSONWrapper.stubs(:dump).raises("Boom!")
 
     in_transaction do
       with_config(:"cross_application_tracer.enabled" => true) do

data/test/new_relic/json_wrapper_test.rb

@@ -0,0 +1,77 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
+require 'test/unit'
+require 'newrelic_rpm'
+
+class JSONWrapperTest < Test::Unit::TestCase
+  def test_json_roundtrip
+    obj = [
+      99, 'luftballons',
+      {
+        'Hast du etwas' => 'Zeit für mich',
+        'Dann singe ich' => {
+          'ein lied' => 'für dich'
+        }
+      }
+    ]
+    copy = NewRelic::JSONWrapper.load(NewRelic::JSONWrapper.dump(obj))
+    assert(obj == copy)
+  end
+
+  if NewRelic::LanguageSupport.supports_string_encodings?
+    def test_normalize_string_returns_input_if_correctly_encoded_utf8
+      string = "i want a pony"
+      result = NewRelic::JSONWrapper.normalize_string(string)
+      assert_same(string, result)
+      assert_equal(Encoding.find('UTF-8'), result.encoding)
+    end
+
+    def test_normalize_string_returns_munged_copy_if_ascii_8bit
+      string = (0..255).to_a.pack("C*")
+      result = NewRelic::JSONWrapper.normalize_string(string)
+      assert_not_same(string, result)
+      assert_equal(Encoding.find('ISO-8859-1'), result.encoding)
+      assert_equal(string, result.dup.force_encoding('ASCII-8BIT'))
+    end
+
+    def test_normalize_string_returns_munged_copy_if_invalid_utf8
+      string = (0..255).to_a.pack("C*").force_encoding('UTF-8')
+      result = NewRelic::JSONWrapper.normalize_string(string)
+      assert_not_same(result, string)
+      assert_equal(Encoding.find('ISO-8859-1'), result.encoding)
+      assert_equal(string, result.dup.force_encoding('UTF-8'))
+    end
+
+    def test_normalize_string_returns_munged_copy_if_other_convertible_encoding
+      string = "i want a pony".encode('UTF-16LE')
+      result = NewRelic::JSONWrapper.normalize_string(string)
+      assert_not_same(result, string)
+      assert_equal(Encoding.find('UTF-8'), result.encoding)
+      assert_equal(string, result.encode('UTF-16LE'))
+    end
+
+    def test_normalize_string_returns_munged_copy_if_other_non_convertible_enocding
+      # Attempting to convert from UTF-7 to UTF-8 in Ruby will raise an
+      # Encoding::ConverterNotFoundError, which is what we're trying to
+      # replicate for this test case.
+      # The following UTF-7 string decodes to 'Jyväskylä', a city in Finland
+      string = "Jyv+AOQ-skyl+AOQ-".force_encoding("UTF-7")
+      assert string.valid_encoding?
+      result = NewRelic::JSONWrapper.normalize_string(string)
+      assert_not_same(result, string)
+      assert_equal(Encoding.find('ISO-8859-1'), result.encoding)
+      assert_equal('Jyv+AOQ-skyl+AOQ-'.force_encoding('ISO-8859-1'), result)
+    end
+
+    def test_normalizes_string_encodings_if_asked
+      string = (0..255).to_a.pack("C*")
+      encoded = NewRelic::JSONWrapper.dump([string], :normalize => true)
+      decoded = NewRelic::JSONWrapper.load(encoded)
+      expected = [string.dup.force_encoding('ISO-8859-1').encode('UTF-8')]
+      assert_equal(expected, decoded)
+    end
+  end
+end

data/test/new_relic/language_support_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
 
-class NewRelic::LanguageSupportTest < Test::Unit::TestCase
+class NewRelic::LanguageSupportTest < MiniTest::Unit::TestCase
   include ::NewRelic::TestHelpers::RuntimeDetection
 
   def test_object_space_usable_on_jruby_with_object_space_enabled

data/test/new_relic/license_test.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
 
 # look through the source code to enforce some simple rules that help us keep
 # our license data up to date.
-class LicenseTest < Test::Unit::TestCase
+class LicenseTest < MiniTest::Unit::TestCase
   include NewRelic::TestHelpers::FileSearching
 
   # A list of regexs that will likely match license info
@@ -80,7 +80,7 @@ class LicenseTest < Test::Unit::TestCase
       next if should_skip?(filename)
 
       first_thousand_bytes = File.read(filename, 1000)
-      assert_not_nil first_thousand_bytes, "#{filename} is shorter than 1000 bytes."
+      refute_nil first_thousand_bytes, "#{filename} is shorter than 1000 bytes."
 
       first_four_lines = first_thousand_bytes.split("\n")[0...4]
 

data/test/new_relic/load_test.rb

@@ -2,16 +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 File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
-require 'test/unit'
 require 'resolv'
-begin
-  require 'mocha/setup'
-rescue LoadError
-  require 'mocha'
-end
+require 'mocha/setup'
 
-class LoadTest < Test::Unit::TestCase
+class LoadTest < MiniTest::Unit::TestCase
   def test_loading_agent_when_disabled_does_not_resolv_addresses
     ::Resolv.expects(:getaddress).never
     ::IPSocket.expects(:getaddress).never

data/test/new_relic/local_environment_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::LocalEnvironmentTest < Test::Unit::TestCase
+class NewRelic::LocalEnvironmentTest < MiniTest::Unit::TestCase
 
   def self.teardown
     # To remove mock server instances from ObjectSpace

data/test/new_relic/metric_data_test.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
 require 'new_relic/metric_data'
-class NewRelic::MetricDataTest < Test::Unit::TestCase
+class NewRelic::MetricDataTest < MiniTest::Unit::TestCase
   def test_initialize_basic
     spec = mock('metric_spec')
     stats = mock('stats')

data/test/new_relic/metric_parser/metric_parser_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::MetricParser::MetricParserTest < Test::Unit::TestCase
+class NewRelic::MetricParser::MetricParserTest < MiniTest::Unit::TestCase
   class ::AnApplicationClass
   end
 

data/test/new_relic/metric_spec_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::MetricSpecTest < Test::Unit::TestCase
+class NewRelic::MetricSpecTest < MiniTest::Unit::TestCase
 
   def test_equal
     spec1 = NewRelic::MetricSpec.new('Controller')

data/test/new_relic/multiverse_helpers.rb

@@ -21,15 +21,11 @@ module MultiverseHelpers
 
   def setup_and_teardown_agent(opts = {}, &block)
     define_method(:setup) do
-      before_setup if respond_to?(:before_setup)
       setup_agent(opts, &block)
-      after_setup if respond_to?(:after_setup)
     end
 
     define_method(:teardown) do
-      before_teardown if respond_to?(:before_teardown)
       teardown_agent
-      after_teardown if respond_to?(:after_teardown)
     end
   end
 
@@ -134,29 +130,29 @@ module MultiverseHelpers
   extend self
 end
 
-if RUBY_VERSION < "1.8.7"
-  # No instance_exec in 1.8.6... sigh
-  #
-  # Cribbed from https://www.ruby-forum.com/topic/72172#101957, most straight
-  # forward implementation I could find without using ActiveSupport
-  class Object
-    unless defined? instance_exec # 1.9
-      def instance_exec(*arguments, &block)
-        block.bind(self)[*arguments]
-      end
-    end
-  end
-
-  class Proc
-    def bind(object)
-      block, time = self, Time.now
-      (class << object; self end).class_eval do
-        method_name = "__bind_#{time.to_i}_#{time.usec}"
-        define_method(method_name, &block)
-        method = instance_method(method_name)
-        remove_method(method_name)
-        method
-      end.bind(object)
-    end
-  end
-end
+#if RUBY_VERSION < "1.8.7"
+#  # No instance_exec in 1.8.6... sigh
+#  #
+#  # Cribbed from https://www.ruby-forum.com/topic/72172#101957, most straight
+#  # forward implementation I could find without using ActiveSupport
+#  class Object
+#    unless defined? instance_exec # 1.9
+#      def instance_exec(*arguments, &block)
+#        block.bind(self)[*arguments]
+#      end
+#    end
+#  end
+#
+#  class Proc
+#    def bind(object)
+#      block, time = self, Time.now
+#      (class << object; self end).class_eval do
+#        method_name = "__bind_#{time.to_i}_#{time.usec}"
+#        define_method(method_name, &block)
+#        method = instance_method(method_name)
+#        remove_method(method_name)
+#        method
+#      end.bind(object)
+#    end
+#  end
+#end