calabash-android 0.0.15 → 0.0.16

data/CHANGES.txt

@@ -1,3 +1,7 @@
+0.0.16:
+      Clears text when calling set_text in a webview.
+      Added set_text helper method to support.
+
 0.0.15:
       Prefixes screenshots with feature name
 

data/lib/calabash-android/canned_steps.md

@@ -120,6 +120,8 @@ Presses the image button by index.
     Then /^I press view with id "([^\"]*)"$/
 
 Looks for a view with the provided id. If it is found and visible tries to click it.
+Note that use the short name and not the fully quantified name. That means if your id
+is 'com.foo.R.id.bar_label' you would use 'I press view with id "bar_label"'.
 
     Then /^I press "([^\"]*)"$/ do |identifier|
 Will look for a view in the following order:
@@ -165,6 +167,8 @@ Waits for a particular screen (Android Activity) to appear.
 
     Then /^I wait for the view with id "([^\"]*)" to appear$/ do |text|
 Waits for a view view that id to appear.
+Note that use the short name and not the fully quantified name. That means if your id
+is 'com.foo.R.id.bar_label' you would use 'I press view with id "bar_label"'.
 
     Then /^I wait upto (\d+) seconds for the "([^\"]*)" screen to appear$/ 
 Waits for a particular screen (Android Activity) to appear with a timeout.

data/lib/calabash-android/operations.rb

@@ -78,7 +78,7 @@ module Operations
   end
 
   def query(uiquery, *args)
-    raise "Currently only queries are only supported for webviews" unless uiquery.start_with? "webView"
+    raise "Currently queries are only supported for webviews" unless uiquery.start_with? "webView"
 
     uiquery.slice!(0, "webView".length)
     if uiquery =~ /(css|xpath):\s*(.*)/
@@ -169,7 +169,15 @@ module Operations
 
 
   def set_text(uiquery, txt)
-    ni
+    raise "Currently queries are only supported for webviews" unless uiquery.start_with? "webView"
+
+    uiquery.slice!(0, "webView".length)
+    if uiquery =~ /(css|xpath):\s*(.*)/
+      r = performAction("set_text", $1, $2, txt)
+      JSON.parse(r["message"])
+    else
+     raise "Invalid query #{uiquery}"
+    end
   end
 
 

data/lib/calabash-android/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Android
-    VERSION = "0.0.15"
-    FRAMEWORK_VERSION = "0.0.15"
+    VERSION = "0.0.16"
+    FRAMEWORK_VERSION = "0.0.16"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -120,7 +120,6 @@ files:
 - test-server/build.xml
 - test-server/instrumentation-backend/.classpath
 - test-server/instrumentation-backend/.project
-- test-server/instrumentation-backend/.settings/org.eclipse.jdt.core.prefs
 - test-server/instrumentation-backend/AndroidManifest.xml
 - test-server/instrumentation-backend/assets/foo.bar
 - test-server/instrumentation-backend/gen/com/lesspainful/simpleui/test/R.java
@@ -393,8 +392,6 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/map/deser/std/UntypedObjectDeserializer.java
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/map/deser/std/package-info.java
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/map/exc/UnrecognizedPropertyException.java
-- test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/map/ext/CoreXMLDeserializers.java
-- test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/map/ext/CoreXMLSerializers.java
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/map/ext/DOMDeserializer.java
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/map/ext/OptionalHandlerFactory.java
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/map/ext/package-info.java

data/test-server/instrumentation-backend/.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +0,0 @@
-#Mon Mar 19 14:45:07 BRT 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6

data/test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/map/ext/CoreXMLDeserializers.java

