1 files changed, 50 insertions, 0 deletions
diff --git a/activesupport/test/notifications/instrumenter_test.rb b/activesupport/test/notifications/instrumenter_test.rb
new file mode 100644
index 0000000000..62a9b61464
--- /dev/null
+++ b/activesupport/test/notifications/instrumenter_test.rb
@@ -0,0 +1,50 @@
+require 'abstract_unit'
+require 'active_support/notifications/instrumenter'
+
+module ActiveSupport
+  module Notifications
+    class InstrumenterTest < ActiveSupport::TestCase
+      class TestNotifier
+        attr_reader :starts, :finishes
+
+        def initialize
+          @starts   = []
+          @finishes = []
+        end
+
+        def start(*args);  @starts << args; end
+        def finish(*args); @finishes << args; end
+      end
+
+      attr_reader :instrumenter, :notifier, :payload
+
+      def setup
+        super
+        @notifier     = TestNotifier.new
+        @instrumenter = Instrumenter.new @notifier
+        @payload      =  { :foo => Object.new }
+      end
+
+      def test_instrument
+        called  = false
+        instrumenter.instrument("foo", payload) {
+          called = true
+        }
+
+        assert called
+      end
+
+      def test_start
+        instrumenter.start("foo", payload)
+        assert_equal [["foo", instrumenter.id, payload]], notifier.starts
+        assert_predicate notifier.finishes, :empty?
+      end
+
+      def test_finish
+        instrumenter.finish("foo", payload)
+        assert_equal [["foo", instrumenter.id, payload]], notifier.finishes
+        assert_predicate notifier.starts, :empty?
+      end
+    end
+  end
+end