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 002b796a2e332673ce046560bb033620e3af5351..9188cd935f3c2ba4ab2d74885146635f96764504 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 99d8a34c324f73c0614113790af7db0fb7d74029..e9b47dc3b06a7b0578dad65f0258038547a5cb7e 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 eaa80cf9eafc900e3419078665bc59ed14bc25a2..38cd0809427987b409e882b9dff300aeb502ab20 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 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 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 b03b20a87a4f12578d3d2af562bb45057bb5f24a..5e8d4579ad0e8adee3c9db91e486be5b1d34e4d3 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)); } }