Skip to content

Commit

Permalink
Merge pull request clojure#60 in MOB/climate-android from ~JMUSSELWHI…
Browse files Browse the repository at this point in the history 
…TE/josh-android:master to master

Squashed commit of the following:

commit a91c9cb00fe452d77a6c46a378fab0e9847b4e69
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 29 17:19:55 2014 -0700

    changed packages on test utils. fixed bug on editing CLU on planting

commit dd62f9c1353e0ba1277db994db2fc0ab48e72930
Merge: 114fcb6 988aa34
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 27 00:58:53 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '988aa34a87f415bd409d16d54dd05813235ce5fc':
      Merge pull request clojure#58 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#56 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Merge pull request clojure#55 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 114fcb61f15883b73ccfc6e8c420fa974acff0b0
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 26 17:51:43 2014 -0700

    changed url for furture radar server

commit d49694392e560fc5c7748cce401bc7aae42a4ca1
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 26 17:08:59 2014 -0700

    fixed a google map overlay bug

commit a59c838ca566ca6eb1e982dbf9ca1873f4a27f9f
Merge: 4e50a8d 7b51932
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 26 21:15:45 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '7b51932dc15711d38f6636843278bad05861ca4e':
      Merge pull request clojure#51 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#50 in MOB/climate-android from ~RJOSHI/climate-android:BASIC-45 to master
      Merge pull request clojure#49 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-187 to master
      [BUILD] Fixing a build break caused by merge resolving artifacts I accidentally left behind
      Merge pull request clojure#48 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-129 to master

commit 4e50a8d6d5819c7e23dd7ed026f08670b521f110
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 26 14:14:10 2014 -0700

    api endpoints changed on future radar

commit 46654b23ab85512b684ec9cb3dcac47a61cd7938
Merge: d19259f 31e0c81
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 24 23:49:43 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '31e0c81cf54cae458a403e4bdc8e1d90a39d9930':
      Merge pull request clojure#46 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit d19259ff442b1b3e15c00b178220cf73fed8b3ee
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 24 16:47:35 2014 -0700

    adding tweak to fix issue on emulator

commit ce3b254ffa26d2e5a00ff085097dac2c276918cd
Merge: 8295fc5 7dde0e6
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 24 16:29:59 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit 8295fc5ba0bbad1013811a23659f219c38fab4e2
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 24 16:29:31 2014 -0700

    added spoon to take screenshots before and after tests are ran

commit 7dde0e654a773cbb780a8ed47867c9174056bc3a
Merge: e9fa699 a2a281d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 24 19:11:16 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'a2a281d5a4590c02cc8d1e3126b4091938849050':
      Merge pull request clojure#43 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit e9fa699778ad683f7325803ae510fff5223b3ce8
Merge: f9fe1b8 c1c9606
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 24 00:17:33 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'c1c960659e5578f7a20347ec2bd412e633e6ffd8':
      Merge pull request clojure#42 in MOB/climate-android from ~NROSENBERG/climate-android:MOB-576 to master
      Merge pull request clojure#41 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-122 to master

commit f9fe1b877fa6209f90d6612959a76ad53c7d1b0f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 23 17:15:31 2014 -0700

    updated the ignore files

commit b07c691bf2e41bffa4699f32955040d2022f7352
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 23 17:13:46 2014 -0700

    removed build files

commit fff2dfa5244b94c753da584e5bf26bac7362acc5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 23 17:12:18 2014 -0700

    added support for spoon taking screenshots on espresso failure

commit 1f5c4a569e67c19325e1cbaf97439e7670400780
Merge: caa80d2 e5d0471
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 20 01:12:02 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5d047159080a320e90e8315365c539bfa3aff55':
      Merge pull request clojure#40 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit caa80d2c66ccc0bf1c87964b196a5d5ec6670c08
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 18:11:20 2014 -0700

    added test for multiple fields

commit dc34634a0217c3e8ec5bcf0c2874719caa472a76
Merge: 13d554f 6b6efb0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 20 01:04:09 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '6b6efb07787a2d7fefca17678003eb220fb44e62':
      Merge pull request clojure#39 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 13d554fe2650bbdb6caab96dcd6f1aafbdea90b0
Merge: 3369de0 1474c28
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 18:03:04 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/ui/PlantingFunctionalTest.java

commit 3369de0739d65fac9f64fdb8f0ded7d361191521
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 17:58:32 2014 -0700

    added test for adding multiple fields to a planting scout

commit e1d446af4b113a15c3dd3deddb3a5b5422157a74
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 14:58:10 2014 -0700

    added functional testing to the planting activity

commit fddd54d99adb83d62012af60ad8dfb55ca50afad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 14:57:08 2014 -0700

    added functional testing to the planting activity

commit 9ec9a84935db84ff4fd349c208477217f2183048
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 11:11:50 2014 -0700

    fixed a test case I broke

commit 317f95d2ce491cfaa0aab4a7ad41172245df0e68
Merge: a65c57e 82b9e64
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 19 17:41:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '82b9e643e56be19cfb156c61a514fede3955317e':
      Merge pull request clojure#36 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit a65c57e0003fe33b7693555e653c5f2a094e5d99
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 17:01:38 2014 -0700

    adjust validation on CLU Editor. Updated tests cases for it

commit 272a0a1732c4d36a393b412ae4d322d42a267adb
Merge: 4fd36c4 c0638c5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 18 20:14:01 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'c0638c5320261ea92c1ff871d32ea60d10a5e383':
      Merge pull request clojure#35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master
      Merge pull request clojure#34 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 4fd36c44b9b9c1609439c0298748cb46ab3dbdab
Merge: f239028 1599715
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:27:59 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/FieldsListSmokeTest.java

commit f2390282424ff79771be0eb8f02c42052876d9b9
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:23:27 2014 -0700

    added testing workability and sort order

commit 2cf46a4a7d3a82753cc6c38385db7b8aa7b01a6d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 10:54:02 2014 -0700

    minor test case change

commit 1a46521938924c7d99b12990103b37a34f83a464
Merge: 28b60c6 43440f4
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 17 17:46:24 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '43440f4550f5f8a73f12df5c78c3bd30cd03a17b':
      Merge pull request clojure#31 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 28b60c61c17c95741ec331373c964658cff8f828
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 17 10:44:35 2014 -0700

    minor test change

commit 8abc9dc519fd9823444a44b22a7da8bc33c8fc73
Merge: 9771b57 22195c3
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:46:27 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '22195c3204dd8f4955216cbbc9f523f6ced06c0b':
      Merge pull request clojure#30 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 9771b57d37626c7168b9665cc30ce9f866c9e9c3
Merge: c5d6157 5d2bd65
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:41 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit c5d6157e451ed03c08643ba3c629e717b89f15d0
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:12 2014 -0700

    added additional logging for when test fails

commit 5d2bd6556413d2aa0aedf714df85d39ffc2ac054
Merge: ca6a0f5 a759b85
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:15:43 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'a759b855cf60e894073a9b3756a0f13b1c5d3665':
      Merge pull request clojure#29 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit ca6a0f5babbb8e9c0e15bdf5ddff4335acc9fe69
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:10:51 2014 -0700

    merging down code

commit de9f77e84d73e7bb5c8b0bb3b9d086ba004b443a
Merge: 0ab6c52 c0327b4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:06 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit 0ab6c528769092fa8c22ab8c5c20b04221721f5d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:02 2014 -0700

    added login and out test flow

commit c0327b4fc13c89418e08bf36533dd05722bc955c
Merge: fef974b fdd7bd9
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:05:34 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'fdd7bd99f182ea21798b7ba18b3035e9505cd30f':
      Merge pull request clojure#28 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master

commit fef974ba5e14209211b9addc0d1563d3b3fcfccd
Merge: eea36d5 45ae29a
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 22:38:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '45ae29a5daa70aa3b73e34f5d637afb858dd4851':
      Merge pull request clojure#26 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit eea36d5154b6f910c7623333599066162ecbf6bb
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 15:36:39 2014 -0700

    check field details renders something

commit d7d110f9d967869952d532f495bdc711acb8a07f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 14:17:38 2014 -0700

    verifing fields loads are unique and complete

