From 446f48a034b2869babe6f01ef970e2a650f09b4d Mon Sep 17 00:00:00 2001
From: Andreas <andreksv@ntnu.no>
Date: Mon, 17 Apr 2023 13:58:36 +0200
Subject: [PATCH] Made FileHandlingBudget methods static
---
.../idatt1002/demo/data/Budget/FileHandlingBudget.java | 6 +++---
src/main/resources/Budget/multipleBudgetItem.budget | 1 -
src/main/resources/Budget/oneBudgetItemTest.budget | 1 -
.../resources/Economics/incomeRegisterTest.register | 0
.../demo/data/Budget/FileHandlingBudgetTest.java | 10 ++++------
5 files changed, 7 insertions(+), 11 deletions(-)
create mode 100644 src/main/resources/Economics/incomeRegisterTest.register
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudget.java b/src/main/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudget.java
index 002b796a..9188cd93 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudget.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudget.java
@@ -25,7 +25,7 @@ public class FileHandlingBudget {
* @param fileTitle the name of the file you want to check
* @throws IOException if an input or output exception occurred.
*/
- public void writeGeneralBudgetToFile(String fileTitle, GeneralBudget generalBudget) throws IOException {
+ public static void writeGeneralBudgetToFile(String fileTitle, GeneralBudget generalBudget) throws IOException {
try (BufferedWriter bw = new BufferedWriter(new FileWriter(filePath + fileTitle + fileType))) {
bw.write(generalBudget.toString());
} catch (IOException ex) {
@@ -40,7 +40,7 @@ public class FileHandlingBudget {
* @return true or false depending on if file is empty.
* @throws IOException if an input or output exception occurred.
*/
- public boolean isEmpty(String fileTitle) throws IOException {
+ public static boolean isEmpty(String fileTitle) throws IOException {
try (BufferedReader br = new BufferedReader(new FileReader(filePath + fileTitle + fileType))) {
return br.readLine() == null;
}
@@ -53,7 +53,7 @@ public class FileHandlingBudget {
* @return the GeneralBudget from the file.
* @throws IOException if an input or output exception occurred.
*/
- public GeneralBudget readGeneralBudgetFromFile(String fileTitle) throws IOException {
+ public static GeneralBudget readGeneralBudgetFromFile(String fileTitle) throws IOException {
GeneralBudget generalBudget = null;
double maxAmount = 0;
double budgetAmount = 0;
diff --git a/src/main/resources/Budget/multipleBudgetItem.budget b/src/main/resources/Budget/multipleBudgetItem.budget
index 99d8a34c..e9b47dc3 100644
--- a/src/main/resources/Budget/multipleBudgetItem.budget
+++ b/src/main/resources/Budget/multipleBudgetItem.budget
@@ -1,4 +1,3 @@
-budgetPeriod=12
maxAmount=1200.0
budgetAmount=500.0
diff --git a/src/main/resources/Budget/oneBudgetItemTest.budget b/src/main/resources/Budget/oneBudgetItemTest.budget
index eaa80cf9..38cd0809 100644
--- a/src/main/resources/Budget/oneBudgetItemTest.budget
+++ b/src/main/resources/Budget/oneBudgetItemTest.budget
@@ -1,4 +1,3 @@
-budgetPeriod=12
maxAmount=1200.0
budgetAmount=500.0
diff --git a/src/main/resources/Economics/incomeRegisterTest.register b/src/main/resources/Economics/incomeRegisterTest.register
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudgetTest.java b/src/test/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudgetTest.java
index b03b20a8..5e8d4579 100644
--- a/src/test/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudgetTest.java
+++ b/src/test/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudgetTest.java
@@ -20,8 +20,6 @@ class FileHandlingBudgetTest {
BudgetItem foodItem;
BudgetItem bookItem;
BudgetItem clothesItem;
- FileHandlingBudget fileHandlingBudget = new FileHandlingBudget();
-
@Nested
@DisplayName("FileHandling budget with one BudgetItem does not throw exception")
@@ -37,13 +35,13 @@ class FileHandlingBudgetTest {
@Test
@DisplayName("Writing to file does not throw exception")
void writeGeneralBudgetToFileDoesNotThrowException() throws IOException {
- assertDoesNotThrow(() -> fileHandlingBudget.writeGeneralBudgetToFile(fileTitle,generalBudget));
+ assertDoesNotThrow(() -> FileHandlingBudget.writeGeneralBudgetToFile(fileTitle,generalBudget));
}
@Test
@DisplayName("Reading from file gives correct budget back")
void readingGeneralBudgetFromFileDoesNotThrowException()throws IOException{
- assertEquals(generalBudget,fileHandlingBudget.readGeneralBudgetFromFile(fileTitle));
+ assertEquals(generalBudget,FileHandlingBudget.readGeneralBudgetFromFile(fileTitle));
}
}
@@ -64,13 +62,13 @@ class FileHandlingBudgetTest {
@Test
@DisplayName("Writing to file does not throw exception")
void writeGeneralBudgetToFileDoesNotThrowException() throws IOException {
- assertDoesNotThrow(()->fileHandlingBudget.writeGeneralBudgetToFile(fileTitle,generalBudget));
+ assertDoesNotThrow(()->FileHandlingBudget.writeGeneralBudgetToFile(fileTitle,generalBudget));
}
@Test
@DisplayName("Reading from file gives correct budget back")
void readingGeneralBudgetFromFileDoesNotThrowException()throws IOException{
- assertEquals(generalBudget,fileHandlingBudget.readGeneralBudgetFromFile(fileTitle));
+ assertEquals(generalBudget,FileHandlingBudget.readGeneralBudgetFromFile(fileTitle));
}
}
--
GitLab