@@ -1,114 +0,0 @@
-package sh.calaba.org.codehaus.jackson.map.ext;
-
-import java.io.IOException;
-import java.util.*;
-
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-import sh.calaba.org.codehaus.jackson.JsonParser;
-import sh.calaba.org.codehaus.jackson.JsonProcessingException;
-import sh.calaba.org.codehaus.jackson.map.DeserializationContext;
-import sh.calaba.org.codehaus.jackson.map.deser.std.FromStringDeserializer;
-import sh.calaba.org.codehaus.jackson.map.deser.std.StdDeserializer;
-import sh.calaba.org.codehaus.jackson.map.deser.std.StdScalarDeserializer;
-import sh.calaba.org.codehaus.jackson.map.util.Provider;
-
-/**
- * Container deserializers that handle "core" XML types: ones included in standard
- * JDK 1.5. Types are directly needed by JAXB, and are thus supported within core
- * mapper package, not in "xc" package.
- *
- * @since 1.3
- */
-public class CoreXMLDeserializers
-    implements Provider<StdDeserializer<?>>
-{
-    /**
-     * Data type factories are thread-safe after instantiation (and
-     * configuration, if any); and since instantion (esp. implementation
-     * introspection) can be expensive we better reuse the instance.
-     */
-    final static DatatypeFactory _dataTypeFactory;
-    static {
-        try {
-            _dataTypeFactory = DatatypeFactory.newInstance();
-        } catch (DatatypeConfigurationException e) {
-            throw new RuntimeException(e);
-        }
-    }
-    
-    /*
-    /**********************************************************
-    /* Provider implementation
-    /**********************************************************
-     */
-
-    /**
-     * Method called by {@link sh.calaba.org.codehaus.jackson.map.deser.BasicDeserializerFactory}
-     * to register deserializers this class provides.
-     */
-    @Override
-    public Collection<StdDeserializer<?>> provide()
-    {
-        return Arrays.asList(new StdDeserializer<?>[] {
-            new DurationDeserializer()
-            ,new GregorianCalendarDeserializer()
-            ,new QNameDeserializer()
-        });
-    }
-    
-    /*
-    /**********************************************************
-    /* Concrete deserializers
-    /**********************************************************
-     */
-
-    public static class DurationDeserializer
-        extends FromStringDeserializer<Duration>
-    {
-        public DurationDeserializer() { super(Duration.class); }
-    
-        @Override
-        protected Duration _deserialize(String value, DeserializationContext ctxt)
-            throws IllegalArgumentException
-        {
-            return _dataTypeFactory.newDuration(value);
-        }
-    }
-
-    public static class GregorianCalendarDeserializer
-        extends StdScalarDeserializer<XMLGregorianCalendar>
-    {
-        public GregorianCalendarDeserializer() { super(XMLGregorianCalendar.class); }
-        
-        @Override
-        public XMLGregorianCalendar deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
-        {
-            Date d = _parseDate(jp, ctxt);
-            if (d == null) {
-                return null;
-            }
-            GregorianCalendar calendar = new GregorianCalendar();
-            calendar.setTime(d);
-            return _dataTypeFactory.newXMLGregorianCalendar(calendar);
-        }
-    }
-
-    public static class QNameDeserializer
-        extends FromStringDeserializer<QName>
-    {
-        public QNameDeserializer() { super(QName.class); }
-        
-        @Override
-        protected QName _deserialize(String value, DeserializationContext ctxt)
-            throws IllegalArgumentException
-        {
-            return QName.valueOf(value);
-        }
-    }
-}

data/test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/map/ext/CoreXMLSerializers.java

@@ -1,72 +0,0 @@
-package sh.calaba.org.codehaus.jackson.map.ext;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-import sh.calaba.org.codehaus.jackson.JsonGenerationException;
-import sh.calaba.org.codehaus.jackson.JsonGenerator;
-import sh.calaba.org.codehaus.jackson.JsonNode;
-import sh.calaba.org.codehaus.jackson.map.JsonMappingException;
-import sh.calaba.org.codehaus.jackson.map.JsonSerializer;
-import sh.calaba.org.codehaus.jackson.map.SerializerProvider;
-import sh.calaba.org.codehaus.jackson.map.ser.std.CalendarSerializer;
-import sh.calaba.org.codehaus.jackson.map.ser.std.SerializerBase;
-import sh.calaba.org.codehaus.jackson.map.ser.std.ToStringSerializer;
-import sh.calaba.org.codehaus.jackson.map.util.Provider;
-
-/**
- * Provider for serializers of XML types that are part of full JDK 1.5, but
- * that some alleged 1.5 platforms are missing (Android, GAE).
- * And for this reason these are added using more dynamic mechanism.
- *<p>
- * Note: since many of classes defined are abstract, caller must take
- * care not to just use straight equivalency check but rather consider
- * subclassing as well.
- *
- * @since 1.4
- */
-public class CoreXMLSerializers
-    implements Provider<Map.Entry<Class<?>,JsonSerializer<?>>>
-{
-    final static HashMap<Class<?>,JsonSerializer<?>> _serializers = new HashMap<Class<?>,JsonSerializer<?>>();
-    /**
-     * We will construct instances statically, during class loading, to try to
-     * make things fail-fast, i.e. to catch problems as soon as possible.
-     */
-    static {
-        ToStringSerializer tss = ToStringSerializer.instance;
-        _serializers.put(Duration.class, tss);
-        _serializers.put(XMLGregorianCalendar.class, new XMLGregorianCalendarSerializer());
-        _serializers.put(QName.class, tss);
-    }
-    
-    @Override
-    public Collection<Map.Entry<Class<?>,JsonSerializer<?>>> provide() {
-        return _serializers.entrySet();
-    }
-
-    public static class XMLGregorianCalendarSerializer extends SerializerBase<XMLGregorianCalendar>
-    {
-        public XMLGregorianCalendarSerializer() {
-            super(XMLGregorianCalendar.class);
-        }
-
-        @Override
-        public void serialize(XMLGregorianCalendar value, JsonGenerator jgen, SerializerProvider provider)
-                throws IOException, JsonGenerationException {
-            CalendarSerializer.instance.serialize(value.toGregorianCalendar(), jgen, provider);
-        }
-
-        @Override
-        public JsonNode getSchema(SerializerProvider provider, Type typeHint) throws JsonMappingException {
-            return CalendarSerializer.instance.getSchema(provider, typeHint);
-        }
-    }
-}