commit e4c249817e09001e31b7f0fd446c85899d9db5cf
Merge: cd2045d 9a02bbd
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 01:30:05 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d':
      Merge pull request clojure#25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit cd2045d746191a41f4dc8657984f8a3bf90bb88b
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 18:29:28 2014 -0700

    fixed a test bug

commit d563da337b94dd7131efa4afda61000f600162bf
Merge: e48219f 5b8d770
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 00:56:10 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273':
      Merge pull request clojure#24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit e48219f73ead40c975270d105c4e3d81f7e4f92e
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 17:55:20 2014 -0700

    added test for zoom on all fields and sorting by last24 next24 and workability

commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f
Merge: 4fd31c1 3fb9894
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 15 23:39:41 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8':
      Merge pull request clojure#23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      fix for update

commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 16:37:59 2014 -0700

    added test for SaaS links

commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
Merge: f688c1a 61e95c0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 13 00:41:21 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
      Merge pull request clojure#22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
Merge: 5e7b62b c070bc7
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:39:50 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
    	ClimateGrowersProject/ClimateGrowersApp/build.gradle
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:30:21 2014 -0700

    cleaned up tests

commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 15:25:35 2014 -0700

    udpated gradle to use test res

commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
Merge: 71d5f20 b8eb732
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 12 22:23:58 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
      fixed scouting delete
      scouting fix

commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
Merge: 36774a5 3c318d5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 22:41:08 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
      Merge pull request clojure#17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      added code for fixing update scouting

commit 36774a52a326a0baac0746df252c5eda2fe90d41
Merge: 79b5657 e5f845f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:30:29 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5f845f242fdc19c844601124a47103964f053ec':
      Merge pull request clojure#16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

commit 79b5657249e830bbc535c808d8a6a02b029962cf
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 11 10:05:18 2014 -0700

    map test consolidation

commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
Merge: 586a520 9b46015
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:04:04 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
      Merge pull request clojure#14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Incremented version

commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
Merge: f0cee81 3d01293
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 23:39:06 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
      Merge pull request clojure#13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 16:37:57 2014 -0700

    added returning to list after a scouting submit

commit 433c4a0dd89f05593c5bff9db774e638d48a182e
Merge: b1a99bf 108b943
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:59:23 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
      Merge pull request clojure#12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:58:33 2014 -0700

    added deleting of scouting event

commit c072e5241e776041a41fb68e7ec1abffa3cf4822
Merge: 7446fa4 f6ae870
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:54:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
      Merge pull request clojure#11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 7446fa48d55b6c27af16702e4235a938da4db7e5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:53:21 2014 -0700

    updated scouting for pics and refactored code

commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
Merge: acda078 305156d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 00:36:17 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
      Merge pull request clojure#10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit acda0781dbedb1607d69201a119c44c5afcdebad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 17:35:27 2014 -0700

    added test for imageviewer

commit 489e17858e6351785a2cfe07ee66b406873492b7
Merge: 975f03c e37df5c
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 8 23:59:47 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
      Merge pull request clojure#9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 16:58:43 2014 -0700

    added image viewer for scouting

commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
Merge: c7e20ad 2597440
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 6 00:17:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '2597440bd31c195f298f5795832260361844e964':
      Merge pull request clojure#8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 15:12:52 2014 -0700

    added test for MultipleField selectors

commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 14:09:08 2014 -0700

    fixed future radar bug. added tests for it
  • Loading branch information
@jmusselwhite
jmusselwhite committed Sep 30, 2014
1 parent c2f6857 commit d1af874
Show file tree
Hide file tree
Showing 24 changed files with 100 additions and 63 deletions.
68 changes: 40 additions & 28 deletions ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,41 @@
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="release" />
<option name="ASSEMBLE_TASK_NAME" value="assembleRelease" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseJava" />
<option name="SOURCE_GEN_TASK_NAME" value="generateReleaseSources" />
<option name="SELECTED_BUILD_VARIANT" value="qa" />
<option name="ASSEMBLE_TASK_NAME" value="assembleQa" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileQaJava" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleQaTest" />
<option name="SOURCE_GEN_TASK_NAME" value="generateQaSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateQaTestSources" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/release/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/qa/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/release" />
<output url="file://$MODULE_DIR$/build/intermediates/classes/qa" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/release" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/release" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/release" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/release" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/release" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/release/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/release/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/qa" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/qa" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/qa" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/qa" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/qa" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/qa" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/qa" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/qa" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/qa" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/qa" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/qa/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/qa/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/qa/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/qa/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/qa/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/qa/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/qa/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
Expand Down Expand Up @@ -74,28 +81,33 @@
</content>
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="analytics-android-0.6.11" level="project" />
<orderEntry type="library" exported="" name="lolay-logjam-2" level="project" />
<orderEntry type="library" exported="" name="httpclient-android-4.3.3" level="project" />
<orderEntry type="library" exported="" name="httpclientandroidlib-1.2.1" level="project" />
<orderEntry type="library" exported="" name="essentials-logger" level="project" />
<orderEntry type="library" exported="" name="library-1.2.3" level="project" />
<orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="jackson-databind-2.4.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="jackson-core-2.4.2" level="project" />
<orderEntry type="library" exported="" name="http-request-5.4" level="project" />
<orderEntry type="library" exported="" name="commons-lang-2.6" level="project" />
<orderEntry type="library" exported="" name="lolay-investigo-10" level="project" />
<orderEntry type="library" exported="" name="support-v13-19.1.0" level="project" />
<orderEntry type="library" exported="" name="lolay-erred-2" level="project" />
<orderEntry type="library" exported="" name="jackson-core-asl-1.9.13" level="project" />
<orderEntry type="library" exported="" name="lolay-strands-2" level="project" />
<orderEntry type="library" exported="" name="lolay-kat-5" level="project" />
<orderEntry type="library" exported="" name="essentials-loader" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="jackson-annotations-2.4.2" level="project" />
<orderEntry type="library" exported="" name="commons-io-1.3.2" level="project" />
<orderEntry type="library" exported="" name="analytics-android-0.6.11" level="project" />
<orderEntry type="library" exported="" name="httpclient-android-4.3.3" level="project" />
<orderEntry type="library" exported="" name="httpclientandroidlib-1.2.1" level="project" />
<orderEntry type="library" exported="" name="library-1.2.3" level="project" />
<orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="espresso-1.1-bundled" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="spoon-client-1.1.1" level="project" />
<orderEntry type="library" exported="" name="lolay-investigo-10" level="project" />
<orderEntry type="library" exported="" name="support-v13-19.1.0" level="project" />
<orderEntry type="library" exported="" name="play-services-4.4.52" level="project" />
<orderEntry type="library" exported="" name="lolay-kat-5" level="project" />
<orderEntry type="library" exported="" name="jackson-mapper-asl-1.9.13" level="project" />
<orderEntry type="library" exported="" name="essentials-loader" level="project" />
<orderEntry type="library" exported="" name="library-0.9.9" level="project" />
<orderEntry type="library" exported="" name="library-0.4.0" level="project" />
<orderEntry type="library" exported="" name="volley" level="project" />
<orderEntry type="library" exported="" name="commons-io-1.3.2" level="project" />
<orderEntry type="module" module-name="AndroidMapsExtensions" exported="" />
<orderEntry type="module" module-name="MapTileAnimationLib" exported="" />
</component>
Expand Down
2 changes: 1 addition & 1 deletion ...egration/smoke/action/CheckBoxAction.java → ...sts/functional/action/CheckBoxAction.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.climate.growers.android.tests.functional.integration.smoke.action;
package com.climate.growers.android.tests.functional.action;

import android.view.View;
import android.view.ViewConfiguration;
Expand Down
2 changes: 1 addition & 1 deletion ...ration/smoke/action/DatePickerAction.java → ...s/functional/action/DatePickerAction.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.climate.growers.android.tests.functional.integration.smoke.action;
package com.climate.growers.android.tests.functional.action;

