diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..26d33521
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 00000000..cb67bab4
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+ListyCity
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 00000000..61a9130c
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 00000000..a5f05cd8
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..d5d35ec4
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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..7296d7a7 100644
--- a/app/src/main/java/com/example/simpleparadox/listycity/CityList.java
+++ b/app/src/main/java/com/example/simpleparadox/listycity/CityList.java
@@ -77,4 +77,21 @@ public void delete(City city) {
public int countCities() {
return cities.size();
}
+
+
+ /**
+ * Returns the number of cities from city list which reside in province
+ * @param province
+ * @return count
+ */
+
+ public int countProvinceCities (String province) {
+ int count = 0;
+ for (City c : cities) {
+ if ( c.getProvinceName() == province ) {
+ count++;
+ }
+ }
+ return count;
+ }
}
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..f557ed7e 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,20 @@ void testCountCities() {
assertEquals(1, cityList.countCities());
}
+
+
+ @Test
+ void testCountProvinceCities() {
+ CityList cityList = mockCityList();
+
+ // done
+
+ cityList.add(new City("Calgary", "Alberta"));
+ cityList.add(new City("Red Deer", "Alberta"));
+ cityList.add(new City("Regina", "Saskatchewan"));
+
+ assertEquals(3, cityList.countProvinceCities("Alberta"));
+ }
+
+
}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 5509623a..73a7a42e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.5.0'
+ classpath 'com.android.tools.build:gradle:4.1.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 36854e58..8325dccf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Sep 13 11:31:05 MDT 2019
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+#Mon Mar 22 13:54:52 MDT 2021
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip