From b5689708ec985d1820322309d548cfa1f3d41dec Mon Sep 17 00:00:00 2001 From: Hk-tang Date: Fri, 11 Oct 2019 11:27:26 -0600 Subject: [PATCH 01/11] Lab code --- app/build.gradle | 63 ++++++++------- .../listycity/ExampleInstrumentedTest.java | 55 ++++++------- .../example/simpleparadox/listycity/City.java | 51 +++++++----- .../simpleparadox/listycity/CityList.java | 80 +++++++++++++++++++ .../simpleparadox/listycity/CityListTest.java | 73 +++++++++++++++++ .../listycity/ExampleUnitTest.java | 32 ++++---- 6 files changed, 263 insertions(+), 91 deletions(-) create mode 100644 app/src/main/java/com/example/simpleparadox/listycity/CityList.java create mode 100644 app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java diff --git a/app/build.gradle b/app/build.gradle index 0d17b9380..463b9b6de 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,29 +1,34 @@ -apply plugin: 'com.android.application' - -android { - compileSdkVersion 29 - buildToolsVersion "29.0.2" - defaultConfig { - applicationId "com.example.simpleparadox.listycity" - minSdkVersion 15 - targetSdkVersion 29 - versionCode 1 - versionName "1.0" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.0.2' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} +apply plugin: 'com.android.application' + +android { + compileSdkVersion 29 + buildToolsVersion "29.0.2" + defaultConfig { + applicationId "com.example.simpleparadox.listycity" + minSdkVersion 15 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.0.1' +} diff --git a/app/src/androidTest/java/com/example/simpleparadox/listycity/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/example/simpleparadox/listycity/ExampleInstrumentedTest.java index 14b60b236..47bd794f4 100644 --- a/app/src/androidTest/java/com/example/simpleparadox/listycity/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/example/simpleparadox/listycity/ExampleInstrumentedTest.java @@ -1,27 +1,28 @@ -package com.example.simpleparadox.listycity; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals("com.example.simpleparadox.listycity", appContext.getPackageName()); - } -} +package com.example.simpleparadox.listycity; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + + assertEquals("com.example.simpleparadox.listycity", appContext.getPackageName()); + } +} diff --git a/app/src/main/java/com/example/simpleparadox/listycity/City.java b/app/src/main/java/com/example/simpleparadox/listycity/City.java index fb6fbd1d1..b43ff2a7e 100644 --- a/app/src/main/java/com/example/simpleparadox/listycity/City.java +++ b/app/src/main/java/com/example/simpleparadox/listycity/City.java @@ -1,19 +1,32 @@ -package com.example.simpleparadox.listycity; - -public class City { - private String city; - private String province; - - City(String city, String province){ - this.city = city; - this.province = province; - } - - String getCityName(){ - return this.city; - } - - String getProvinceName(){ - return this.province; - } -} +package com.example.simpleparadox.listycity; + +public class City implements Comparable{ + private String city; + private String province; + + City(String city, String province){ + this.city = city; + this.province = province; + } + + String getCityName(){ + return this.city; + } + + String getProvinceName(){ + return this.province; + } + + @Override + public int compareTo(City o) { + int cityCompare = city.compareTo(o.getCityName()); + int provinceCompare = province.compareTo(o.getProvinceName()); + + if (cityCompare > 0 || provinceCompare > 0) + return 1; + else if (cityCompare == 0 && provinceCompare == 0) + return 0; + else + return -1; + } +} diff --git a/app/src/main/java/com/example/simpleparadox/listycity/CityList.java b/app/src/main/java/com/example/simpleparadox/listycity/CityList.java new file mode 100644 index 000000000..6da242f3e --- /dev/null +++ b/app/src/main/java/com/example/simpleparadox/listycity/CityList.java @@ -0,0 +1,80 @@ +package com.example.simpleparadox.listycity; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * This is a class that keeps track of a list of city objects + */ +public class CityList { + private List cities = new ArrayList<>(); + + /** + * This adds a city to the list if the city does not exist + * @param city + * This is a candidate city to add + */ + public void add(City city) { + if (hasCity(city)) { + throw new IllegalArgumentException(); + } + cities.add(city); + } + + /** + * This returns a sorted list of cities + * @return + * Return the sorted list + */ + public List getCities() { + List list = cities; + Collections.sort(list); + return list; + } + + /** + * This method checks to see if a city already exists in the list + * @param city + * City to check + * @return + * Return true if the city exists already + */ + public boolean hasCity(City city) { + for (City c : cities) { + if (c.getCityName().equals(city.getCityName()) && + c.getProvinceName().equals(city.getProvinceName())) { + return true; + } + } + + return false; + } + + /** + * Delete the city from the list if it is there + * @param city + * Candidate city to delete + */ + public void delete(City city) { + if (!hasCity(city)) { + throw new IllegalArgumentException(); + } + + for (City c : cities) { + if (c.compareTo(city) == 0){ + cities.remove(c); + break; + } + } + } + + /** + * Return the size of the city list + * @return + * Size of city list + */ + public int countCities() { + return cities.size(); + } +} diff --git a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java new file mode 100644 index 000000000..b43aef7d2 --- /dev/null +++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java @@ -0,0 +1,73 @@ +package com.example.simpleparadox.listycity; + +import org.junit.jupiter.api.Test; + + +import static org.junit.jupiter.api.Assertions.*; + +class CityListTest { + + private CityList mockCityList() { + CityList cityList = new CityList(); + cityList.add(mockCity()); + return cityList; + } + + private City mockCity() { + return new City("Edmonton", "Alberta"); + } + + @Test + void testAdd() { + CityList cityList = mockCityList(); + + assertEquals(1, cityList.countCities()); + + cityList.add(new City("Regina", "Saskatchewan")); + + assertEquals(2, cityList.countCities()); + assertTrue(cityList.hasCity(new City("Regina", "Saskatchewan"))); + } + + @Test + void testHasCity() { + CityList cityList = mockCityList(); + + assertTrue(cityList.hasCity(mockCity())); + } + + @Test + void testGetCities() { + CityList cityList = mockCityList(); + + assertEquals(0, mockCity().compareTo(cityList.getCities().get(0))); + + City city = new City("Charlottetown", "Prince Edward Island"); + cityList.add(city); + + assertEquals(0, city.compareTo(cityList.getCities().get(0))); + assertEquals(0, mockCity().compareTo(cityList.getCities().get(1))); + } + + @Test + void testDeleteCity() { + CityList cityList = mockCityList(); + + City city = new City("Victoria", "British Columbia"); + cityList.add(city); + + assertEquals(2, cityList.countCities()); + + cityList.delete(mockCity()); + + assertEquals(1, cityList.countCities()); + assertEquals(0, city.compareTo(cityList.getCities().get(0))); + } + + @Test + void testCountCities() { + CityList cityList = mockCityList(); + + assertEquals(1, cityList.countCities()); + } +} \ No newline at end of file diff --git a/app/src/test/java/com/example/simpleparadox/listycity/ExampleUnitTest.java b/app/src/test/java/com/example/simpleparadox/listycity/ExampleUnitTest.java index b5f0d24f0..6b2be547f 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/ExampleUnitTest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/ExampleUnitTest.java @@ -1,17 +1,17 @@ -package com.example.simpleparadox.listycity; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } +package com.example.simpleparadox.listycity; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } } \ No newline at end of file From 5055a3275d42049f96b64977f79fdacd31229bbd Mon Sep 17 00:00:00 2001 From: Hk-tang Date: Fri, 11 Oct 2019 11:33:03 -0600 Subject: [PATCH 02/11] Lab demo --- .../example/simpleparadox/listycity/City.java | 10 +--- .../simpleparadox/listycity/CityList.java | 46 +------------------ .../simpleparadox/listycity/CityListTest.java | 37 ++------------- 3 files changed, 7 insertions(+), 86 deletions(-) diff --git a/app/src/main/java/com/example/simpleparadox/listycity/City.java b/app/src/main/java/com/example/simpleparadox/listycity/City.java index b43ff2a7e..ad43a057c 100644 --- a/app/src/main/java/com/example/simpleparadox/listycity/City.java +++ b/app/src/main/java/com/example/simpleparadox/listycity/City.java @@ -19,14 +19,6 @@ String getProvinceName(){ @Override public int compareTo(City o) { - int cityCompare = city.compareTo(o.getCityName()); - int provinceCompare = province.compareTo(o.getProvinceName()); - - if (cityCompare > 0 || provinceCompare > 0) - return 1; - else if (cityCompare == 0 && provinceCompare == 0) - return 0; - else - return -1; + return city.compareTo(o.getCityName()); } } 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 6da242f3e..05b2c1cac 100644 --- a/app/src/main/java/com/example/simpleparadox/listycity/CityList.java +++ b/app/src/main/java/com/example/simpleparadox/listycity/CityList.java @@ -16,7 +16,7 @@ public class CityList { * This is a candidate city to add */ public void add(City city) { - if (hasCity(city)) { + if (cities.contains(city)) { throw new IllegalArgumentException(); } cities.add(city); @@ -33,48 +33,4 @@ public List getCities() { return list; } - /** - * This method checks to see if a city already exists in the list - * @param city - * City to check - * @return - * Return true if the city exists already - */ - public boolean hasCity(City city) { - for (City c : cities) { - if (c.getCityName().equals(city.getCityName()) && - c.getProvinceName().equals(city.getProvinceName())) { - return true; - } - } - - return false; - } - - /** - * Delete the city from the list if it is there - * @param city - * Candidate city to delete - */ - public void delete(City city) { - if (!hasCity(city)) { - throw new IllegalArgumentException(); - } - - for (City c : cities) { - if (c.compareTo(city) == 0){ - cities.remove(c); - break; - } - } - } - - /** - * Return the size of the city list - * @return - * Size of city list - */ - public int countCities() { - return cities.size(); - } } 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 b43aef7d2..ea4258891 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java @@ -21,19 +21,13 @@ private City mockCity() { void testAdd() { CityList cityList = mockCityList(); - assertEquals(1, cityList.countCities()); + assertEquals(1, cityList.getCities().size()); - cityList.add(new City("Regina", "Saskatchewan")); - - assertEquals(2, cityList.countCities()); - assertTrue(cityList.hasCity(new City("Regina", "Saskatchewan"))); - } - - @Test - void testHasCity() { - CityList cityList = mockCityList(); + City city = new City("Regina", "Saskatchewan"); + cityList.add(city); - assertTrue(cityList.hasCity(mockCity())); + assertEquals(2, cityList.getCities().size()); + assertTrue(cityList.getCities().contains(city)); } @Test @@ -49,25 +43,4 @@ void testGetCities() { assertEquals(0, mockCity().compareTo(cityList.getCities().get(1))); } - @Test - void testDeleteCity() { - CityList cityList = mockCityList(); - - City city = new City("Victoria", "British Columbia"); - cityList.add(city); - - assertEquals(2, cityList.countCities()); - - cityList.delete(mockCity()); - - assertEquals(1, cityList.countCities()); - assertEquals(0, city.compareTo(cityList.getCities().get(0))); - } - - @Test - void testCountCities() { - CityList cityList = mockCityList(); - - assertEquals(1, cityList.countCities()); - } } \ No newline at end of file From 89696c99a8eae8a4dae874c08e249ea353be5571 Mon Sep 17 00:00:00 2001 From: Hk-tang Date: Sat, 12 Oct 2019 10:27:39 -0600 Subject: [PATCH 03/11] Added Exception testing --- .../simpleparadox/listycity/CityListTest.java | 12 ++++++++++++ 1 file changed, 12 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 ea4258891..42106e9bf 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java @@ -30,6 +30,18 @@ void testAdd() { assertTrue(cityList.getCities().contains(city)); } + @Test + void testAddException() { + CityList cityList = mockCityList(); + + City city = new City("Yellowknife", "Northwest Territories"); + cityList.add(city); + + assertThrows(IllegalArgumentException.class, () -> { + cityList.add(city); + }); + } + @Test void testGetCities() { CityList cityList = mockCityList(); From b91aeeeb847291a96a1bebc52dfdf6f453f9558c Mon Sep 17 00:00:00 2001 From: jakaria08 Date: Tue, 16 Nov 2021 10:05:57 +0600 Subject: [PATCH 04/11] test updated --- .idea/.gitignore | 3 +++ .idea/gradle.xml | 20 +++++++++++++++ .idea/jarRepositories.xml | 25 +++++++++++++++++++ app/build.gradle | 12 +++++++++ .../listycity/ExampleInstrumentedTest.java | 2 +- build.gradle | 1 + 6 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/gradle.xml create mode 100644 .idea/jarRepositories.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..26d33521a --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 000000000..526b4c25c --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 000000000..a5f05cd8c --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 463b9b6de..5cdffea4c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,6 +23,15 @@ android { } } +tasks.withType(Test) { + useJUnitPlatform() + testLogging { + exceptionFormat "full" + events "started", "skipped", "passed", "failed" + showStandardStreams true + } +} + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.0.2' @@ -31,4 +40,7 @@ dependencies { androidTestImplementation 'androidx.test:runner:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.0.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.0.1' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.0.1' } + diff --git a/app/src/androidTest/java/com/example/simpleparadox/listycity/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/example/simpleparadox/listycity/ExampleInstrumentedTest.java index 47bd794f4..8ebda9f57 100644 --- a/app/src/androidTest/java/com/example/simpleparadox/listycity/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/example/simpleparadox/listycity/ExampleInstrumentedTest.java @@ -4,7 +4,7 @@ import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; - +//import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/build.gradle b/build.gradle index 5509623ab..aa6249fa7 100644 --- a/build.gradle +++ b/build.gradle @@ -25,3 +25,4 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir } + From f4883aacefdf44699ca33e4665c45ae3c62d18ba Mon Sep 17 00:00:00 2001 From: jakaria08 Date: Wed, 17 Nov 2021 21:35:27 +0600 Subject: [PATCH 05/11] error resolved --- app/build.gradle | 1 - build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5cdffea4c..61c01743f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,6 +41,5 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.0.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.0.1' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.0.1' } diff --git a/build.gradle b/build.gradle index aa6249fa7..cbff3ccd7 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:7.0.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 36854e580..39b076627 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ 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 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip From f8267d979f16781db29dc264e625c9fa469b4798 Mon Sep 17 00:00:00 2001 From: Ashikur Rahman <58724901+Ashik-90@users.noreply.github.com> Date: Mon, 29 Nov 2021 00:39:15 +0600 Subject: [PATCH 06/11] testDelete and testDeleteException added --- .../simpleparadox/listycity/CityListTest.java | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 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 42106e9bf..e6df8f8c5 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java @@ -54,5 +54,30 @@ void testGetCities() { assertEquals(0, city.compareTo(cityList.getCities().get(0))); assertEquals(0, mockCity().compareTo(cityList.getCities().get(1))); } + + @Test + void testDelete() { + CityList cityList = mockCityList(); + + assertEquals(1, cityList.getCities().size()); + + City city = new City("Edmonton", "Alberta"); + cityList.delete(city); + + assertEquals(0, cityList.getCities().size()); + assertFalse(cityList.getCities().contains(city)); + } + + @Test + void testDeleteException() { + CityList cityList = mockCityList(); + + City city = new City("Yellowknife", "Northwest Territories"); + cityList.delete(city); + + assertThrows(IllegalArgumentException.class, () -> { + cityList.delete(city); + }); + } -} \ No newline at end of file +} From b42974a7b9144b55162de3ecba9b4b10a17f3db7 Mon Sep 17 00:00:00 2001 From: Ashikur Rahman <58724901+Ashik-90@users.noreply.github.com> Date: Mon, 29 Nov 2021 00:43:16 +0600 Subject: [PATCH 07/11] delete(city) added --- .../simpleparadox/listycity/CityList.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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 05b2c1cac..9c4470587 100644 --- a/app/src/main/java/com/example/simpleparadox/listycity/CityList.java +++ b/app/src/main/java/com/example/simpleparadox/listycity/CityList.java @@ -22,6 +22,22 @@ public void add(City city) { cities.add(city); } + /** + * This delete a city to the list if the city exists + * @param city + * This is a candidate city to delete + */ + public void delete(City city) { + if (cities.contains(city)) { + cities.remove(city); + + } + else{ + throw new IllegalArgumentException(); + } + + } + /** * This returns a sorted list of cities * @return From 59029675164ab363f808aba0a69049f057e00f27 Mon Sep 17 00:00:00 2001 From: Ashikur Rahman <58724901+Ashik-90@users.noreply.github.com> Date: Mon, 29 Nov 2021 01:13:21 +0600 Subject: [PATCH 08/11] getcount() added --- .../com/example/simpleparadox/listycity/CityList.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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 9c4470587..9fe0e0f0d 100644 --- a/app/src/main/java/com/example/simpleparadox/listycity/CityList.java +++ b/app/src/main/java/com/example/simpleparadox/listycity/CityList.java @@ -48,5 +48,14 @@ public List getCities() { Collections.sort(list); return list; } + + /** + * This returns a number of cities + * @return + * Return the total sum of city number + */ + public int getCount() { + return cities.size(); + } } From dd4ce8495bd3e9002ba6417a0066dcd45468d5f6 Mon Sep 17 00:00:00 2001 From: Ashikur Rahman <58724901+Ashik-90@users.noreply.github.com> Date: Mon, 29 Nov 2021 01:21:05 +0600 Subject: [PATCH 09/11] TestGetCount() added --- .../simpleparadox/listycity/CityListTest.java | 15 +++++++++++++++ 1 file changed, 15 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 e6df8f8c5..54314aec7 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java @@ -79,5 +79,20 @@ void testDeleteException() { cityList.delete(city); }); } + @Test + void testGetCount() + { + CityList cityList = mockCityList(); + + assertEquals(0, cityList.getCount()); + + City city = new City("Charlottetown", "Prince Edward Island"); + cityList.add(city); + assertEquals(1, cityList.getCount()); + + City city2 = new City("Yellowknife", "Northwest Territories"); + cityList.add(city2); + assertEquals(2, cityList.getCount()); + } } From eec38f0f8953234253af30384161ddcb37ce872e Mon Sep 17 00:00:00 2001 From: Ashikur Rahman <58724901+Ashik-90@users.noreply.github.com> Date: Mon, 29 Nov 2021 02:33:15 +0600 Subject: [PATCH 10/11] JavaDoc added --- CityList.html | 373 +++++++++++++++++++++++++++++++++++++++++++ package-summary.html | 164 +++++++++++++++++++ package-tree.html | 155 ++++++++++++++++++ 3 files changed, 692 insertions(+) create mode 100644 CityList.html create mode 100644 package-summary.html create mode 100644 package-tree.html diff --git a/CityList.html b/CityList.html new file mode 100644 index 000000000..43bba5016 --- /dev/null +++ b/CityList.html @@ -0,0 +1,373 @@ + + + + + +CityList + + + + + + + + + + + + + + +
+ +
+ +
+
+
Package com.example.simpleparadox.listycity
+

Class CityList

+
+
+
    +
  • java.lang.Object
    • +
  • +
      +
    • com.example.simpleparadox.listycity.CityList
      • +
    +
    • +
+
+
    +
  • +
    +
    public class CityList
+extends java.lang.Object
    +
    This is a class that keeps track of a list of city objects
    +
    • +
+
+
+
    +
  • + +
    +
      +
    • + + +

      Constructor Summary

      + + + + + + + + + + +
      Constructors 
      ConstructorDescription
      CityList() 
      +
      • +
    +
    + +
    +
      +
    • + + +

      Method Summary

      + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      All Methods Instance Methods Concrete Methods 
      Modifier and TypeMethodDescription
      voidadd​(com.example.simpleparadox.listycity.City city) +
      This adds a city to the list if the city does not exist
      +
      voiddelete​(com.example.simpleparadox.listycity.City city) +
      This delete a city to the list if the city exists
      +
      java.util.List<com.example.simpleparadox.listycity.City>getCities() +
      This returns a sorted list of cities
      +
      intgetCount() +
      This returns a number of cities
      +
      +
        +
      • + + +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
        • +
      +
      • +
    +
    +
    • +
+
+
+
    +
  • + +
    +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        CityList

        +
        public CityList()
        +
        • +
      +
      • +
    +
    + +
    +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        add

        +
        public void add​(com.example.simpleparadox.listycity.City city)
        +
        This adds a city to the list if the city does not exist
        +
        +
        Parameters:
        +
        city - This is a candidate city to add
        +
        +
        • +
      + + + +
        +
      • +

        delete

        +
        public void delete​(com.example.simpleparadox.listycity.City city)
        +
        This delete a city to the list if the city exists
        +
        +
        Parameters:
        +
        city - This is a candidate city to delete
        +
        +
        • +
      + + + +
        +
      • +

        getCities

        +
        public java.util.List<com.example.simpleparadox.listycity.City> getCities()
        +
        This returns a sorted list of cities
        +
        +
        Returns:
        +
        Return the sorted list
        +
        +
        • +
      + + + +
        +
      • +

        getCount

        +
        public int getCount()
        +
        This returns a number of cities
        +
        +
        Returns:
        +
        Return the total sum of city number
        +
        +
        • +
      +
      • +
    +
    +
    • +
+
+
+
+ +
+ +
+ + diff --git a/package-summary.html b/package-summary.html new file mode 100644 index 000000000..e29063670 --- /dev/null +++ b/package-summary.html @@ -0,0 +1,164 @@ + + + + + +com.example.simpleparadox.listycity + + + + + + + + + + + + + + +
+ +
+
+
+

Package com.example.simpleparadox.listycity

+
+
+
    +
  • + + + + + + + + + + + + +
    Class Summary 
    ClassDescription
    CityList +
    This is a class that keeps track of a list of city objects
    +
    +
    • +
+
+
+
+ +
+ + diff --git a/package-tree.html b/package-tree.html new file mode 100644 index 000000000..bf9359e21 --- /dev/null +++ b/package-tree.html @@ -0,0 +1,155 @@ + + + + + +com.example.simpleparadox.listycity Class Hierarchy + + + + + + + + + + + + + + +
+ +
+
+
+

Hierarchy For Package com.example.simpleparadox.listycity

+
+
+
+

Class Hierarchy

+
    +
  • java.lang.Object +
      +
    • com.example.simpleparadox.listycity.CityList
      • +
    +
    • +
+
+
+
+ + + From 4a56fc310bd3151458ddd0dc0044de5a65e7967b Mon Sep 17 00:00:00 2001 From: Ashikur Rahman <58724901+Ashik-90@users.noreply.github.com> Date: Mon, 29 Nov 2021 02:39:12 +0600 Subject: [PATCH 11/11] Rename CityList.html to index.html --- CityList.html => index.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename CityList.html => index.html (100%) diff --git a/CityList.html b/index.html similarity index 100% rename from CityList.html rename to index.html