Fixed format type

src/test/groovy/org/mnode/ical4j/serializer/jot/JotAlarmMapperTest.groovy → src/test/groovy/org/mnode/ical4j/serializer/model/component/VAlarmMapperTest.groovy

@@ -1,11 +1,11 @@
-package org.mnode.ical4j.serializer.jot
+package org.mnode.ical4j.serializer.model.component
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.module.SimpleModule
 import net.fortuna.ical4j.model.component.VAlarm
 import spock.lang.Specification
 
-class JotAlarmMapperTest extends Specification {
+class VAlarmMapperTest extends Specification {
 
     def 'test alarm deserialization'() {
         given: 'a json string'
@@ -37,7 +37,7 @@ class JotAlarmMapperTest extends Specification {
   ],
   "attachments": [
     {
-      "fmttype": "string",
+      "fmttype": "application/msword",
       "url": "http://example.com"
     }
   ],
@@ -53,7 +53,7 @@ class JotAlarmMapperTest extends Specification {
 
         and: 'an object mapper'
         SimpleModule module = []
-        module.addDeserializer(VAlarm, new JotAlarmMapper())
+        module.addDeserializer(VAlarm, new VAlarmMapper())
         ObjectMapper mapper = []
         mapper.registerModule(module)
 
@@ -70,7 +70,7 @@ DURATION:PT15M\r
 REPEAT:1\r
 SUMMARY:string\r
 ATTENDEES;MEMBER="mailto:[email protected]";ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=FALSE;CN=string;DIR="http://example.com";LANGUAGE=en-US:mailto:[email protected]\r
-ATTACHMENTS;FMTTYPE=string:http://example.com\r
+ATTACHMENTS;FMTTYPE=application/msword:http://example.com\r
 STYLED-DESCRIPTION;FMTTYPE=text/html;VALUE=TEXT:true\r
 END:VALARM\r\n'''
     }

src/test/groovy/org/mnode/ical4j/serializer/jot/JotEventMapperTest.groovy → src/test/groovy/org/mnode/ical4j/serializer/model/component/VEventMapperTest.groovy

@@ -1,11 +1,11 @@
-package org.mnode.ical4j.serializer.jot
+package org.mnode.ical4j.serializer.model.component
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.module.SimpleModule
 import net.fortuna.ical4j.model.component.VEvent
 import spock.lang.Specification
 
-class JotEventMapperTest extends Specification {
+class VEventMapperTest extends Specification {
 
     def 'test event deserialization'() {
         given: 'a json string'
@@ -54,7 +54,7 @@ class JotEventMapperTest extends Specification {
   ],
   "attach": [
     {
-      "fmttype": "string",
+      "fmttype": "application/msword",
       "url": "http://example.com"
     }
   ],
@@ -104,7 +104,7 @@ class JotEventMapperTest extends Specification {
   "structured-data": [
     {
       "value": "text",
-      "fmttype": "string",
+      "fmttype": "application/xml",
       "schema": "string",
       "text": "string"
     }
@@ -113,7 +113,7 @@ class JotEventMapperTest extends Specification {
 
         and: 'an object mapper'
         SimpleModule module = []
-        module.addDeserializer(VEvent, new JotEventMapper())
+        module.addDeserializer(VEvent, new VEventMapper())
         ObjectMapper mapper = []
         mapper.registerModule(module)
 
@@ -143,15 +143,15 @@ CREATED:20190824T141522Z\r
 CATEGORIES:string\r
 COMMENT;ALTREP=string:string\r
 RESOURCES;ALTREP="CID:[email protected]":07cc67f4-45d6-494b-adac-09b5cbc7e2b5\r
-ATTACH;FMTTYPE=string:http://example.com\r
+ATTACH;FMTTYPE=application/msword:http://example.com\r
 RELATED-TO;RELTYPE=PARENT:07cc67f4-45d6-494b-adac-09b5cbc7e2b5\r
 RDATE:20190824T141522Z\r
 EXDATE:20190824T141522Z\r
 ATTENDEE;MEMBER="mailto:[email protected]";ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=FALSE;CN=string;DIR="http://example.com";LANGUAGE=en-US:mailto:[email protected]\r
 TRANSP:OPAQUE\r
 CONTACT;ALTREP=string:string\r
 STYLED-DESCRIPTION;FMTTYPE=text/html;VALUE=TEXT:true\r
-STRUCTURED-DATA;VALUE=text;FMTTYPE=string:string\r
+STRUCTURED-DATA;VALUE=text;FMTTYPE=application/xml:string\r
 END:VEVENT\r\n'''
     }
 }

src/test/groovy/org/mnode/ical4j/serializer/jot/JotJournalMapperTest.groovy → src/test/groovy/org/mnode/ical4j/serializer/model/component/VJournalMapperTest.groovy

@@ -1,11 +1,11 @@
-package org.mnode.ical4j.serializer.jot
+package org.mnode.ical4j.serializer.model.component
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.module.SimpleModule
 import net.fortuna.ical4j.model.component.VJournal
 import spock.lang.Specification
 
-class JotJournalMapperTest extends Specification {
+class VJournalMapperTest extends Specification {
 
     def 'test journal deserialization'() {
         given: 'a json string'
@@ -39,7 +39,7 @@ class JotJournalMapperTest extends Specification {
   ],
   "attach": [
     {
-      "fmttype": "string",
+      "fmttype": "application/msword",
       "binary": "string"
     }
   ],
@@ -86,7 +86,7 @@ class JotJournalMapperTest extends Specification {
   "structured-data": [
     {
       "value": "text",
-      "fmttype": "string",
+      "fmttype": "application/xml",
       "schema": "string",
       "text": "string"
     }
@@ -95,7 +95,7 @@ class JotJournalMapperTest extends Specification {
 
         and: 'an object mapper'
         SimpleModule module = []
-        module.addDeserializer(VJournal, new JotJournalMapper())
+        module.addDeserializer(VJournal, new VJournalMapper())
         ObjectMapper mapper = []
         mapper.registerModule(module)
 
@@ -118,14 +118,14 @@ class JotJournalMapperTest extends Specification {
                 'LAST-MODIFIED:20190824T141522Z\r\n' +
                 'CATEGORIES:string\r\n' +
                 'COMMENT;ALTREP=string:string\r\n' +
-                'ATTACH;FMTTYPE=string:string\r\n' +
+                'ATTACH;FMTTYPE=application/msword:string\r\n' +
                 'RELATED-TO;RELTYPE=PARENT:07cc67f4-45d6-494b-adac-09b5cbc7e2b5\r\n' +
                 'RDATE:20190824T141522Z\r\n' +
                 'EXDATE:20190824T141522Z\r\n' +
                 'ATTENDEE;MEMBER="mailto:[email protected]";ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=FALSE;CN=string;DIR="http://example.com";LANGUAGE=en-US:mailto:[email protected]\r\n' +
                 'CONTACT;ALTREP=string:string\r\n' +
                 'STYLED-DESCRIPTION;FMTTYPE=text/html;VALUE=TEXT:true\r\n' +
-                'STRUCTURED-DATA;VALUE=text;FMTTYPE=string:string\r\n' +
+                'STRUCTURED-DATA;VALUE=text;FMTTYPE=application/xml:string\r\n' +
                 'END:VJOURNAL\r\n'
     }
 }

src/test/groovy/org/mnode/ical4j/serializer/jot/JotToDoMapperTest.groovy → src/test/groovy/org/mnode/ical4j/serializer/model/component/VToDoMapperTest.groovy

@@ -1,11 +1,11 @@
-package org.mnode.ical4j.serializer.jot
+package org.mnode.ical4j.serializer.model.component
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.module.SimpleModule
 import net.fortuna.ical4j.model.component.VToDo
 import spock.lang.Specification
 
-class JotToDoMapperTest extends Specification {
+class VToDoMapperTest extends Specification {
 
     def 'test todo deserialization'() {
         given: 'a json string'
@@ -52,7 +52,7 @@ class JotToDoMapperTest extends Specification {
   ],
   "attachments": [
     {
-      "fmttype": "string",
+      "fmttype": "application/msword",
       "url": "http://example.com"
     }
   ],
@@ -92,7 +92,7 @@ class JotToDoMapperTest extends Specification {
   "structured-data": [
     {
       "value": "text",
-      "fmttype": "string",
+      "fmttype": "application/xml",
       "schema": "string",
       "text": "string"
     }
@@ -101,7 +101,7 @@ class JotToDoMapperTest extends Specification {
 
         and: 'an object mapper'
         SimpleModule module = []
-        module.addDeserializer(VToDo, new JotToDoMapper())
+        module.addDeserializer(VToDo, new VToDoMapper())
         ObjectMapper mapper = []
         mapper.registerModule(module)
 
@@ -132,12 +132,12 @@ DESCRIPTION:string\r
 CATEGORIES:string\r
 COMMENTS:string\r
 RESOURCES;ALTREP="CID:[email protected]":07cc67f4-45d6-494b-adac-09b5cbc7e2b5\r
-ATTACHMENTS;FMTTYPE=string:http://example.com\r
+ATTACHMENTS;FMTTYPE=application/msword:http://example.com\r
 RELATED-TO;RELTYPE=PARENT:07cc67f4-45d6-494b-adac-09b5cbc7e2b5\r
 ATTENDEES;MEMBER="mailto:[email protected]";ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=FALSE;CN=string;DIR="http://example.com";LANGUAGE=en-US:mailto:[email protected]\r
 CONTACTS:string\r
 STYLED-DESCRIPTION;FMTTYPE=text/html;VALUE=TEXT:true\r
-STRUCTURED-DATA;VALUE=text;FMTTYPE=string:string\r
+STRUCTURED-DATA;VALUE=text;FMTTYPE=application/xml:string\r
 END:VTODO\r\n'''
     }
 }