From dd9dc6adc70dba356a546d369b9f38b730006de7 Mon Sep 17 00:00:00 2001
From: yash patel <ypatel2@ualberta.ca>
Date: Wed, 30 Oct 2019 18:44:50 -0600
Subject: [PATCH 1/3] lab8

---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ea7628c9..e6a33adf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,12 +19,12 @@ android:
     # 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
 
@@ -35,7 +35,7 @@ android:
     - sys-img-${ANDROID_ABI}-${ANDROID_TARGET}
 
 licenses:
-  - 'android-sdk-license-.+'
+    - 'android-sdk-license-.+'
 
 before_install:
   # Accept sdk licenses
@@ -47,15 +47,15 @@ before_install:
   - 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`
\ No newline at end of file

From a74794193f73b7ec26a8866fae1439c19d9cecd7 Mon Sep 17 00:00:00 2001
From: yash patel <ypatel2@ualberta.ca>
Date: Wed, 30 Oct 2019 19:15:40 -0600
Subject: [PATCH 2/3] test fail

---
 .../com/example/simpleparadox/listycity/CityListTest.java    | 5 +++++
 1 file changed, 5 insertions(+)

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..7d147d43 100644
--- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java
+++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java
@@ -93,4 +93,9 @@ void testCountCities() {
 
         assertEquals(1, cityList.countCities());
     }
+
+    @Test
+    void testCI(){
+        assertNotEquals(1,1);
+    }
 }
\ No newline at end of file

From 21d307b43d1baf17176d3d0b23762e2ae0d17eb5 Mon Sep 17 00:00:00 2001
From: yash patel <ypatel2@ualberta.ca>
Date: Wed, 30 Oct 2019 19:30:07 -0600
Subject: [PATCH 3/3] failed again

---
 .../com/example/simpleparadox/listycity/CityListTest.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 7d147d43..37108ed7 100644
--- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java
+++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java
@@ -94,8 +94,8 @@ void testCountCities() {
         assertEquals(1, cityList.countCities());
     }
 
-    @Test
-    void testCI(){
-        assertNotEquals(1,1);
-    }
+    //@Test
+    //void testCI(){
+      //  assertNotEquals(1,1);
+    //}
 }
\ No newline at end of file