Skip to content

Lab8done #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
victorsmith wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Lab8done #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc55c99
test done, functionality: not done
victorsmith Mar 22, 2021
b19fea9
tests pass, functionality: complete
victorsmith Mar 22, 2021
5d42731
tests pass, functionality: complete
victorsmith Mar 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .idea/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/.name
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions .idea/jarRepositories.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions app/src/main/java/com/example/simpleparadox/listycity/CityList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
16 changes: 16 additions & 0 deletions app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}


}
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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