Sort diagnostics in scenario tests

Author: mame

lib/typeprof/code_range.rb

@@ -105,5 +105,10 @@ def to_s
     def ==(other)
       @first == other.first && @last == other.last
     end
+
+    def <=>(other)
+      cmp = @first <=> other.first
+      cmp == 0 ? @last <=> other.last : cmp
+    end
   end
 end

scenario/rbs/check-block-return.rb

@@ -13,6 +13,6 @@ def foo
 end
 
 ## diagnostics: test0.rb
-(11,2)-(11,5): expected: Integer; actual: Float
 (7,2)-(7,6): expected: Integer; actual: nil
 (9,2)-(9,12): expected: Integer; actual: String
+(11,2)-(11,5): expected: Integer; actual: Float

scenario/rbs/check-return-type.rb

@@ -9,6 +9,6 @@ def foo
 end
 
 ## diagnostics
-(7,2)-(7,5): expected: Integer; actual: Float
 (3,2)-(3,8): expected: Integer; actual: nil
 (5,2)-(5,14): expected: Integer; actual: String
+(7,2)-(7,5): expected: Integer; actual: Float

test/scenario_compiler.rb

@@ -115,9 +115,9 @@ def handle_diagnostics
     <<-END
 output = []
 core.diagnostics(#{ @file.dump }) {|diag|
-  output << (diag.code_range.to_s << ': ' << diag.msg)
+  output << [diag.code_range, diag.msg]
 }
-output = output.join(\"\\n\")
+output = output.sort.map {|cr, msg| cr.to_s + ": " + msg }.join(\"\\n\")
 assert_equal(%q\0DATA\0.rstrip, output)
     END
   end