import android.view.View;
import android.widget.DatePicker;
Expand Down
2 changes: 1 addition & 1 deletion ...tegration/smoke/action/MapZoomAction.java → ...ests/functional/action/MapZoomAction.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.climate.growers.android.tests.functional.integration.smoke.action;
package com.climate.growers.android.tests.functional.action;

import android.view.View;

Expand Down
2 changes: 1 addition & 1 deletion ...tion/smoke/action/NumberPickerAction.java → ...functional/action/NumberPickerAction.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.climate.growers.android.tests.functional.integration.smoke.action;
package com.climate.growers.android.tests.functional.action;

import android.view.View;
import android.widget.NumberPicker;
Expand Down
2 changes: 1 addition & 1 deletion ...ion/smoke/action/WaitForIdleUiAction.java → ...unctional/action/WaitForIdleUiAction.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.climate.growers.android.tests.functional.integration.smoke.action;
package com.climate.growers.android.tests.functional.action;

import android.view.View;

Expand Down
2 changes: 1 addition & 1 deletion ...moke/assertions/MapLocationAssertion.java → ...onal/assertions/MapLocationAssertion.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.climate.growers.android.tests.functional.integration.smoke.assertions;
package com.climate.growers.android.tests.functional.assertions;

import android.view.View;

Expand Down
2 changes: 1 addition & 1 deletion .../climate/growers/android/tests/functional/integration/smoke/ui/FieldDetailsSmokeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import com.climate.growers.android.managers.pojos.ClimateResponse;
import com.climate.growers.android.managers.pojos.DetailedField;
import com.climate.growers.android.managers.pojos.FieldLazyDetails;
import com.climate.growers.android.tests.functional.integration.smoke.matchers.ParentChildMatcher;
import com.climate.growers.android.tests.functional.matchers.ParentChildMatcher;
import com.climate.growers.android.tests.utils.ClimateInstrumentationTestCase2;
import com.climate.growers.android.ui.content.MainActivity;
import com.climate.growers.android.ui.navigation.NavigationFragment;
Expand Down
10 changes: 5 additions & 5 deletions ...om/climate/growers/android/tests/functional/integration/smoke/ui/FieldsListSmokeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
import com.climate.growers.android.managers.pojos.ClimateResponse;
import com.climate.growers.android.managers.pojos.FieldLazyDetails;
import com.climate.growers.android.managers.pojos.PagedData;
import com.climate.growers.android.tests.functional.integration.smoke.matchers.AdapterAllMatcher;
import com.climate.growers.android.tests.functional.integration.smoke.matchers.AdapterUniqueItemsMatcher;
import com.climate.growers.android.tests.functional.integration.smoke.matchers.AlertListPrefMatcher;
import com.climate.growers.android.tests.functional.integration.smoke.matchers.FieldLazyDetailsMatcher;
import com.climate.growers.android.tests.functional.integration.smoke.matchers.PrefMatcher;
import com.climate.growers.android.tests.functional.matchers.AdapterAllMatcher;
import com.climate.growers.android.tests.functional.matchers.AdapterUniqueItemsMatcher;
import com.climate.growers.android.tests.functional.matchers.AlertListPrefMatcher;
import com.climate.growers.android.tests.functional.matchers.FieldLazyDetailsMatcher;
import com.climate.growers.android.tests.functional.matchers.PrefMatcher;
import com.climate.growers.android.tests.utils.AssetsUtil;
import com.climate.growers.android.tests.utils.ClimateInstrumentationTestCase2;
import com.climate.growers.android.ui.content.MainActivity;
Expand Down
6 changes: 3 additions & 3 deletions ...ava/com/climate/growers/android/tests/functional/integration/smoke/ui/LoginSmokeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import com.climate.growers.android.R;
import com.climate.growers.android.managers.pojos.FieldLazyDetails;
import com.climate.growers.android.tests.functional.integration.smoke.action.WaitForIdleUiAction;
import com.climate.growers.android.tests.functional.integration.smoke.matchers.AdapterAllMatcher;
import com.climate.growers.android.tests.functional.integration.smoke.matchers.FieldLazyDetailsMatcher;
import com.climate.growers.android.tests.functional.action.WaitForIdleUiAction;
import com.climate.growers.android.tests.functional.matchers.AdapterAllMatcher;
import com.climate.growers.android.tests.functional.matchers.FieldLazyDetailsMatcher;
import com.climate.growers.android.tests.utils.AnyVisiblityClickAction;
import com.climate.growers.android.tests.utils.AssetsUtil;
import com.climate.growers.android.tests.utils.ClimateInstrumentationTestCase2;
Expand Down
2 changes: 1 addition & 1 deletion .../climate/growers/android/tests/functional/integration/smoke/ui/MapFromFieldSmokeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.climate.growers.android.managers.pojos.ClimateResponse;
import com.climate.growers.android.managers.pojos.FieldLazyDetails;
import com.climate.growers.android.managers.pojos.LatLong;
import com.climate.growers.android.tests.functional.integration.smoke.assertions.MapLocationAssertion;
import com.climate.growers.android.tests.functional.assertions.MapLocationAssertion;
import com.climate.growers.android.tests.utils.ClimateInstrumentationTestCase2;
import com.climate.growers.android.ui.content.FieldDetailsActivity;
import com.google.android.apps.common.testing.ui.espresso.Espresso;
Expand Down
6 changes: 3 additions & 3 deletions .../java/com/climate/growers/android/tests/functional/integration/smoke/ui/MapSmokeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
import com.climate.growers.android.managers.pojos.Precipitation;
import com.climate.growers.android.managers.pojos.Temperature;
import com.climate.growers.android.models.ClimateModel;
import com.climate.growers.android.tests.functional.integration.smoke.action.MapZoomAction;
import com.climate.growers.android.tests.functional.integration.smoke.action.WaitForIdleUiAction;
import com.climate.growers.android.tests.functional.integration.smoke.assertions.MapLocationAssertion;
import com.climate.growers.android.tests.functional.action.MapZoomAction;
import com.climate.growers.android.tests.functional.action.WaitForIdleUiAction;
import com.climate.growers.android.tests.functional.assertions.MapLocationAssertion;
import com.climate.growers.android.tests.utils.ClimateInstrumentationTestCase2;
import com.climate.growers.android.tests.utils.MockVolleyNetwork;
import com.climate.growers.android.ui.content.MapActivity;
Expand Down
2 changes: 1 addition & 1 deletion ...growers/android/tests/functional/integration/smoke/ui/MultipleFieldSelectorSmokeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.climate.growers.android.R;
import com.climate.growers.android.listAdapters.FieldsMultipleSelectorAdapter;
import com.climate.growers.android.managers.pojos.FieldSummary;
import com.climate.growers.android.tests.functional.integration.smoke.matchers.FieldSummaryMatcher;
import com.climate.growers.android.tests.functional.matchers.FieldSummaryMatcher;
import com.climate.growers.android.tests.utils.ClimateInstrumentationTestCase2;
import com.climate.growers.android.ui.scouting.MultipleFieldsSelectorActivity;
import com.google.android.apps.common.testing.ui.espresso.Espresso;
Expand Down
2 changes: 1 addition & 1 deletion .../com/climate/growers/android/tests/functional/integration/smoke/ui/SettingsSmokeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import com.climate.growers.android.R;
import com.climate.growers.android.biz.UpdateUserSettingRequest;
import com.climate.growers.android.tests.functional.integration.smoke.matchers.ParentChildMatcher;
import com.climate.growers.android.tests.functional.matchers.ParentChildMatcher;
import com.climate.growers.android.tests.utils.ClimateInstrumentationTestCase2;
import com.climate.growers.android.ui.content.MainActivity;
import com.climate.growers.android.ui.navigation.NavigationFragment;
Expand Down
2 changes: 1 addition & 1 deletion ...ion/smoke/matchers/AdapterAllMatcher.java → ...unctional/matchers/AdapterAllMatcher.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.climate.growers.android.tests.functional.integration.smoke.matchers;
package com.climate.growers.android.tests.functional.matchers;

import android.view.View;
import android.widget.Adapter;
Expand Down
2 changes: 1 addition & 1 deletion ...e/matchers/AdapterUniqueItemsMatcher.java → ...l/matchers/AdapterUniqueItemsMatcher.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.climate.growers.android.tests.functional.integration.smoke.matchers;
package com.climate.growers.android.tests.functional.matchers;

import android.view.View;
import android.widget.Adapter;
Expand Down
2 changes: 1 addition & 1 deletion .../smoke/matchers/AlertListPrefMatcher.java → ...tional/matchers/AlertListPrefMatcher.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.climate.growers.android.tests.functional.integration.smoke.matchers;
package com.climate.growers.android.tests.functional.matchers;

import android.view.View;
import android.widget.ListView;
Expand Down
2 changes: 1 addition & 1 deletion ...oke/matchers/FieldLazyDetailsMatcher.java → ...nal/matchers/FieldLazyDetailsMatcher.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.climate.growers.android.tests.functional.integration.smoke.matchers;
package com.climate.growers.android.tests.functional.matchers;

import android.text.TextUtils;

Expand Down
2 changes: 1 addition & 1 deletion ...n/smoke/matchers/FieldSummaryMatcher.java → ...ctional/matchers/FieldSummaryMatcher.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.climate.growers.android.tests.functional.integration.smoke.matchers;
package com.climate.growers.android.tests.functional.matchers;

