From 1ab6d4869933a14c60c724eac8135da687387c67 Mon Sep 17 00:00:00 2001 From: Jarrod Los <56139570+JarrodLos@users.noreply.github.com> Date: Wed, 30 Oct 2019 17:09:42 -0600 Subject: [PATCH 1/6] Create .travis.yml --- .travis.yml | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..e52c153e --- /dev/null +++ b/.travis.yml @@ -0,0 +1,61 @@ +language: android +jdk: oraclejdk8 + +env: + global: + - ANDROID_TARGET=android-22 + - ANDROID_ABI=armeabi-v7a + +android: + components: + # Uncomment the lines below if you want to + # use the latest revision of Android SDK Tools + - tools + - platform-tools + + # The BuildTools version used by your project + - build-tools-23.0.3 + + # The SDK version used to compile your project + # TODO: why is this here explicitly in addition to $ANDROID_TARGET below + - android-23 + + # Additional components + - extra-google-google_play_services + - extra-google-m2repository + - extra-android-m2repository + + # The SDK version used to compile your project + - $ANDROID_TARGET + + # Specify at least one system image, + # if you need to run emulator(s) during your tests. + # The line should look like this after interpolation: + # - sys-img-armeabi-v7a-android-22 + - sys-img-${ANDROID_ABI}-${ANDROID_TARGET} + +licenses: + - 'android-sdk-license-.+' + +before_install: + # Accept sdk licenses + - yes | sdkmanager "platforms;android-29" + + # Get gradle + - chmod +x gradlew + - wget http://services.gradle.org/distributions/gradle-5.3-bin.zip + - unzip -qq gradle-5.3-bin.zip + - export GRADLE_HOME=$PWD/gradle-5.3 + - export PATH=$GRADLE_HOME/bin:$PATH + + # Build the project + - gradle -v + + # Start the emulator + - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI + - emulator -avd test -no-skin -no-audio -no-window & + - android-wait-for-emulator + - adb shell input keyevent 82 & + + # The app will now automatically be installed and tested via + # the command `gradle connectedCheck` From 795932fdb01d8e4cd871457949a021ae41abbacb Mon Sep 17 00:00:00 2001 From: Jarrod Los <56139570+JarrodLos@users.noreply.github.com> Date: Wed, 30 Oct 2019 17:45:21 -0600 Subject: [PATCH 2/6] Creating FALSE Junit test --- .../com/example/simpleparadox/listycity/CityListTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java index 787eab7e..39916a77 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java @@ -5,6 +5,11 @@ import static org.junit.jupiter.api.Assertions.*; +@Test +void failTest() + assertEquals(1, equalsTwo()); +} + class CityListTest { private CityList mockCityList() { @@ -93,4 +98,4 @@ void testCountCities() { assertEquals(1, cityList.countCities()); } -} \ No newline at end of file +} From 203357ac103bd3fd2ce003e9cc16ea894f90c6ef Mon Sep 17 00:00:00 2001 From: Jarrod Los <56139570+JarrodLos@users.noreply.github.com> Date: Wed, 30 Oct 2019 17:51:07 -0600 Subject: [PATCH 3/6] Added new method equalsTwo --- .../com/example/simpleparadox/listycity/MainActivity.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/simpleparadox/listycity/MainActivity.java b/app/src/main/java/com/example/simpleparadox/listycity/MainActivity.java index 5d276ec7..eea5a6ce 100644 --- a/app/src/main/java/com/example/simpleparadox/listycity/MainActivity.java +++ b/app/src/main/java/com/example/simpleparadox/listycity/MainActivity.java @@ -12,7 +12,12 @@ import java.util.Arrays; public class MainActivity extends AppCompatActivity { - + + // Test that needs to be implemented!! + public int equalsTwo() { + return 2; + } + // Declare the variables so that you will be able to reference it later. ListView cityList; ArrayAdapter cityAdapter; From 20ead2ee6c650b496ab6d4fdacdc00f47c8ae064 Mon Sep 17 00:00:00 2001 From: Jarrod Los <56139570+JarrodLos@users.noreply.github.com> Date: Wed, 30 Oct 2019 18:08:20 -0600 Subject: [PATCH 4/6] Updated so it will pass! --- .../java/com/example/simpleparadox/listycity/CityListTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java index 39916a77..e8c63c66 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java @@ -7,7 +7,7 @@ @Test void failTest() - assertEquals(1, equalsTwo()); + assertEquals(2, equalsTwo()); } class CityListTest { From 163bcf6ceb9e5f4a3dbb7de51bc23a83b7d918c8 Mon Sep 17 00:00:00 2001 From: Jarrod Los <56139570+JarrodLos@users.noreply.github.com> Date: Wed, 30 Oct 2019 18:19:42 -0600 Subject: [PATCH 5/6] Update MainActivity.java --- .../com/example/simpleparadox/listycity/MainActivity.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/src/main/java/com/example/simpleparadox/listycity/MainActivity.java b/app/src/main/java/com/example/simpleparadox/listycity/MainActivity.java index eea5a6ce..dde1fc8e 100644 --- a/app/src/main/java/com/example/simpleparadox/listycity/MainActivity.java +++ b/app/src/main/java/com/example/simpleparadox/listycity/MainActivity.java @@ -13,10 +13,6 @@ public class MainActivity extends AppCompatActivity { - // Test that needs to be implemented!! - public int equalsTwo() { - return 2; - } // Declare the variables so that you will be able to reference it later. ListView cityList; From 7a8d20410fc2b44386b150f66735f3b8132ba31d Mon Sep 17 00:00:00 2001 From: Jarrod Los <56139570+JarrodLos@users.noreply.github.com> Date: Wed, 30 Oct 2019 18:20:22 -0600 Subject: [PATCH 6/6] Adding new method equalsTwo --- .../java/com/example/simpleparadox/listycity/CityList.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/com/example/simpleparadox/listycity/CityList.java b/app/src/main/java/com/example/simpleparadox/listycity/CityList.java index 6da242f3..7ebb44e3 100644 --- a/app/src/main/java/com/example/simpleparadox/listycity/CityList.java +++ b/app/src/main/java/com/example/simpleparadox/listycity/CityList.java @@ -22,6 +22,11 @@ public void add(City city) { cities.add(city); } + // Test that needs to be implemented!! + public int equalsTwo() { + return 2; + } + /** * This returns a sorted list of cities * @return