From 78a27499a8c267778f40f9152e9d3d66945ee947 Mon Sep 17 00:00:00 2001 From: Gian-Andrea Hutter Date: Tue, 8 Nov 2022 23:11:38 +0100 Subject: [PATCH] #27 gardenplanmodelTest bugfixed --- .../java/ch/zhaw/gartenverwaltung/types/Task.java | 4 ++-- .../ch.zhaw.gartenverwaltung.gardenplan/taskdb.json | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java b/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java index 02d6480..aef9035 100644 --- a/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java +++ b/src/main/java/ch/zhaw/gartenverwaltung/types/Task.java @@ -21,11 +21,11 @@ public class Task { * default constructor * (used by Json deserializer) */ - public Task(long cropId){ + public Task(){ name= ""; description= ""; startDate = LocalDate.now(); - this.cropId = cropId; + //this.cropId = cropId; } public Task(String name, String description, LocalDate startDate, long cropId) { diff --git a/src/test/resources/ch.zhaw.gartenverwaltung.gardenplan/taskdb.json b/src/test/resources/ch.zhaw.gartenverwaltung.gardenplan/taskdb.json index b3514b0..ff69563 100644 --- a/src/test/resources/ch.zhaw.gartenverwaltung.gardenplan/taskdb.json +++ b/src/test/resources/ch.zhaw.gartenverwaltung.gardenplan/taskdb.json @@ -6,7 +6,7 @@ "startDate" : "2022-05-01", "endDate" : "2022-05-01", "interval" : 0, - "cropID" : 0 + "cropId" : 0 }, { "id" : 2, @@ -15,7 +15,7 @@ "startDate" : "2022-05-01", "endDate" : "2022-09-01", "interval" : 2, - "cropID" : 0 + "cropId" : 0 }, { "id" : 3, @@ -24,7 +24,7 @@ "startDate" : "2022-06-01", "endDate" : "2022-08-01", "interval" : 28, - "cropID" : 0 + "cropId" : 0 }, { "id" : 4, @@ -33,7 +33,7 @@ "startDate" : "2022-07-01", "endDate" : "2022-07-01", "interval" : 0, - "cropID" : 0 + "cropId" : 0 }, { "id" : 5, @@ -42,7 +42,7 @@ "startDate" : "2022-05-01", "endDate" : "2022-09-01", "interval" : 5, - "cropID" : 0 + "cropId" : 0 }, { "id" : 6, @@ -51,6 +51,6 @@ "startDate" : "2022-09-01", "endDate" : "2022-09-01", "interval" : 0, - "cropID" : 0 + "cropId" : 0 } ] \ No newline at end of file