import android.text.TextUtils;

Expand Down
2 changes: 1 addition & 1 deletion ...on/smoke/matchers/ParentChildMatcher.java → ...nctional/matchers/ParentChildMatcher.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.climate.growers.android.tests.functional.integration.smoke.matchers;
package com.climate.growers.android.tests.functional.matchers;

import android.view.View;
import android.view.ViewParent;
Expand Down
2 changes: 1 addition & 1 deletion ...tegration/smoke/matchers/PrefMatcher.java → ...ests/functional/matchers/PrefMatcher.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.climate.growers.android.tests.functional.integration.smoke.matchers;
package com.climate.growers.android.tests.functional.matchers;

import android.view.View;
import android.widget.ListView;
Expand Down
10 changes: 5 additions & 5 deletions ...roidTest/java/com/climate/growers/android/tests/functional/ui/PlantingFunctionalTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
import com.climate.growers.android.managers.pojos.NameId;
import com.climate.growers.android.managers.pojos.SeedHybrid;
import com.climate.growers.android.managers.pojos.scouting.Planting;
import com.climate.growers.android.tests.functional.integration.smoke.action.CheckBoxAction;
import com.climate.growers.android.tests.functional.integration.smoke.action.DatePickerAction;
import com.climate.growers.android.tests.functional.integration.smoke.action.NumberPickerAction;
import com.climate.growers.android.tests.functional.integration.smoke.matchers.FieldSummaryMatcher;
import com.climate.growers.android.tests.functional.integration.smoke.matchers.ParentChildMatcher;
import com.climate.growers.android.tests.functional.action.CheckBoxAction;
import com.climate.growers.android.tests.functional.action.DatePickerAction;
import com.climate.growers.android.tests.functional.action.NumberPickerAction;
import com.climate.growers.android.tests.functional.matchers.FieldSummaryMatcher;
import com.climate.growers.android.tests.functional.matchers.ParentChildMatcher;
import com.climate.growers.android.tests.utils.ClimateInstrumentationTestCase2;
import com.climate.growers.android.tests.utils.WaitUtil;
import com.climate.growers.android.ui.scouting.LoggingFormActivity;
Expand Down
3 changes: 1 addition & 2 deletions ...p/src/androidTest/java/com/climate/growers/android/tests/utils/ClimateActivityLogger.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@

import com.climate.growers.android.R;
import com.climate.growers.android.managers.pojos.FieldSummary;
import com.climate.growers.android.managers.pojos.SeedHybrid;
import com.climate.growers.android.tests.functional.integration.smoke.matchers.FieldSummaryMatcher;
import com.climate.growers.android.tests.functional.matchers.FieldSummaryMatcher;
import com.climate.growers.android.ui.scouting.LoggingFormActivity;
import com.google.android.apps.common.testing.ui.espresso.Espresso;
import com.google.android.apps.common.testing.ui.espresso.UiController;
Expand Down
Loading

0 comments on commit d1af874

Please sign in to comment.