brazenhead 0.4.1 → 0.4.2

data/features/brazenhead_target.feature

@@ -0,0 +1,15 @@
+Feature: Using the Brazenhead target
+
+  Scenario: Retrieving Id Values
+    When I call "id_from_name" with "snack" on the target "Brazenhead"
+    Then I should receive an id value back from the Brazenhead module
+
+  Scenario: Clicking on spinner items by id
+    Given I'm on the controls screen
+    When I select item "4" from the spinner with id "spinner1"
+    Then the text "Jupiter" is selected in the spinner
+
+  Scenario: Clicking on spinner items by view
+    Given I'm on the controls screen
+    When I select item "6" from the spinner view with id "spinner1"
+    Then the text "Uranus" is selected in the spinner

data/features/step_definitions/brazenhead_target_steps.rb

@@ -0,0 +1,32 @@
+When /^I call "(.*?)" with "(.*?)" on the target "(.*?)"$/ do |method, arg, target|
+  @driver.send method, arg, :target => target
+end
+
+Then /^I should receive an id value back from the Brazenhead module$/ do
+  @driver.last_response.body.to_i.should be > 0
+end
+
+Given /^I'm on the controls screen$/ do
+  @driver.click_on_text "Views"
+  @driver.click_on_text "Controls"
+  @driver.click_on_text "Light Theme"
+end
+
+When /^I select item "(.*?)" from the spinner with id "(.*?)"$/ do |index, id|
+  @driver.chain_calls do |device|
+    device.id_from_name id, :variable => '@@the_id@@', :target => 'Brazenhead'
+    device.press_spinner_item_by_id '@@the_id@@', index.to_i, :target => 'Brazenhead'
+  end
+end
+
+When /^I select item "(.*?)" from the spinner view with id "(.*?)"$/ do |index, id|
+  @driver.chain_calls do |device|
+    device.id_from_name id, :variable => '@@the_id@@', :target => 'Brazenhead'
+    device.get_view '@@the_id@@', :variable => '@@the_view@@', :target => 'Robotium'
+    device.press_spinner_item '@@the_view@@', index.to_i, :target => 'Brazenhead'
+  end
+end
+
+Then /^the text "(.*?)" is selected in the spinner$/ do |spinner_text|
+  @driver.is_spinner_text_selected(spinner_text).should be_true
+end

data/lib/brazenhead.rb

@@ -20,6 +20,10 @@ module Brazenhead
     @last_response
   end
 
+  def last_json
+    device.last_json
+  end
+
   private
 
   def call_method_on_driver(method, args)

data/lib/brazenhead/builder.rb

@@ -28,7 +28,6 @@ module Brazenhead
       Dir.chdir(dir) do |here|
         copy_base_files
         update_test_manifest
-        store_resources
         sign test_apk, @keystore
         reinstall test_apk
         reinstall @source_apk
@@ -58,12 +57,6 @@ module Brazenhead
       File.write(file, File.read(file).gsub(match, replacement))
     end
 
-    def store_resources
-      Dir.mkdir "assets"
-      dump_resources @source_apk, "assets/resources.txt"
-      add_file test_apk, "assets/resources.txt"
-    end
-
     def the_target
       @the_target ||= manifest_info.package
     end

data/lib/brazenhead/device.rb

@@ -26,11 +26,24 @@ module Brazenhead
       @last_response
     end
 
+    def last_json
+      body = last_response.body
+      begin
+        JSON.parse body
+      rescue
+        primitive_to_json body
+      end
+    end
+
     private
 
     def http
       @http ||= Net::HTTP.new '127.0.0.1', 7777
     end
 
+    def primitive_to_json(string)
+      JSON.parse("{\"value\": #{string}}")["value"]
+    end
+
   end
 end

data/lib/brazenhead/package.rb

@@ -10,11 +10,6 @@ module Brazenhead
       process.run(*update, *package(apk), *with_the(manifest), *using(path_to(min_sdk)))
     end
 
-    def dump_resources(apk, resource_file)
-      process.run(*"aapt dump resources".split, apk)
-      File.write resource_file, process.last_stdout
-    end
-
     def add_file(apk, file)
         process.run(*"aapt add".split, apk, file)
     end

data/lib/brazenhead/server.rb

@@ -11,9 +11,9 @@ module Brazenhead
       @keystore = keystore
     end
 
-    def start(activity)
+    def start(activity, base_package = nil)
       build
-      instrument(runner, :packageName => their_package, :fullLauncherName => full(activity) , :class => the_test)
+      instrument(runner, :packageName => their_package, :fullLauncherName => full(activity, base_package) , :class => the_test)
     end
 
     def stop
@@ -34,8 +34,8 @@ module Brazenhead
       "#{leandog}.TheTest"
     end
 
-    def full(activity)
-      "#{their_package}.#{activity}"
+    def full(activity, base_package)
+      "#{base_package || their_package}.#{activity}"
     end
 
     def their_package

data/lib/brazenhead/version.rb

@@ -1,3 +1,3 @@
 module Brazenhead
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/lib/brazenhead/builder_spec.rb

@@ -70,30 +70,6 @@ describe Brazenhead::Builder do
       end
     end
 
