1 files changed, 8 insertions, 8 deletions

diff --git a/tests/src/cgeo/geocaching/PersonalNoteTest.java b/tests/src/cgeo/geocaching/PersonalNoteTest.java
index fd185ed..c8aa8ba 100644
--- a/tests/src/cgeo/geocaching/PersonalNoteTest.java
+++ b/tests/src/cgeo/geocaching/PersonalNoteTest.java
@@ -5,7 +5,7 @@ import junit.framework.TestCase;
 public class PersonalNoteTest extends TestCase {
 
     public static void testParse() {
-        final String testString = "merged:\nSimple cgeo note\n--\nSimple provider note";
+        final String testString = "Simple cgeo note\n--\nSimple provider note";
         Geocache cache = new Geocache();
         cache.setPersonalNote(testString);
         PersonalNote parsedNote = new PersonalNote(cache);
@@ -24,7 +24,7 @@ public class PersonalNoteTest extends TestCase {
     }
 
     public static void testParseCgeoOnly() {
-        final String testString = "merged:\nSimple cgeo note";
+        final String testString = "Simple cgeo note";
         Geocache cache = new Geocache();
         cache.setPersonalNote(testString);
         PersonalNote parsedNote = new PersonalNote(cache);
@@ -34,30 +34,30 @@ public class PersonalNoteTest extends TestCase {
 
     public static void testSimpleMerge() {
         Geocache cache1 = new Geocache(); // not stored
-        cache1.setPersonalNote("merged:\nSimple cgeo note\n--\nSimple provider note");
+        cache1.setPersonalNote("Simple cgeo note\n--\nSimple provider note");
         PersonalNote myNote = new PersonalNote(cache1);
         Geocache cache2 = new Geocache();
         cache2.setListId(StoredList.STANDARD_LIST_ID); // stored
-        cache2.setPersonalNote("merged:\ncgeo note\n--\nProvider note");
+        cache2.setPersonalNote("cgeo note\n--\nProvider note");
         PersonalNote otherNote = new PersonalNote(cache2);
         PersonalNote result = myNote.mergeWith(otherNote);
-        assertEquals("merged:\ncgeo note\n--\nSimple provider note", result.toString());
+        assertEquals("cgeo note\n--\nSimple provider note", result.toString());
         assertPersonalNote(result, "cgeo note", "Simple provider note");
     }
 
     public static void testMixedMerge() {
         Geocache cache1 = new Geocache(); // not stored
-        cache1.setPersonalNote("merged:\nSimple cgeo note\n--\nSimple provider note");
+        cache1.setPersonalNote("Simple cgeo note\n--\nSimple provider note");
         PersonalNote myNote = new PersonalNote(cache1);
         Geocache cache2 = new Geocache();
         cache2.setListId(StoredList.STANDARD_LIST_ID); // stored
         cache2.setPersonalNote("Provider note");
         PersonalNote otherNote = new PersonalNote(cache2);
         PersonalNote result = myNote.mergeWith(otherNote);
-        assertEquals("merged:\nSimple cgeo note\n--\nSimple provider note", result.toString());
+        assertEquals("Simple cgeo note\n--\nSimple provider note", result.toString());
         assertPersonalNote(result, "Simple cgeo note", "Simple provider note");
         result = otherNote.mergeWith(myNote);
-        assertEquals("merged:\nSimple cgeo note\n--\nProvider note", result.toString());
+        assertEquals("Simple cgeo note\n--\nProvider note", result.toString());
         assertPersonalNote(result, "Simple cgeo note", "Provider note");
     }