Merge pull request #2187 from dmarcotte/test-profiler

enebo · enebo · commit 553cf61ba83f · 2015-11-09T07:57:49.000-06:00
Fix JsonProfilePrinter
diff --git a/core/src/main/java/org/jruby/runtime/profile/builtin/ProfilePrinter.java b/core/src/main/java/org/jruby/runtime/profile/builtin/ProfilePrinter.java
@@ -98,7 +98,7 @@ public void printHeader(PrintStream out) { }
     public void printFooter(PrintStream out) { }
     
     public void printProfile(PrintStream out) {
-        printProfile(out, false);
+        printProfile(out, true);
     }
 
     public abstract void printProfile(PrintStream out, boolean first) ;
diff --git a/rakelib/test.rake b/rakelib/test.rake
@@ -22,7 +22,7 @@ namespace :test do
   short_tests_19 = short_tests_18.map {|test| test + "19"}
   short_tests = short_tests_18 + short_tests_19
   long_tests_18 = short_tests_18 + ['spec:ji', 'spec:compiler', 'spec:ffi', 'spec:regression']
-  long_tests_19 = long_tests_18.map {|test| test + "19"}
+  long_tests_19 = long_tests_18.map {|test| test + "19"} + ['spec:profiler19']
   slow_tests = ['test:slow', 'test:objectspace']
   long_tests = ['test:tracing'] + long_tests_18 + long_tests_19 + slow_tests
   all_tests_18 = long_tests_18.map {|test| test + ':all'}
diff --git a/spec/profiler/json_profile_printer_spec.rb b/spec/profiler/json_profile_printer_spec.rb
@@ -9,7 +9,7 @@
     end
     
     it 'contains only the top invocation' do
-      json_output['methods'].should have(1).items
+      json_output['methods'].length.should equal(1)
       json_output['methods'].first['name'].should == '(top)'
     end
 
@@ -53,7 +53,7 @@
       end
 
       it 'contains data on the calls from parents, including calls, total, self and child time' do
-        method_invocation['parents'].should have(1).item
+        method_invocation['parents'].length.should equal(1)
         call_data = method_invocation['parents'].find { |c| c['id'] == top_invocation['id'] }
         call_data.should include('total_calls' => 1, 'total_time' => anything, 'self_time' => anything, 'child_time' => anything)
       end
diff --git a/spec/profiler/runtime_spec.rb b/spec/profiler/runtime_spec.rb
@@ -35,10 +35,10 @@
       check_passed_spec @runtime.evalScriptlet("RSpec::Core::Runner.run([ 'spec/profiler/graph_profile_printer_spec.rb' ], ERR_IO, OUT_IO)")
     end
     
-    def check_passed_spec(outcome)
+    def check_passed_spec(exit_status)
       # print any errors if occured :
       @runtime.evalScriptlet("puts ERR_IO.string unless ERR_IO.string.empty?")
-      passed = (outcome.to_s.should == true.to_s)
+      passed = (exit_status == 0)
     ensure
       unless passed
         puts "spec not passed, output: \n"

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public void printHeader(PrintStream out) { }`
`98`	`98`	`public void printFooter(PrintStream out) { }`
`99`	`99`
`100`	`100`	`public void printProfile(PrintStream out) {`
`101`		`- printProfile(out, false);`
	`101`	`+ printProfile(out, true);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`public abstract void printProfile(PrintStream out, boolean first) ;`