stack_activity_test.rb in ruboto-0.12.0.rc.0

- old
+ new
@@ -8,32 +8,22 @@
     sleep 1
   end
   assert @text_view
 end
 
-# ANDROID: 10, PLATFORM: 0.4.7,     JRuby: 1.7.0.dev      '28334966'         expected, but got '28335067'
-# ANDROID: 15, PLATFORM: STANDALONE, JRuby: 1.7.0         '[28, 33, 51, 68]' expected, but got '[28, 33, 47, 64]'
-# ANDROID: 16, PLATFORM: 0.4.8.dev, JRuby: 1.7.0.preview2 '[29, 34, 47, 64]' expected, but got '[28, 33, 47, 64]'
+# ANDROID: 10, PLATFORM: 0.5.3,      JRuby: 1.7.3          '[28, 33, 46, 63]' expected, but got '[43, 48, 45, 62]'
+# ANDROID: 10, PLATFORM: 0.5.4,      JRuby: 1.7.3          '[28, 33, 45, 62]' expected, but got '[28, 33, 44, 61]'
+# ANDROID: 15, PLATFORM: STANDALONE, JRuby: 1.7.0          '[28, 33, 51, 68]' expected, but got '[28, 33, 47, 64]'
 test('stack depth') do |activity|
   os_offset = {
       10 => [0, 0, -1, -1],
       13 => [1, 1, 0, 0],
   }[android.os.Build::VERSION::SDK_INT] || [0, 0, 0, 0]
-  if org.ruboto.JRubyAdapter.uses_platform_apk?
-    jruby_offset = {
-        '0.4.7' => [0, 0, 4, 4],
-    }[org.ruboto.JRubyAdapter.platform_version_name] || [0, 0, 0, 0]
-  else # STANDALONE
-    jruby_offset = {
-        /^1\.6/ => [0, 0, 4, 4],
-        // => [0, 0, 0, 0],
-    }.find{|k,v| org.jruby.runtime.Constants::VERSION =~ k}[1]
-  end
   version_message ="ANDROID: #{android.os.Build::VERSION::SDK_INT}, PLATFORM: #{org.ruboto.JRubyAdapter.uses_platform_apk ? org.ruboto.JRubyAdapter.platform_version_name : 'STANDALONE'}, JRuby: #{org.jruby.runtime.Constants::VERSION}"
-  assert_equal [28 + os_offset[0] + jruby_offset[0],
-                33 + os_offset[1] + jruby_offset[1],
-                47 + os_offset[2] + jruby_offset[2],
-                64 + os_offset[3] + jruby_offset[3]], [activity.find_view_by_id(42).text.to_i,
-                                                    activity.find_view_by_id(43).text.to_i,
-                                                    activity.find_view_by_id(44).text.to_i,
-                                                    activity.find_view_by_id(45).text.to_i], version_message
+  assert_equal [28 + os_offset[0],
+                33 + os_offset[1],
+                45 + os_offset[2],
+                62 + os_offset[3]], [activity.find_view_by_id(42).text.to_i,
+                                     activity.find_view_by_id(43).text.to_i,
+                                     activity.find_view_by_id(44).text.to_i,
+                                     activity.find_view_by_id(45).text.to_i], version_message
 end