-    context "grabbing resource information" do
-      it "should retrieve resource information from the target package" do
-        process.should_receive(:run).with(*"aapt dump resources #{expanded_apk}".split)
-        server.build_for apk, keystore
-      end
-
-      it "should create an assets directory for the resource information" do
-        Dir.should_receive(:mkdir).with("assets")
-        server.build_for apk, keystore
-      end
-
-      it "should write the resource information to the assets directory" do
-        process.should_receive(:last_stdout).and_return("resource info")
-        resources = "assets/resources.txt"
-        File.should_receive(:write).with(resources, "resource info")
-        server.build_for apk, keystore
-      end
-
-      it "should store the resources in the test server" do
-        process.should_receive(:run).with(*"aapt add #{driver_apk} assets/resources.txt".split)
-        server.build_for apk, keystore
-      end
-    end
-
     context "updating the manifest" do
       it "should load the contents of the existing manifest" do
         File.should_receive(:read).with("AndroidManifest.xml")

data/spec/lib/brazenhead/device_spec.rb

@@ -34,4 +34,31 @@ describe Brazenhead::Device do
     http_response.stub(:body).and_return("the error message")
     expect { device.send "blah" }.to raise_error(Exception, "the error message")
   end
+
+  context "json responses" do
+    it "should be able to be returned" do
+      http_response.should_receive(:body).and_return("{\"some_actual\": \"json object\"}")
+      device.send ""
+      device.last_json.should eq({"some_actual" => "json object"})
+    end
+
+    it "should be able to send back strings as normal strings" do
+      http_response.should_receive(:body).and_return("\"string only\"")
+      device.send ""
+      device.last_json.should eq("string only")
+    end
+
+    it "should be able to return numbers only" do
+      http_response.should_receive(:body).and_return("123")
+      device.send ""
+      device.last_json.should eq(123)
+    end
+
+    it "should be able to return boolean values" do
+      http_response.should_receive(:body).and_return("false")
+      device.send ""
+      device.last_json.should be_false
+    end
+  end
+
 end

data/spec/lib/brazenhead/server_spec.rb

@@ -63,6 +63,12 @@ describe Brazenhead::Server do
       server.start(activity)
     end
 
+    it "should be able to start activites that are not relative to the base package" do
+      expected = {:packageName => 'com.example', :fullLauncherName => 'com.other.SomeActivity', :class => 'com.leandog.brazenhead.TheTest'}
+      server.should_receive(:instrument).with(runner, expected)
+      server.start(activity, 'com.other')
+    end
+
     it "should be able to stop instrumenting" do
       device = double('brazenhead-device')
       Brazenhead::Device.should_receive(:new).and_return(device)

data/spec/lib/brazenhead_spec.rb

@@ -34,5 +34,11 @@ describe Brazenhead do
       result = driver.foo_bar
       driver.last_response.should == result
     end
+
+    it "should be able to return the json result" do
+      http_response.stub(:body).and_return("false")
+      driver.foo_bar
+      driver.last_json.should be_false
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brazenhead
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -87,15 +87,15 @@ extra_rdoc_files: []
 files:
 - driver/AndroidManifest.xml
 - features/brazenhead.feature
+- features/brazenhead_target.feature
 - features/exception.feature
 - features/robotium.feature
 - features/serialization.feature
 - features/step_definitions/brazenhead_steps.rb
+- features/step_definitions/brazenhead_target_steps.rb
 - features/step_definitions/exception_steps.rb
 - features/step_definitions/robotium_steps.rb
 - features/step_definitions/serialization_steps.rb
-- features/step_definitions/string_ids_steps.rb
-- features/strings_ids.feature
 - features/support/ApiDemos.apk
 - features/support/debug.keystore
 - features/support/env.rb
@@ -137,12 +137,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1605593656851575320
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1605593656851575320
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -152,15 +158,15 @@ summary: Driver that accepts remote json requests and invokes methods inside And
   emulator / device.
 test_files:
 - features/brazenhead.feature
+- features/brazenhead_target.feature
 - features/exception.feature
 - features/robotium.feature
 - features/serialization.feature
 - features/step_definitions/brazenhead_steps.rb
+- features/step_definitions/brazenhead_target_steps.rb
 - features/step_definitions/exception_steps.rb
 - features/step_definitions/robotium_steps.rb
 - features/step_definitions/serialization_steps.rb
-- features/step_definitions/string_ids_steps.rb
-- features/strings_ids.feature
 - features/support/ApiDemos.apk
 - features/support/debug.keystore
 - features/support/env.rb

data/features/step_definitions/string_ids_steps.rb

@@ -1,8 +0,0 @@
-When /^I call "(.*?)" with "(.*?)" on the target "(.*?)"$/ do |method, arg, target|
-  @driver.send method, arg, :target => target
-end
-
-Then /^I should receive an id value back from the Brazenhead module$/ do
-  @driver.last_response.body.to_i.should be > 0
-end
-

data/features/strings_ids.feature

@@ -1,5 +0,0 @@
-Feature: Retrieving id information from Brazenhead
-
-  Scenario: Retrieving Id Values
-    When I call "id_from_name" with "snack" on the target "Brazenhead"
-    Then I should receive an id value back from the Brazenhead module