Skip to content
Snippets Groups Projects
Commit 04386798 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

Fixed unit tests

parent 9546f85e
No related branches found
No related tags found
1 merge request!160merge v1_4_0 into master
{"categories":[{"ID":1,"name":"NONE","color":{"red":1.0,"green":1.0,"blue":1.0,"opacity":1.0}},{"ID":2,"name":"Übertrag","color":{"red":1.0,"green":1.0,"blue":0.0,"opacity":1.0}},{"ID":3,"name":"123 Tü+?est Category","color":{"red":0.9411765,"green":0.972549,"blue":1.0,"opacity":1.0}}],"normalPayments":[{"ID":1,"amount":23,"date":"2017-06-02","categoryID":0,"name":"Test Normal","description":"Lorem Ipsum"}],"repeatingPayments":[{"repeatInterval":7,"repeatEndDate":"2017-06-30","repeatMonthDay":0,"ID":1,"amount":-10012,"date":"2017-06-01","categoryID":1,"name":"Test Repeating","description":"Lorem Ipsum"}]} {"categories":[{"ID":1,"name":"NONE","color":"#FFFFFF"},{"ID":2,"name":"Übertrag","color":"#FFFF00"},{"ID":3,"name":"Keine Kategorie","color":"#FFFFFF"},{"ID":4,"name":"123 Tü+?est Category","color":"#FF9500"}],"normalPayments":[{"ID":1,"amount":23,"date":"2017-06-02","categoryID":0,"name":"Test Normal","description":"Lorem Ipsum"}],"repeatingPayments":[{"repeatInterval":7,"repeatEndDate":"2017-06-30","repeatMonthDay":0,"ID":1,"amount":-10012,"date":"2017-06-01","categoryID":3,"name":"Test Repeating","description":"Lorem Ipsum"}]}
\ No newline at end of file \ No newline at end of file
{"categories":[{"ID":1,"name":"NONE","color":{"red":1.0,"green":1.0,"blue":1.0,"opacity":1.0}},{"ID":2,"name":"Übertrag","color":{"red":1.0,"green":1.0,"blue":0.0,"opacity":1.0}},{"ID":3,"name":"123 Tü+?est Category","color":{"red":0.9411765,"green":0.972549,"blue":1.0,"opacity":1.0}}],"normalPayments":[{"ID":1,"amount":23,"date":"2017-06-02","categoryID":0,"name":"Test Normal","description":"Lorem Ipsum"}],"repeatingPayments":[{"repeatInterval":7,"repeatEndDate":"2017-06-30","repeatMonthDay":0,"ID":1,"amount":-10012,"date":"2017-06-01","categoryID":1,"name":"Test Repeating","description":"Lorem Ipsum"}]} {"categories":[{"ID":1,"name":"NONE","color":"#FFFFFF"},{"ID":2,"name":"Übertrag","color":"#FFFF00"},{"ID":3,"name":"Keine Kategorie","color":"#FFFFFF"},{"ID":4,"name":"123 Tü+?est Category","color":"#FF9500"}],"normalPayments":[{"ID":1,"amount":23,"date":"2017-06-02","categoryID":0,"name":"Test Normal","description":"Lorem Ipsum"}],"repeatingPayments":[{"repeatInterval":7,"repeatEndDate":"2017-06-30","repeatMonthDay":0,"ID":1,"amount":-10012,"date":"2017-06-01","categoryID":3,"name":"Test Repeating","description":"Lorem Ipsum"}]}
\ No newline at end of file \ No newline at end of file
...@@ -8,6 +8,7 @@ import static org.junit.Assert.fail; ...@@ -8,6 +8,7 @@ import static org.junit.Assert.fail;
import java.io.IOException; import java.io.IOException;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Locale;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
...@@ -19,6 +20,7 @@ import de.deadlocker8.budgetmaster.logic.RepeatingPayment; ...@@ -19,6 +20,7 @@ import de.deadlocker8.budgetmaster.logic.RepeatingPayment;
import de.deadlocker8.budgetmasterserver.logic.Settings; import de.deadlocker8.budgetmasterserver.logic.Settings;
import de.deadlocker8.budgetmasterserver.logic.Utils; import de.deadlocker8.budgetmasterserver.logic.Utils;
import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler; import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import tools.Localization;
public class DatabaseHandlerTest public class DatabaseHandlerTest
{ {
...@@ -36,6 +38,9 @@ public class DatabaseHandlerTest ...@@ -36,6 +38,9 @@ public class DatabaseHandlerTest
handler.deleteDatabase(); handler.deleteDatabase();
handler = new DatabaseHandler(settings); handler = new DatabaseHandler(settings);
databaseHandler = handler; databaseHandler = handler;
Localization.init("de/deadlocker8/budgetmaster/resources/");
Localization.loadLanguage(Locale.GERMANY);
} }
catch(IOException | URISyntaxException e) catch(IOException | URISyntaxException e)
{ {
......
...@@ -9,6 +9,7 @@ import java.net.URISyntaxException; ...@@ -9,6 +9,7 @@ import java.net.URISyntaxException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Locale;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
...@@ -25,6 +26,7 @@ import de.deadlocker8.budgetmasterserver.logic.database.Database; ...@@ -25,6 +26,7 @@ import de.deadlocker8.budgetmasterserver.logic.database.Database;
import de.deadlocker8.budgetmasterserver.logic.database.DatabaseExporter; import de.deadlocker8.budgetmasterserver.logic.database.DatabaseExporter;
import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler; import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import de.deadlocker8.budgetmasterserver.logic.database.DatabaseImporter; import de.deadlocker8.budgetmasterserver.logic.database.DatabaseImporter;
import tools.Localization;
public class DatabaseImportExportTest public class DatabaseImportExportTest
{ {
...@@ -42,6 +44,9 @@ public class DatabaseImportExportTest ...@@ -42,6 +44,9 @@ public class DatabaseImportExportTest
handler.deleteDatabase(); handler.deleteDatabase();
handler = new DatabaseHandler(settings); handler = new DatabaseHandler(settings);
databaseHandler = handler; databaseHandler = handler;
Localization.init("de/deadlocker8/budgetmaster/resources/");
Localization.loadLanguage(Locale.GERMANY);
} }
catch(IOException | URISyntaxException e) catch(IOException | URISyntaxException e)
{ {
...@@ -61,7 +66,7 @@ public class DatabaseImportExportTest ...@@ -61,7 +66,7 @@ public class DatabaseImportExportTest
importer.importDatabase(database); importer.importDatabase(database);
//test category //test category
Category expectedCategory = new Category(3, "123 Tü+?est Category", "#FF0000"); Category expectedCategory = new Category(3, "123 Tü+?est Category", "#FF9500");
ArrayList<Category> categories = databaseHandler.getCategories(); ArrayList<Category> categories = databaseHandler.getCategories();
Category category = databaseHandler.getCategory(categories.get(categories.size()-1).getID()); Category category = databaseHandler.getCategory(categories.get(categories.size()-1).getID());
...@@ -78,7 +83,7 @@ public class DatabaseImportExportTest ...@@ -78,7 +83,7 @@ public class DatabaseImportExportTest
assertEquals(expectedPayment.getDescription(), payment.getDescription()); assertEquals(expectedPayment.getDescription(), payment.getDescription());
//test repeating payment //test repeating payment
RepeatingPayment expectedRepeatingPayment = new RepeatingPayment(1, -10012, "2017-06-01", 1, "Test Repeating", "Lorem Ipsum", 7, "2017-06-30", 0); RepeatingPayment expectedRepeatingPayment = new RepeatingPayment(1, -10012, "2017-06-01", 3, "Test Repeating", "Lorem Ipsum", 7, "2017-06-30", 0);
RepeatingPayment repeatingPayment = databaseHandler.getRepeatingPayment(1); RepeatingPayment repeatingPayment = databaseHandler.getRepeatingPayment(1);
assertEquals(expectedRepeatingPayment.getAmount(), repeatingPayment.getAmount()); assertEquals(expectedRepeatingPayment.getAmount(), repeatingPayment.getAmount());
assertEquals(expectedRepeatingPayment.getDate(), repeatingPayment.getDate()); assertEquals(expectedRepeatingPayment.getDate(), repeatingPayment.getDate());
...@@ -115,6 +120,7 @@ public class DatabaseImportExportTest ...@@ -115,6 +120,7 @@ public class DatabaseImportExportTest
Gson gson = new Gson(); Gson gson = new Gson();
String databaseJSON = gson.toJson(exporter.exportDatabase()); String databaseJSON = gson.toJson(exporter.exportDatabase());
FileHelper.saveDatabaseJSON(file, databaseJSON); FileHelper.saveDatabaseJSON(file, databaseJSON);
FileHelper.saveDatabaseJSON(new File("C:/Users/ROGO2/Desktop/123.json"), databaseJSON);
String expectedJSON = new String(Files.readAllBytes(Paths.get("tests/de/deadlocker8/budgetmaster/tests/resources/import.json"))); String expectedJSON = new String(Files.readAllBytes(Paths.get("tests/de/deadlocker8/budgetmaster/tests/resources/import.json")));
String exportedJSON = new String(Files.readAllBytes(Paths.get("tests/de/deadlocker8/budgetmaster/tests/resources/export.json"))); String exportedJSON = new String(Files.readAllBytes(Paths.get("tests/de/deadlocker8/budgetmaster/tests/resources/export.json")));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment