Roman_Schenk
/
PM3-HS22-IT21b_WIN-Team1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41 from schrom01/feature_plantList_M2 

fixed Method getFilteredPlantListByString
This commit is contained in:
gulerdav 2022-10-31 08:01:43 +01:00 committed by GitHub Enterprise
parent f452b73233 98ff259d95
commit 6c00b7f182
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/ch/zhaw/gartenverwaltung/plantList/PlantListModel.java
View File

@ -110,7 +110,9 @@ public class PlantListModel {
* @throws IOException If the database cannot be accessed * @throws IOException If the database cannot be accessed
*/ */
public List<Plant> getFilteredPlantListByString(HardinessZone zone, String searchString) throws HardinessZoneNotSetException, IOException { public List<Plant> getFilteredPlantListByString(HardinessZone zone, String searchString) throws HardinessZoneNotSetException, IOException {
if(searchString.charAt(0) == '#') { if(searchString.length() == 0){
return getPlantList(zone);
} else if(searchString.charAt(0) == '#') {
try { try {
return getFilteredPlantListById(zone, Long.parseLong(searchString.substring(1))); return getFilteredPlantListById(zone, Long.parseLong(searchString.substring(1)));
} catch (NumberFormatException e) { } catch (NumberFormatException e) {

2
src/test/java/ch/zhaw/gartenverwaltung/plantList/PlantListModelTest.java
View File

@ -173,6 +173,8 @@ class PlantListModelTest {
assertEquals(examplePlantList.get(1), plantListResult.get(0)); assertEquals(examplePlantList.get(1), plantListResult.get(0));
plantListResult = model.getFilteredPlantListByString(HardinessZone.ZONE_8A, "apple"); plantListResult = model.getFilteredPlantListByString(HardinessZone.ZONE_8A, "apple");
assertEquals(0, plantListResult.size()); assertEquals(0, plantListResult.size());
plantListResult = model.getFilteredPlantListByString(HardinessZone.ZONE_8A, "");
assertEquals(3, plantListResult.size());
} }
@Test @Test