ruboto 0.9.0 → 0.10.0.rc.0
Sign up to get free protection for your applications and to get access to all the features.
- data/README.md +13 -13
- data/Rakefile +4 -4
- data/assets/rakelib/ruboto.rake +8 -4
- data/assets/samples/sample_broadcast_receiver.rb +0 -8
- data/assets/src/InheritingBroadcastReceiver.java +0 -19
- data/assets/src/InheritingClass.java +1 -8
- data/assets/src/RubotoActivity.java +1 -20
- data/assets/src/RubotoBroadcastReceiver.java +15 -25
- data/assets/src/RubotoService.java +1 -15
- data/assets/src/org/ruboto/EntryPointActivity.java +0 -1
- data/assets/src/org/ruboto/JRubyAdapter.java +9 -8
- data/assets/src/org/ruboto/RubotoComponent.java +0 -3
- data/assets/src/org/ruboto/Script.java +9 -9
- data/assets/src/org/ruboto/ScriptInfo.java +0 -15
- data/assets/src/org/ruboto/ScriptLoader.java +31 -43
- data/assets/src/ruboto/activity.rb +16 -41
- data/assets/src/ruboto/base.rb +0 -70
- data/assets/src/ruboto/broadcast_receiver.rb +2 -22
- data/assets/src/ruboto/package.rb +0 -1
- data/assets/src/ruboto/preference.rb +7 -3
- data/assets/src/ruboto/service.rb +14 -51
- data/assets/src/ruboto/widget.rb +2 -2
- data/lib/DexClient.java +10 -3
- data/lib/ruboto/util/build.rb +0 -5
- data/lib/ruboto/util/code_formatting.rb +1 -1
- data/lib/ruboto/util/update.rb +69 -50
- data/lib/ruboto/util/verify.rb +6 -5
- data/lib/ruboto/util/xml_element.rb +16 -29
- data/lib/ruboto/version.rb +2 -2
- data/test/activity/mytest_activity.rb +56 -0
- data/test/activity/mytest_activity_test.rb +52 -0
- data/test/activity/mytest_otherfile_activity.rb +12 -0
- data/test/activity/navigation_activity.rb +1 -1
- data/test/activity/subclass_activity.rb +10 -5
- data/test/activity/subclass_activity_test.rb +17 -2
- data/test/activity/view_constants_activity.rb +42 -0
- data/test/activity/view_constants_activity_test.rb +30 -0
- data/test/app_test_methods.rb +31 -26
- data/test/broadcast_receiver_test.rb +3 -1
- data/test/ruboto_gen_test.rb +4 -4
- data/test/test_helper.rb +5 -2
- metadata +18 -38
- data/assets/src/ruboto.rb +0 -25
- data/assets/src/ruboto/legacy.rb +0 -220
- data/assets/src/ruboto/menu.rb +0 -88
- data/lib/java_class_gen/InheritingClass.java.erb +0 -10
- data/test/block_def_activity/image_button_activity.rb +0 -23
- data/test/block_def_activity/image_button_activity_test.rb +0 -21
- data/test/block_def_activity/image_button_and_button_activity.rb +0 -20
- data/test/block_def_activity/image_button_and_button_activity_test.rb +0 -27
- data/test/block_def_activity/margins_activity.rb +0 -18
- data/test/block_def_activity/margins_activity_test.rb +0 -25
- data/test/block_def_activity/option_menu_activity.rb +0 -26
- data/test/block_def_activity/option_menu_activity_test.rb +0 -17
- data/test/block_def_activity/psych_activity.rb +0 -35
- data/test/block_def_activity/psych_activity_test.rb +0 -16
- data/test/block_def_activity/stack_activity.rb +0 -25
- data/test/block_def_activity/stack_activity_test.rb +0 -39
- data/test/handle_activity/image_button_activity.rb +0 -21
- data/test/handle_activity/image_button_activity_test.rb +0 -21
- data/test/handle_activity/image_button_and_button_activity.rb +0 -24
- data/test/handle_activity/image_button_and_button_activity_test.rb +0 -27
- data/test/handle_activity/margins_activity.rb +0 -15
- data/test/handle_activity/margins_activity_test.rb +0 -25
- data/test/handle_activity/option_menu_activity.rb +0 -25
- data/test/handle_activity/option_menu_activity_test.rb +0 -20
- data/test/handle_activity/psych_activity.rb +0 -31
- data/test/handle_activity/psych_activity_test.rb +0 -16
- data/test/handle_activity/stack_activity.rb +0 -24
- data/test/handle_activity/stack_activity_test.rb +0 -47
- data/test/view_constants_test.rb +0 -103
@@ -1,47 +0,0 @@
|
|
1
|
-
activity org.ruboto.test_app.StackActivity
|
2
|
-
|
3
|
-
setup do |activity|
|
4
|
-
start = Time.now
|
5
|
-
loop do
|
6
|
-
@text_view = activity.findViewById(42)
|
7
|
-
break if @text_view || (Time.now - start > 60)
|
8
|
-
sleep 1
|
9
|
-
end
|
10
|
-
assert @text_view
|
11
|
-
end
|
12
|
-
|
13
|
-
# ANDROID: 15, PLATFORM: STANDALONE, JRuby: 1.6.7 '44697894' expected, but got '44687793'
|
14
|
-
# ANDROID: 15, PLATFORM: 0.4.8.dev, JRuby: 1.7.0.preview2 '[44, 68, 77, 93]' expected, but got '[44, 67, 76, 92]'
|
15
|
-
# ANDROID: 10, PLATFORM: STANDALONE, JRuby: 1.7.0.preview2 '[43, 67, 76, 92]' expected, but got '[43, 66, 75, 91]'
|
16
|
-
# ANDROID: 15, PLATFORM: STANDALONE, JRuby: 1.7.0.preview2 '[44, 68, 77, 93]' expected, but got '[44, 67, 76, 92]'
|
17
|
-
# ANDROID: 15, PLATFORM: STANDALONE, JRuby: 1.7.0 '[44, 68, 77, 93]' expected, but got '[44, 67, 76, 92]'
|
18
|
-
test('stack depth') do |activity|
|
19
|
-
os_offset = {13 => 1, 15 => 1, 16 => 1}[android.os.Build::VERSION::SDK_INT].to_i
|
20
|
-
if org.ruboto.JRubyAdapter.uses_platform_apk?
|
21
|
-
jruby_offset = {
|
22
|
-
'0.4.7' => [0, 0, 0, 0],
|
23
|
-
'0.4.8.dev' => [0, -1, -1, -1],
|
24
|
-
'0.4.8' => [0, -1, -1, -1],
|
25
|
-
'0.4.9' => [0, -1, -1, -1],
|
26
|
-
}[org.ruboto.JRubyAdapter.platform_version_name] || [0, 0, 0, 0]
|
27
|
-
else # STANDALONE
|
28
|
-
jruby_offset = {
|
29
|
-
'1.7.0.dev' => [1, 0, 0, 0],
|
30
|
-
'1.7.0.preview1' => [0, -1, -1, -1],
|
31
|
-
'1.7.0.preview2' => [0, -1, -1, -1],
|
32
|
-
'1.7.0' => [0, -1, -1, -1],
|
33
|
-
'1.7.1.dev' => [0, -1, -1, -1],
|
34
|
-
}[org.jruby.runtime.Constants::VERSION] || [0, 0, 0, 0]
|
35
|
-
end
|
36
|
-
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}"
|
37
|
-
expected = [43 + os_offset + jruby_offset[0],
|
38
|
-
67 + os_offset + jruby_offset[1],
|
39
|
-
76 + os_offset + jruby_offset[2],
|
40
|
-
92 + os_offset + jruby_offset[3]]
|
41
|
-
actual = [activity.find_view_by_id(42).text.to_i,
|
42
|
-
activity.find_view_by_id(43).text.to_i,
|
43
|
-
activity.find_view_by_id(44).text.to_i,
|
44
|
-
activity.find_view_by_id(45).text.to_i]
|
45
|
-
assert_equal expected, actual, version_message
|
46
|
-
puts "handle stack: #{version_message} #{actual.inspect}"
|
47
|
-
end
|
data/test/view_constants_test.rb
DELETED
@@ -1,103 +0,0 @@
|
|
1
|
-
require File.expand_path("test_helper", File.dirname(__FILE__))
|
2
|
-
require 'fileutils'
|
3
|
-
|
4
|
-
class ViewConstantsTest < Test::Unit::TestCase
|
5
|
-
SRC_DIR = "#{APP_DIR}/src"
|
6
|
-
|
7
|
-
def setup
|
8
|
-
generate_app
|
9
|
-
end
|
10
|
-
|
11
|
-
def teardown
|
12
|
-
cleanup_app
|
13
|
-
end
|
14
|
-
|
15
|
-
def test_view_constants
|
16
|
-
Dir.chdir APP_DIR do
|
17
|
-
activity_filename = "#{SRC_DIR}/ruboto_test_app_activity.rb"
|
18
|
-
assert File.exists? activity_filename
|
19
|
-
File.open(activity_filename, 'w') { |f| f << <<EOF }
|
20
|
-
require 'ruboto/activity'
|
21
|
-
require 'ruboto/widget'
|
22
|
-
|
23
|
-
ruboto_import_widgets :Button, :LinearLayout, :TextView
|
24
|
-
|
25
|
-
class RubotoTestAppActivity
|
26
|
-
def on_create(bundle)
|
27
|
-
super
|
28
|
-
$ruboto_test_app_activity = self
|
29
|
-
set_title 'Domo arigato, Mr Ruboto!'
|
30
|
-
|
31
|
-
self.content_view =
|
32
|
-
linear_layout :orientation => :vertical do
|
33
|
-
@text_view = text_view :text => 'What hath Matz wrought?', :id => 42, :width => :fill_parent,
|
34
|
-
:gravity => android.view.Gravity::CENTER, :text_size => 48.0
|
35
|
-
button :text => 'M-x butterfly', :width => :fill_parent, :id => 43, :on_click_listener => proc { butterfly }
|
36
|
-
end
|
37
|
-
rescue
|
38
|
-
puts "Exception creating activity: \#{$!}"
|
39
|
-
puts $!.backtrace.join("\\n")
|
40
|
-
end
|
41
|
-
|
42
|
-
def set_text(text)
|
43
|
-
@text_view.text = text
|
44
|
-
end
|
45
|
-
|
46
|
-
private
|
47
|
-
|
48
|
-
def butterfly
|
49
|
-
puts 'butterfly'
|
50
|
-
Thread.start do
|
51
|
-
begin
|
52
|
-
startService(android.content.Intent.new(application_context, $package.RubotoTestService.java_class))
|
53
|
-
rescue Exception
|
54
|
-
puts "Exception starting the service: \#{$!}"
|
55
|
-
puts $!.backtrace.join("\\n")
|
56
|
-
end
|
57
|
-
end
|
58
|
-
puts 'butterfly OK'
|
59
|
-
end
|
60
|
-
|
61
|
-
end
|
62
|
-
EOF
|
63
|
-
view_constants_test_filename = "#{APP_DIR}/test/src/ruboto_test_app_activity_test.rb"
|
64
|
-
assert File.exists? view_constants_test_filename
|
65
|
-
|
66
|
-
File.open(view_constants_test_filename, 'w') { |f| f << <<EOF }
|
67
|
-
activity Java::org.ruboto.test_app.RubotoTestAppActivity
|
68
|
-
java_import "android.view.ViewGroup"
|
69
|
-
java_import "android.view.Gravity"
|
70
|
-
java_import "android.os.Build"
|
71
|
-
|
72
|
-
setup do |activity|
|
73
|
-
start = Time.now
|
74
|
-
loop do
|
75
|
-
@text_view = activity.findViewById(42)
|
76
|
-
break if @text_view || (Time.now - start > 60)
|
77
|
-
sleep 1
|
78
|
-
end
|
79
|
-
assert @text_view
|
80
|
-
end
|
81
|
-
|
82
|
-
def view_constant(const)
|
83
|
-
View.convert_constant(const.downcase.to_sym)
|
84
|
-
end
|
85
|
-
|
86
|
-
test('LayoutParams Constants') do |activity|
|
87
|
-
ViewGroup::LayoutParams.constants.each do |const|
|
88
|
-
assert_equal ViewGroup::LayoutParams.const_get(const), view_constant(const)
|
89
|
-
end
|
90
|
-
end
|
91
|
-
|
92
|
-
test('Gravity Constants') do |activity|
|
93
|
-
Gravity.constants.each do |const|
|
94
|
-
assert_equal Gravity.const_get(const), view_constant(const)
|
95
|
-
end
|
96
|
-
end
|
97
|
-
EOF
|
98
|
-
|
99
|
-
end
|
100
|
-
run_app_tests
|
101
|
-
end
|
102
|
-
|
103
|
-
end
|