stack_activity_test.rb in ruboto-0.10.1

- old
+ new
@@ -19,26 +19,22 @@
       15 => [0, 0, 1, 1],
       16 => [0, 0, 1, 1],
   }[android.os.Build::VERSION::SDK_INT] || [0, 0, 0, 0]
   if org.ruboto.JRubyAdapter.uses_platform_apk?
     jruby_offset = {
-        '0.4.7' => [0, 0, 0, 0],
-        '0.4.8.dev' => [0, 0, -4, -4],
-        '0.4.8' => [0, 0, -4, -4],
-        '0.4.9' => [0, 0, -4, -4],
+        '0.4.7' => [0, 0, 4, 4],
     }[org.ruboto.JRubyAdapter.platform_version_name] || [0, 0, 0, 0]
   else # STANDALONE
     jruby_offset = {
-        '1.7.0.dev' => [1, 1, 1, 1],
-        '1.7.0' => [0, 0, -4, -4],
-        '1.7.1.dev' => [0, 0, -4, -4],
-    }[org.jruby.runtime.Constants::VERSION] || [0, 0, 0, 0]
+        /^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],
-                50 + os_offset[2] + jruby_offset[2],
-                67 + os_offset[3] + jruby_offset[3]], [activity.find_view_by_id(42).text.to_i,
+                46 + os_offset[2] + jruby_offset[2],
+                63 + 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
 end