Repair travis

(cherry picked from commit 9a5b3a4)
sshropshire · Jul 21, 2014 · 209b174 · 209b174
1 parent ecd4765
commit 209b174
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,4 +8,4 @@ android:
 script:
     - echo "Travis branch is $TRAVIS_BRANCH"
     - echo "Travis branch is in pull request $TRAVIS_PULL+REQUEST"
-    - mvn clean install -P!guice
+    - mvn clean install
diff --git a/astroboy/src/test/java/org/roboguice/astroboy/controller/Astroboy1Test.java b/astroboy/src/test/java/org/roboguice/astroboy/controller/Astroboy1Test.java
@@ -29,7 +29,7 @@ public class Astroboy1Test {
     public void setup() {
        RoboGuice.setUseAnnotationDatabases(false);
        context = Robolectric.buildActivity(RoboActivity.class).create().get();
-       astroboy = RoboGuice.createInjector(context).getInstance(Astroboy.class);
+       astroboy = RoboGuice.getInjector(context).getInstance(Astroboy.class);
     }
 
     @Test

diff --git a/astroboy/src/test/java/org/roboguice/astroboy/controller/Astroboy2Test.java b/astroboy/src/test/java/org/roboguice/astroboy/controller/Astroboy2Test.java
@@ -50,7 +50,7 @@ public void teardown() {
     public void brushingTeethShouldCausePhoneToVibrate() {
 
         // get the astroboy instance
-        final Astroboy astroboy = RoboGuice.createInjector(context).getInstance(Astroboy.class);
+        final Astroboy astroboy = RoboGuice.getInjector(context).getInstance(Astroboy.class);
 
         // do the thing
         astroboy.brushTeeth();

diff --git a/astroboy/src/test/java/org/roboguice/astroboy/controller/Astroboy3Test.java b/astroboy/src/test/java/org/roboguice/astroboy/controller/Astroboy3Test.java
@@ -40,7 +40,7 @@ public void teardown() {
     public void brushingTeethShouldCausePhoneToVibrate() {
 
         // get the astroboy instance
-        final Astroboy astroboy = RoboGuice.createInjector(Robolectric.application).getInstance(Astroboy.class);
+        final Astroboy astroboy = RoboGuice.getInjector(Robolectric.application).getInstance(Astroboy.class);
 
         // do the thing
         astroboy.brushTeeth();