Index: trunk/test/unit/org/openstreetmap/josm/data/PreferencesTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/PreferencesTest.groovy	(revision 6671)
+++ trunk/test/unit/org/openstreetmap/josm/data/PreferencesTest.groovy	(revision 6671)
@@ -0,0 +1,14 @@
+package org.openstreetmap.josm.data
+
+import org.openstreetmap.josm.Main
+
+class PreferencesTest extends GroovyTestCase {
+    @Override
+    void setUp() {
+        Main.initApplicationPreferences()
+    }
+
+    void testColorName() {
+        Main.pref.getColorName("color.layer {5DE308C0-916F-4B5A-B3DB-D45E17F30172}.gpx") == "{5DE308C0-916F-4B5A-B3DB-D45E17F30172}.gpx"
+    }
+}
Index: trunk/test/unit/org/openstreetmap/josm/tools/I18nTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/I18nTest.groovy	(revision 6671)
+++ trunk/test/unit/org/openstreetmap/josm/tools/I18nTest.groovy	(revision 6671)
@@ -0,0 +1,10 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools
+
+class I18nTest extends GroovyTestCase {
+    void testEscape() {
+        def foobar = "{foo'bar}"
+        assert I18n.escape(foobar) == "'{'foo''bar'}'"
+        assert I18n.tr(I18n.escape(foobar)) == foobar
+    }
+}