Skip to content
Snippets Groups Projects
Commit 4eb83b63 authored by HSoreide's avatar HSoreide
Browse files

All unit tests are running

parent 0db699d5
No related branches found
No related tags found
1 merge request!61Hs master pom file for executable jar
......@@ -16,10 +16,6 @@ import no.ntnu.idatt1002.demo.data.economics.ExpenseCategory;
public class FileHandlingBudget {
private static final String fileType = ".budget";
private static final String jarFilePath = "src/main/resources/";
private static final String path = System.getProperty("user.home");
private static final String filePath = path + "/BudgetBuddyFiles/";
private static final String maxAmount = "maxAmount=";
private static final String budgetAmount = "budgetAmount=";
private static final String budgetCategory = "budgetCategory=";
......@@ -108,7 +104,7 @@ public class FileHandlingBudget {
ExpenseCategory expenseCategory = null;
String budgetDescription = null;
try (BufferedReader br = new BufferedReader(new FileReader(filePath + fileDestination + fileType))) {
try (BufferedReader br = new BufferedReader(new FileReader(fileDestination + fileType))) {
String line;
String nextLine = br.readLine();
while ((line = nextLine) != null) {
......
......@@ -19,7 +19,7 @@ class FileHandlingBudgetTest {
@DisplayName("FileHandling budget with one BudgetItem does not throw exception")
class fileHandlingBudgetWithOneBudgetItemDoesNotThrowException{
GeneralBudget generalBudget = new GeneralBudget(1200);
String fileTitle = "testFiles/budget/oneBudgetItemTest";
String fileTitle = "src/main/resources/testFiles/budget/oneBudgetItemTest";
@BeforeEach
void createGeneralBudget(){
......@@ -43,7 +43,7 @@ class FileHandlingBudgetTest {
@DisplayName("FileHandling budget with multiple BudgetItems does not throw exception")
class FileHandlingBudgetWithMultipleBudgetItemsDoesNotThrowException{
GeneralBudget generalBudget = new GeneralBudget(1200);
String fileTitle = "testFiles/budget/multipleBudgetItem";
String fileTitle = "src/main/resources/testFiles/budget/multipleBudgetItem";
@BeforeEach
void createGeneralBudget(){
foodItem = new BudgetItem(500, "description", ExpenseCategory.FOOD);
......@@ -70,8 +70,8 @@ class FileHandlingBudgetTest {
@DisplayName("Test isEmpty")
class IsEmpty {
String emptyFileFilePath = "testFiles/budget/emptyFile";
String nonEmptyFileFilePath = "testFiles/budget/multipleBudgetItem";
String emptyFileFilePath = "src/main/resources/testFiles/budget/emptyFile";
String nonEmptyFileFilePath = "src/main/resources/testFiles/budget/multipleBudgetItem";
@Test
@DisplayName("Test isEmpty with empty file")
......@@ -90,9 +90,9 @@ class FileHandlingBudgetTest {
@DisplayName("Test isNewBudget")
class IsNewBudget {
String newBudgetFilePath = "testFiles/budget/newBudget";
String newBudgetFilePath = "src/main/resources/testFiles/budget/newBudget";
String oldBudgetFilePath = "testFiles/budget/oneBudgetItemTest";
String oldBudgetFilePath = "src/main/resources/testFiles/budget/oneBudgetItemTest";
@Test
......@@ -111,7 +111,7 @@ class FileHandlingBudgetTest {
@Test
@DisplayName("Test writing max budget amount to file")
void testWriteMaxMountToFile() throws IOException {
String fileDestination = "testFiles/budget/writeNewBudget";
String fileDestination = "src/main/resources/testFiles/budget/writeNewBudget";
String maxAmount = "100";
FileHandlingBudget.writeMaxAmountToFile(fileDestination, maxAmount);
......
......@@ -18,8 +18,8 @@ class FileHandlingTest {
@Test
@DisplayName("isEmpty returns true if a file is empty")
void isEmptyReturnsTrueIfAFileIsEmpty() throws IOException {
FileHandling.writeItemRegisterToFile(incomeRegister, "/testFiles/economics/incomeRegisterTest");
assertTrue(FileHandling.isEmpty("/testFiles/economics/incomeRegisterTest"));
FileHandling.writeItemRegisterToFile(incomeRegister, "src/main/resources/testFiles/economics/incomeRegisterTest");
assertTrue(FileHandling.isEmpty("src/main/resources/testFiles/economics/incomeRegisterTest"));
}
@Test
......@@ -27,14 +27,14 @@ class FileHandlingTest {
void isEmptyReturnsFalseIfFileIsNotEmpty() throws IOException {
Income income1 = new Income("description", 59.9f, false, IncomeCategory.GIFT, LocalDate.of(2023, Month.MARCH, 3));
incomeRegister.addItem(income1);
FileHandling.writeItemRegisterToFile(incomeRegister, "/testFiles/economics/incomeRegisterTest");
assertFalse(FileHandling.isEmpty("/testFiles/economics/incomeRegisterTest"));
FileHandling.writeItemRegisterToFile(incomeRegister, "src/main/resources/testFiles/economics/incomeRegisterTest");
assertFalse(FileHandling.isEmpty("src/main/resources/testFiles/economics/incomeRegisterTest"));
}
}
@Nested
@DisplayName("FileHandling IncomeRegister to file")
class fileHandlingIncomeRegisterToFile{
String fileTitle = "/testFiles/economics/incomeRegisterTest";
String fileTitle = "src/main/resources/testFiles/economics/incomeRegisterTest";
@Nested
@DisplayName("FileHandling incomeRegister with income that has description")
class fileHandlingIncomeRegisterWithIncomeThatHasDescription{
......@@ -103,7 +103,7 @@ class FileHandlingTest {
@Nested
@DisplayName("FileHandling ExpenseRegister to file")
class fileHandlingExpenseRegisterToFile{
String fileTitle = "/testFiles/economics/expenseRegisterTest";
String fileTitle = "src/main/resources/testFiles/economics/expenseRegisterTest";
@Nested
@DisplayName("FileHandling ExpenseRegister with Expense that has description")
class fileHandlingExpenseRegisterWithExpenseThatHasDescription{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment