From 954047deba2ed33f6356e9b7de1b2397d9a9dea1 Mon Sep 17 00:00:00 2001
From: kenz44 <60022406+kenz44@users.noreply.github.com>
Date: Tue, 10 Mar 2020 17:41:25 -0600
Subject: [PATCH 1/4] Create gitignore

---
 gitignore | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 gitignore

diff --git a/gitignore b/gitignore
new file mode 100644
index 00000000..56cc6425
--- /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/

From 6a6b2434c4cc5da898a10ec61803886b346cbada Mon Sep 17 00:00:00 2001
From: Kenz Bauer <mabauer@ualberta.ca>
Date: Tue, 10 Mar 2020 17:51:45 -0600
Subject: [PATCH 2/4] .travis.yml page

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 2ccb7e15349c8437428e4d7d98363d6db4633f0b Mon Sep 17 00:00:00 2001
From: Kenz Bauer <mabauer@ualberta.ca>
Date: Tue, 10 Mar 2020 18:08:07 -0600
Subject: [PATCH 3/4] added test that should fail

---
 .../com/example/simpleparadox/listycity/CityListTest.java | 8 ++++++++
 1 file changed, 8 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..951202ca 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,12 @@ void testCountCities() {
 
         assertEquals(1, cityList.countCities());
     }
+
+    @Test
+    void testMock() {
+        CityList cityList = mockCityList();
+        City city = new City("Victoria", "British Columbia");
+
+        assertTrue(cityList.hasCity(city));
+    }
 }
\ No newline at end of file

From 7bf1be9b5ea6f6991b826606e45a6706fe2416e6 Mon Sep 17 00:00:00 2001
From: Kenz Bauer <mabauer@ualberta.ca>
Date: Tue, 10 Mar 2020 18:28:16 -0600
Subject: [PATCH 4/4] changed test to pass

---
 .../java/com/example/simpleparadox/listycity/CityListTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 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 951202ca..babe84c7 100644
--- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java
+++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java
@@ -97,8 +97,7 @@ void testCountCities() {
     @Test
     void testMock() {
         CityList cityList = mockCityList();
-        City city = new City("Victoria", "British Columbia");
 
-        assertTrue(cityList.hasCity(city));
+        assertTrue(cityList.hasCity(mockCity()));
     }
 }
\ No newline at end of file