From 7a93df642495a9755db16be5d5e2a12d8a8f9c03 Mon Sep 17 00:00:00 2001
From: Stephen Ta <sta1@ualberta.ca>
Date: Tue, 10 Mar 2020 17:41:55 -0600
Subject: [PATCH 1/3] Added gitignore and modified travis.yml

---
 .gitignore  | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 .travis.yml |  2 +-
 2 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..ec4c59d5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,85 @@
+# Built application files
+*.apk
+*.aar
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+#  Uncomment the following line in case you need and you don't have the release build type files in your app
+# release/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+# Android Studio 3 in .gitignore file.
+.idea/caches
+.idea/modules.xml
+# Comment next line if keeping position of elements in Navigation Editor is relevant for you
+.idea/navEditor.xml
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+.cxx/
+
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index e52c153e..d602da97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,7 @@ before_install:
 
   # Get gradle
   - chmod +x gradlew
-  - wget http://services.gradle.org/distributions/gradle-5.3-bin.zip
+  - wget https://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

From 19cc0095ef991da8f134ab8359e7de7327c32c8f Mon Sep 17 00:00:00 2001
From: Stephen Ta <sta1@ualberta.ca>
Date: Tue, 10 Mar 2020 17:54:59 -0600
Subject: [PATCH 2/3] Created new test

---
 .../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..3fd5f56f 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 exerciseTest() {
+        assert(0==1);
+    }
 }
\ No newline at end of file

From 305101d7b803e16178fd8025ee08d5c29cc14fca Mon Sep 17 00:00:00 2001
From: Stephen Ta <sta1@ualberta.ca>
Date: Tue, 10 Mar 2020 18:06:45 -0600
Subject: [PATCH 3/3] Fixed test

---
 .../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 3fd5f56f..a70899cf 100644
--- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java
+++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java
@@ -96,6 +96,6 @@ void testCountCities() {
 
     @Test
     void exerciseTest() {
-        assert(0==1);
+        assert(1==1);
     }
 }
\ No newline at end of file