Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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

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

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

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

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

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

3 changes: 3 additions & 0 deletions app/.idea/.gitignore

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

15 changes: 15 additions & 0 deletions app/.idea/gradle.xml

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

9 changes: 9 additions & 0 deletions app/.idea/misc.xml

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

8 changes: 8 additions & 0 deletions app/.idea/modules.xml

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

12 changes: 12 additions & 0 deletions app/src/main/java/com/example/simpleparadox/listycity/City.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
package com.example.simpleparadox.listycity;

/**
* the lab says to add a test for functionality that will fail (later implement it, i will choose the city class and have it and set a neighbouring city field
*/
public class City implements Comparable<City>{
private String city;
private String province;
private City neighbour;

City(String city, String province){
this.city = city;
Expand All @@ -17,6 +21,14 @@ String getProvinceName(){
return this.province;
}

public City getNeighbour() {
return neighbour;
}

public void setNeighbour(City neighbour) {
this.neighbour = neighbour;
}

@Override
public int compareTo(City o) {
return city.compareTo(o.getCityName());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,5 @@ void testCountCities() {

assertEquals(1, cityList.countCities());
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.example.simpleparadox.listycity;

import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.*;

public class CityTest {

private City mockCity() {
return new City("Edmonton", "Alberta");
}

private City mockCity1() {
return new City("Calgary", "Alberta");
}

@Test
void SetNeighbourTest(){

City testCity = mockCity();
testCity.setNeighbour(mockCity1());

assertEquals(testCity.getNeighbour().getCityName(),"Calgary");
}

}