diff --git a/tests/de/deadlocker8/budgetmaster/tests/resources/export.json b/tests/de/deadlocker8/budgetmaster/tests/resources/export.json
index 12515b0b63822774520696258cc0d14ecb525eff..209392219510b137d085d93f7db36fca6faf9754 100644
--- a/tests/de/deadlocker8/budgetmaster/tests/resources/export.json
+++ b/tests/de/deadlocker8/budgetmaster/tests/resources/export.json
@@ -1 +1 @@
-{"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"}]}
\ No newline at end of file
+{"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
diff --git a/tests/de/deadlocker8/budgetmaster/tests/resources/import.json b/tests/de/deadlocker8/budgetmaster/tests/resources/import.json
index 12515b0b63822774520696258cc0d14ecb525eff..209392219510b137d085d93f7db36fca6faf9754 100644
--- a/tests/de/deadlocker8/budgetmaster/tests/resources/import.json
+++ b/tests/de/deadlocker8/budgetmaster/tests/resources/import.json
@@ -1 +1 @@
-{"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"}]}
\ No newline at end of file
+{"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
diff --git a/tests/de/deadlocker8/budgetmaster/tests/server/database/DatabaseHandlerTest.java b/tests/de/deadlocker8/budgetmaster/tests/server/database/DatabaseHandlerTest.java
index bb27ca05691004e97905730a5b4dcea424d4b5ce..9321e7af500030007363f92e5cd89aaddef34330 100644
--- a/tests/de/deadlocker8/budgetmaster/tests/server/database/DatabaseHandlerTest.java
+++ b/tests/de/deadlocker8/budgetmaster/tests/server/database/DatabaseHandlerTest.java
@@ -8,6 +8,7 @@ import static org.junit.Assert.fail;
import java.io.IOException;
import java.net.URISyntaxException;
import java.util.ArrayList;
+import java.util.Locale;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -19,6 +20,7 @@ import de.deadlocker8.budgetmaster.logic.RepeatingPayment;
import de.deadlocker8.budgetmasterserver.logic.Settings;
import de.deadlocker8.budgetmasterserver.logic.Utils;
import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
+import tools.Localization;
public class DatabaseHandlerTest
{
@@ -36,6 +38,9 @@ public class DatabaseHandlerTest
handler.deleteDatabase();
handler = new DatabaseHandler(settings);
databaseHandler = handler;
+
+ Localization.init("de/deadlocker8/budgetmaster/resources/");
+ Localization.loadLanguage(Locale.GERMANY);
}
catch(IOException | URISyntaxException e)
{
diff --git a/tests/de/deadlocker8/budgetmaster/tests/server/database/DatabaseImportExportTest.java b/tests/de/deadlocker8/budgetmaster/tests/server/database/DatabaseImportExportTest.java
index a7e576c09ebaa5aeee8c5f0f74152d1d40e9d624..3e713d563afb5e932e6d9bd132c87737252cdcda 100644
--- a/tests/de/deadlocker8/budgetmaster/tests/server/database/DatabaseImportExportTest.java
+++ b/tests/de/deadlocker8/budgetmaster/tests/server/database/DatabaseImportExportTest.java
@@ -9,6 +9,7 @@ import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
+import java.util.Locale;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -25,6 +26,7 @@ import de.deadlocker8.budgetmasterserver.logic.database.Database;
import de.deadlocker8.budgetmasterserver.logic.database.DatabaseExporter;
import de.deadlocker8.budgetmasterserver.logic.database.DatabaseHandler;
import de.deadlocker8.budgetmasterserver.logic.database.DatabaseImporter;
+import tools.Localization;
public class DatabaseImportExportTest
{
@@ -42,6 +44,9 @@ public class DatabaseImportExportTest
handler.deleteDatabase();
handler = new DatabaseHandler(settings);
databaseHandler = handler;
+
+ Localization.init("de/deadlocker8/budgetmaster/resources/");
+ Localization.loadLanguage(Locale.GERMANY);
}
catch(IOException | URISyntaxException e)
{
@@ -61,7 +66,7 @@ public class DatabaseImportExportTest
importer.importDatabase(database);
//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();
Category category = databaseHandler.getCategory(categories.get(categories.size()-1).getID());
@@ -78,7 +83,7 @@ public class DatabaseImportExportTest
assertEquals(expectedPayment.getDescription(), payment.getDescription());
//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);
assertEquals(expectedRepeatingPayment.getAmount(), repeatingPayment.getAmount());
assertEquals(expectedRepeatingPayment.getDate(), repeatingPayment.getDate());
@@ -114,7 +119,8 @@ public class DatabaseImportExportTest
DatabaseExporter exporter = new DatabaseExporter(settings);
Gson gson = new Gson();
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 exportedJSON = new String(Files.readAllBytes(Paths.get("tests/de/deadlocker8/budgetmaster/tests/resources/export.json")));