mvn clean install passes moves as 1.0 test jsons into streams-schemas-activitystreams
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/77d780c8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/77d780c8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/77d780c8 Branch: refs/heads/STREAMS-429 Commit: 77d780c84f92c917576281ef2e5e987cabe56d6a Parents: e7bb15a Author: Steve Blackmon @steveblackmon <sblack...@apache.org> Authored: Mon Oct 17 20:28:58 2016 -0500 Committer: Steve Blackmon @steveblackmon <sblack...@apache.org> Committed: Mon Oct 17 20:28:58 2016 -0500 ---------------------------------------------------------------------- streams-plugins/streams-plugin-scala/pom.xml | 1 + .../data/data/util/ActivitySerDeTest.java | 104 --------- .../data/data/util/CustomDateTimeFormat.java | 32 --- .../data/util/CustomDateTimeFormatTest.java | 79 ------- .../data/data/util/DateTimeSerDeTest.java | 81 ------- .../data/data/util/RFC3339UtilsTest.java | 226 ------------------- .../streams/pojo/test/ActivitySerDeTest.java | 104 +++++++++ .../streams/pojo/test/CustomDateTimeFormat.java | 32 +++ .../pojo/test/CustomDateTimeFormatTest.java | 79 +++++++ .../streams/pojo/test/DateTimeSerDeTest.java | 81 +++++++ .../streams/pojo/test/RFC3339UtilsTest.java | 226 +++++++++++++++++++ .../src/test/resources/activities/accept.json | 16 -- .../src/test/resources/activities/access.json | 17 -- .../test/resources/activities/acknowledge.json | 16 -- .../src/test/resources/activities/add.json | 21 -- .../src/test/resources/activities/agree.json | 15 -- .../src/test/resources/activities/append.json | 16 -- .../src/test/resources/activities/approve.json | 20 -- .../src/test/resources/activities/archive.json | 15 -- .../src/test/resources/activities/assign.json | 20 -- .../src/test/resources/activities/at.json | 15 -- .../src/test/resources/activities/attach.json | 20 -- .../src/test/resources/activities/attend.json | 15 -- .../src/test/resources/activities/author.json | 15 -- .../test/resources/activities/authorize.json | 23 -- .../src/test/resources/activities/borrow.json | 21 -- .../src/test/resources/activities/build.json | 16 -- .../src/test/resources/activities/cancel.json | 16 -- .../src/test/resources/activities/checkin.json | 16 -- .../src/test/resources/activities/close.json | 16 -- .../src/test/resources/activities/complete.json | 16 -- .../src/test/resources/activities/confirm.json | 17 -- .../src/test/resources/activities/consume.json | 16 -- .../src/test/resources/activities/create.json | 15 -- .../src/test/resources/activities/delete.json | 16 -- .../src/test/resources/activities/deliver.json | 20 -- .../src/test/resources/activities/deny.json | 23 -- .../src/test/resources/activities/disagree.json | 30 --- .../src/test/resources/activities/dislike.json | 15 -- .../test/resources/activities/experience.json | 16 -- .../src/test/resources/activities/favorite.json | 15 -- .../src/test/resources/activities/find.json | 19 -- .../activities/flag-as-inappropriate.json | 24 -- .../src/test/resources/activities/follow.json | 15 -- .../src/test/resources/activities/give.json | 28 --- .../src/test/resources/activities/host.json | 15 -- .../src/test/resources/activities/ignore.json | 15 -- .../src/test/resources/activities/insert.json | 19 -- .../src/test/resources/activities/install.json | 18 -- .../src/test/resources/activities/interact.json | 16 -- .../src/test/resources/activities/invite.json | 19 -- .../src/test/resources/activities/join.json | 15 -- .../src/test/resources/activities/leave.json | 15 -- .../src/test/resources/activities/like.json | 22 -- .../src/test/resources/activities/listen.json | 15 -- .../src/test/resources/activities/lose.json | 15 -- .../test/resources/activities/make-friend.json | 15 -- .../src/test/resources/activities/open.json | 15 -- .../src/test/resources/activities/play.json | 15 -- .../src/test/resources/activities/post.json | 28 --- .../src/test/resources/activities/present.json | 15 -- .../src/test/resources/activities/purchase.json | 16 -- .../src/test/resources/activities/qualify.json | 15 -- .../src/test/resources/activities/read.json | 16 -- .../src/test/resources/activities/receive.json | 16 -- .../src/test/resources/activities/reject.json | 15 -- .../resources/activities/remove-friend.json | 15 -- .../src/test/resources/activities/remove.json | 23 -- .../src/test/resources/activities/replace.json | 19 -- .../resources/activities/request-friend.json | 16 -- .../src/test/resources/activities/request.json | 23 -- .../src/test/resources/activities/resolve.json | 15 -- .../src/test/resources/activities/retract.json | 26 --- .../src/test/resources/activities/return.json | 19 -- .../test/resources/activities/rsvp-maybe.json | 16 -- .../src/test/resources/activities/rsvp-no.json | 16 -- .../src/test/resources/activities/rsvp-yes.json | 16 -- .../src/test/resources/activities/satisfy.json | 21 -- .../src/test/resources/activities/save.json | 20 -- .../src/test/resources/activities/schedule.json | 15 -- .../src/test/resources/activities/search.json | 21 -- .../src/test/resources/activities/sell.json | 19 -- .../src/test/resources/activities/send.json | 19 -- .../src/test/resources/activities/share.json | 16 -- .../src/test/resources/activities/sponsor.json | 17 -- .../src/test/resources/activities/start.json | 15 -- .../resources/activities/stop-following.json | 15 -- .../src/test/resources/activities/submit.json | 15 -- .../src/test/resources/activities/tag.json | 19 -- .../test/resources/activities/terminate.json | 15 -- .../src/test/resources/activities/tie.json | 24 -- .../test/resources/activities/unfavorite.json | 15 -- .../src/test/resources/activities/unlike.json | 15 -- .../test/resources/activities/unsatisfy.json | 20 -- .../src/test/resources/activities/unsave.json | 15 -- .../src/test/resources/activities/unshare.json | 15 -- .../src/test/resources/activities/update.json | 15 -- .../src/test/resources/activities/use.json | 15 -- .../src/test/resources/activities/watch.json | 16 -- .../src/test/resources/activities/win.json | 15 -- .../src/test/resources/activities/accept.json | 16 ++ .../src/test/resources/activities/access.json | 17 ++ .../test/resources/activities/acknowledge.json | 16 ++ .../src/test/resources/activities/add.json | 21 ++ .../src/test/resources/activities/agree.json | 15 ++ .../src/test/resources/activities/append.json | 16 ++ .../src/test/resources/activities/approve.json | 20 ++ .../src/test/resources/activities/archive.json | 15 ++ .../src/test/resources/activities/assign.json | 20 ++ .../src/test/resources/activities/at.json | 15 ++ .../src/test/resources/activities/attach.json | 20 ++ .../src/test/resources/activities/attend.json | 15 ++ .../src/test/resources/activities/author.json | 15 ++ .../test/resources/activities/authorize.json | 23 ++ .../src/test/resources/activities/borrow.json | 21 ++ .../src/test/resources/activities/build.json | 16 ++ .../src/test/resources/activities/cancel.json | 16 ++ .../src/test/resources/activities/checkin.json | 16 ++ .../src/test/resources/activities/close.json | 16 ++ .../src/test/resources/activities/complete.json | 16 ++ .../src/test/resources/activities/confirm.json | 17 ++ .../src/test/resources/activities/consume.json | 16 ++ .../src/test/resources/activities/create.json | 15 ++ .../src/test/resources/activities/delete.json | 16 ++ .../src/test/resources/activities/deliver.json | 20 ++ .../src/test/resources/activities/deny.json | 23 ++ .../src/test/resources/activities/disagree.json | 30 +++ .../src/test/resources/activities/dislike.json | 15 ++ .../test/resources/activities/experience.json | 16 ++ .../src/test/resources/activities/favorite.json | 15 ++ .../src/test/resources/activities/find.json | 19 ++ .../activities/flag-as-inappropriate.json | 24 ++ .../src/test/resources/activities/follow.json | 15 ++ .../src/test/resources/activities/give.json | 28 +++ .../src/test/resources/activities/host.json | 15 ++ .../src/test/resources/activities/ignore.json | 15 ++ .../src/test/resources/activities/insert.json | 19 ++ .../src/test/resources/activities/install.json | 18 ++ .../src/test/resources/activities/interact.json | 16 ++ .../src/test/resources/activities/invite.json | 19 ++ .../src/test/resources/activities/join.json | 15 ++ .../src/test/resources/activities/leave.json | 15 ++ .../src/test/resources/activities/like.json | 22 ++ .../src/test/resources/activities/listen.json | 15 ++ .../src/test/resources/activities/lose.json | 15 ++ .../test/resources/activities/make-friend.json | 15 ++ .../src/test/resources/activities/open.json | 15 ++ .../src/test/resources/activities/play.json | 15 ++ .../src/test/resources/activities/post.json | 28 +++ .../src/test/resources/activities/present.json | 15 ++ .../src/test/resources/activities/purchase.json | 16 ++ .../src/test/resources/activities/qualify.json | 15 ++ .../src/test/resources/activities/read.json | 16 ++ .../src/test/resources/activities/receive.json | 16 ++ .../src/test/resources/activities/reject.json | 15 ++ .../resources/activities/remove-friend.json | 15 ++ .../src/test/resources/activities/remove.json | 23 ++ .../src/test/resources/activities/replace.json | 19 ++ .../resources/activities/request-friend.json | 16 ++ .../src/test/resources/activities/request.json | 23 ++ .../src/test/resources/activities/resolve.json | 15 ++ .../src/test/resources/activities/retract.json | 26 +++ .../src/test/resources/activities/return.json | 19 ++ .../test/resources/activities/rsvp-maybe.json | 16 ++ .../src/test/resources/activities/rsvp-no.json | 16 ++ .../src/test/resources/activities/rsvp-yes.json | 16 ++ .../src/test/resources/activities/satisfy.json | 21 ++ .../src/test/resources/activities/save.json | 20 ++ .../src/test/resources/activities/schedule.json | 15 ++ .../src/test/resources/activities/search.json | 21 ++ .../src/test/resources/activities/sell.json | 19 ++ .../src/test/resources/activities/send.json | 19 ++ .../src/test/resources/activities/share.json | 16 ++ .../src/test/resources/activities/sponsor.json | 17 ++ .../src/test/resources/activities/start.json | 15 ++ .../resources/activities/stop-following.json | 15 ++ .../src/test/resources/activities/submit.json | 15 ++ .../src/test/resources/activities/tag.json | 19 ++ .../test/resources/activities/terminate.json | 15 ++ .../src/test/resources/activities/tie.json | 24 ++ .../test/resources/activities/unfavorite.json | 15 ++ .../src/test/resources/activities/unlike.json | 15 ++ .../test/resources/activities/unsatisfy.json | 20 ++ .../src/test/resources/activities/unsave.json | 15 ++ .../src/test/resources/activities/unshare.json | 15 ++ .../src/test/resources/activities/update.json | 15 ++ .../src/test/resources/activities/use.json | 15 ++ .../src/test/resources/activities/watch.json | 16 ++ .../src/test/resources/activities/win.json | 15 ++ 189 files changed, 2083 insertions(+), 2082 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-plugins/streams-plugin-scala/pom.xml ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-scala/pom.xml b/streams-plugins/streams-plugin-scala/pom.xml index 2a2200b..e1a41f3 100644 --- a/streams-plugins/streams-plugin-scala/pom.xml +++ b/streams-plugins/streams-plugin-scala/pom.xml @@ -225,6 +225,7 @@ <goal>unpack-dependencies</goal> </goals> <configuration> + <includeGroupIds>org.apache.streams</includeGroupIds> <includeArtifactIds>streams-pojo</includeArtifactIds> <includes>org/apache/streams/pojo/json/**</includes> <outputDirectory>${project.build.directory}/test-classes</outputDirectory> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/java/org/apache/streams/data/data/util/ActivitySerDeTest.java ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/java/org/apache/streams/data/data/util/ActivitySerDeTest.java b/streams-pojo/src/test/java/org/apache/streams/data/data/util/ActivitySerDeTest.java deleted file mode 100644 index c7a5958..0000000 --- a/streams-pojo/src/test/java/org/apache/streams/data/data/util/ActivitySerDeTest.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.streams.data.data.util; - -import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.commons.io.Charsets; -import org.apache.commons.io.IOUtils; -import org.apache.streams.jackson.StreamsJacksonMapper; -import org.apache.streams.pojo.json.Activity; -import org.junit.Test; -import org.reflections.Reflections; -import org.reflections.scanners.SubTypesScanner; -import org.reflections.util.ClasspathHelper; -import org.reflections.util.ConfigurationBuilder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.InputStream; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; - -/** - * Test that Activity beans are compatible with the example activities in the spec. - */ -public class ActivitySerDeTest { - - private final static Logger LOGGER = LoggerFactory.getLogger(ActivitySerDeTest.class); - - private final static ObjectMapper MAPPER = StreamsJacksonMapper.getInstance(); - - /** - * Tests that all example activities can be loaded into Activity beans - * @throws Exception - */ - @Test - public void testActivitySerDe() throws Exception { - - InputStream testActivityFolderStream = ActivitySerDeTest.class.getClassLoader() - .getResourceAsStream("activities"); - List<String> files = IOUtils.readLines(testActivityFolderStream, Charsets.UTF_8); - - for( String file : files) { - LOGGER.info("File: " + file ); - LOGGER.info("Serializing: activities/" + file ); - InputStream testActivityFileStream = ActivitySerDeTest.class.getClassLoader() - .getResourceAsStream("activities/" + file); - Activity activity = MAPPER.readValue(testActivityFileStream, Activity.class); - activity.setGenerator(null); - activity.setLinks(new LinkedList<String>()); - String activityString = MAPPER.writeValueAsString(activity); - LOGGER.info("Deserialized: " + activityString ); - assert( !activityString.contains("null") ); - assert( !activityString.contains("[]") ); - } - } - - /** - * Tests that defined activity verbs have an example which can be loaded into - * Activity beans and into verb-specific beans - * @throws Exception - */ - @Test - public void testVerbSerDe() throws Exception { - - Reflections reflections = new Reflections(new ConfigurationBuilder() - .setUrls(ClasspathHelper.forPackage("org.apache.streams.pojo.json")) - .setScanners(new SubTypesScanner())); - Set<Class<? extends Activity>> verbs = reflections.getSubTypesOf(Activity.class); - - for( Class verbClass : verbs) { - LOGGER.info("Verb: " + verbClass.getSimpleName() ); - Activity activity = (Activity) verbClass.newInstance(); - String verbName = activity.getVerb(); - String testfile = verbName.toLowerCase() + ".json"; - LOGGER.info("Serializing: activities/" + testfile ); - assert(ActivitySerDeTest.class.getClassLoader().getResource("activities/" + testfile) != null); - InputStream testActivityFileStream = ActivitySerDeTest.class.getClassLoader() - .getResourceAsStream("activities/" + testfile); - assert(testActivityFileStream != null); - activity = MAPPER.convertValue(MAPPER.readValue(testActivityFileStream, verbClass), Activity.class); - String activityString = MAPPER.writeValueAsString(activity); - LOGGER.info("Deserialized: " + activityString ); - assert( !activityString.contains("null") ); - assert( !activityString.contains("[]") ); - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/java/org/apache/streams/data/data/util/CustomDateTimeFormat.java ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/java/org/apache/streams/data/data/util/CustomDateTimeFormat.java b/streams-pojo/src/test/java/org/apache/streams/data/data/util/CustomDateTimeFormat.java deleted file mode 100644 index ee111e1..0000000 --- a/streams-pojo/src/test/java/org/apache/streams/data/data/util/CustomDateTimeFormat.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.streams.data.data.util; - -import org.apache.streams.jackson.StreamsDateTimeFormat; - -/** - * Supporting class for {@link org.apache.streams.data.data.util.CustomDateTimeFormatTest} - */ -public class CustomDateTimeFormat implements StreamsDateTimeFormat { - - @Override - public String getFormat() { - return "EEE MMM dd HH:mm:ss Z yyyy"; - } -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/java/org/apache/streams/data/data/util/CustomDateTimeFormatTest.java ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/java/org/apache/streams/data/data/util/CustomDateTimeFormatTest.java b/streams-pojo/src/test/java/org/apache/streams/data/data/util/CustomDateTimeFormatTest.java deleted file mode 100644 index 0163db5..0000000 --- a/streams-pojo/src/test/java/org/apache/streams/data/data/util/CustomDateTimeFormatTest.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.streams.data.data.util; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.streams.jackson.StreamsJacksonMapper; -import org.apache.streams.pojo.json.Activity; -import org.joda.time.DateTime; -import org.junit.Assert; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; - -/** - * Testing {@link org.apache.streams.jackson.StreamsJacksonMapper} ability to bind - * custom DateTime formats. - */ -public class CustomDateTimeFormatTest { - - @Test - public void testCustomDateTimeFormatExplicit() { - String format = "EEE MMM dd HH:mm:ss Z yyyy"; - String input = "Tue Jan 17 21:21:46 Z 2012"; - Long outputMillis = 1326835306000L; - ObjectMapper mapper = StreamsJacksonMapper.getInstance(format); - DateTime time; - try { - String json = "{\"published\":\"" + input + "\"}"; - Activity activity = mapper.readValue(json, Activity.class); - - //Writes out value as a String including quotes - Long result = activity.getPublished().getMillis(); - - assertEquals(result, outputMillis); - } catch (Exception e) { - e.printStackTrace(); - Assert.fail(); - } - } - - @Test - public void testCustomDateTimeFormatReflection() { - String input = "Tue Jan 17 21:21:46 Z 2012"; - Long outputMillis = 1326835306000L; - ObjectMapper mapper = StreamsJacksonMapper.getInstance(); - DateTime time; - try { - String json = "{\"published\":\"" + input + "\"}"; - Activity activity = mapper.readValue(json, Activity.class); - - //Writes out value as a String including quotes - Long result = activity.getPublished().getMillis(); - - assertEquals(result, outputMillis); - } catch (Exception e) { - e.printStackTrace(); - Assert.fail(); - } - } - - -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/java/org/apache/streams/data/data/util/DateTimeSerDeTest.java ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/java/org/apache/streams/data/data/util/DateTimeSerDeTest.java b/streams-pojo/src/test/java/org/apache/streams/data/data/util/DateTimeSerDeTest.java deleted file mode 100644 index d882450..0000000 --- a/streams-pojo/src/test/java/org/apache/streams/data/data/util/DateTimeSerDeTest.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.streams.data.data.util; - -import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.streams.jackson.StreamsJacksonMapper; -import org.joda.time.DateTime; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import static org.junit.Assert.assertEquals; - -/** - * Testing {@link org.apache.streams.jackson.StreamsJacksonMapper} ability to read and write - * RFC3339 format. - */ -public class DateTimeSerDeTest { - - private final static Logger LOGGER = LoggerFactory.getLogger(DateTimeSerDeTest.class); - private ObjectMapper mapper = StreamsJacksonMapper.getInstance(); - - @Ignore - @Test - // this really needs to be able to pass... - public void testActivityStringSer() { - String input = "2012-01-17T21:21:46.000Z"; - try { - DateTime output = mapper.readValue(input, DateTime.class); - } catch (Exception e) { - e.printStackTrace(); - Assert.fail(); - } - } - - @Test - public void testMillisDeser() { - Long input = 1326856906000l; - try { - DateTime output = mapper.readValue(input.toString(), DateTime.class); - } catch (Exception e) { - e.printStackTrace(); - Assert.fail(); - } - } - - @Test - public void testActivityStringDeser() { - String output = "2012-01-17T21:21:46.000Z"; - long inputMillis = 1326835306000L; - DateTime input; - try { - input = new DateTime(inputMillis); - //Writes out value as a String including quotes - String result = mapper.writeValueAsString(input); - assertEquals(result.replace("\"", ""), output); - } catch (Exception e) { - e.printStackTrace(); - Assert.fail(); - } - } - -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/java/org/apache/streams/data/data/util/RFC3339UtilsTest.java ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/java/org/apache/streams/data/data/util/RFC3339UtilsTest.java b/streams-pojo/src/test/java/org/apache/streams/data/data/util/RFC3339UtilsTest.java deleted file mode 100644 index 5d1a922..0000000 --- a/streams-pojo/src/test/java/org/apache/streams/data/data/util/RFC3339UtilsTest.java +++ /dev/null @@ -1,226 +0,0 @@ -/* -* Licensed to the Apache Software Foundation (ASF) under one -* or more contributor license agreements. See the NOTICE file -* distributed with this work for additional information -* regarding copyright ownership. The ASF licenses this file -* to you under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, -* software distributed under the License is distributed on an -* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -* KIND, either express or implied. See the License for the -* specific language governing permissions and limitations -* under the License. -*/ - -package org.apache.streams.data.data.util; - -import org.apache.streams.data.util.RFC3339Utils; -import org.joda.time.DateTime; -import org.joda.time.DateTimeZone; -import org.junit.Test; - -import java.util.TimeZone; - -import static org.apache.streams.data.util.RFC3339Utils.format; -import static org.apache.streams.data.util.RFC3339Utils.parseUTC; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; - -/** - * Testing {@link org.apache.streams.data.util.RFC3339Utils} - */ -public class RFC3339UtilsTest { - - @Test - public void validUTC() { - DateTime parsed = parseUTC("2014-12-25T12:00:00Z"); - assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); - assertThat(parsed.hourOfDay().get(), is(equalTo(12))); - assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); - assertThat(parsed.monthOfYear().get(), is(equalTo(12))); - } - - @Test - public void validUTCSubSecond() { - DateTime parsed = parseUTC("2014-12-25T12:00:00.7Z"); - assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); - assertThat(parsed.hourOfDay().get(), is(equalTo(12))); - assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); - assertThat(parsed.monthOfYear().get(), is(equalTo(12))); - assertThat(parsed.millisOfSecond().get(), is(equalTo(700))); - } - - @Test - public void validUTCSubSecondMultiDigit() { - DateTime parsed = parseUTC("2014-12-25T12:00:00.7343Z"); - assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); - assertThat(parsed.hourOfDay().get(), is(equalTo(12))); - assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); - assertThat(parsed.monthOfYear().get(), is(equalTo(12))); - assertThat(parsed.millisOfSecond().get(), is(equalTo(734))); - } - - @Test - public void validEST() { - DateTime parsed = parseUTC("2014-12-25T12:00:00-05:00"); - assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); - assertThat(parsed.hourOfDay().get(), is(equalTo(17))); - assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); - assertThat(parsed.monthOfYear().get(), is(equalTo(12))); - } - - @Test - public void validESTSubSecond() { - DateTime parsed = parseUTC("2014-12-25T12:00:00.7-05:00"); - assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); - assertThat(parsed.hourOfDay().get(), is(equalTo(17))); - assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); - assertThat(parsed.monthOfYear().get(), is(equalTo(12))); - assertThat(parsed.millisOfSecond().get(), is(equalTo(700))); - } - - @Test - public void validESTSubSecondMultiDigit() { - DateTime parsed = parseUTC("2014-12-25T12:00:00.7343-05:00"); - assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); - assertThat(parsed.hourOfDay().get(), is(equalTo(17))); - assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); - assertThat(parsed.monthOfYear().get(), is(equalTo(12))); - assertThat(parsed.millisOfSecond().get(), is(equalTo(734))); - } - - @Test - public void validESTNoSeparator() { - DateTime parsed = parseUTC("2014-12-25T12:00:00-0500"); - assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); - assertThat(parsed.hourOfDay().get(), is(equalTo(17))); - assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); - assertThat(parsed.monthOfYear().get(), is(equalTo(12))); - } - - @Test - public void validESTSubSecondNoSeparator() { - DateTime parsed = parseUTC("2014-12-25T12:00:00.7-0500"); - assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); - assertThat(parsed.hourOfDay().get(), is(equalTo(17))); - assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); - assertThat(parsed.monthOfYear().get(), is(equalTo(12))); - assertThat(parsed.millisOfSecond().get(), is(equalTo(700))); - } - - @Test - public void validESTSubSecondMultiDigitNoSeparator() { - DateTime parsed = parseUTC("2014-12-25T12:00:00.7343-0500"); - assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); - assertThat(parsed.hourOfDay().get(), is(equalTo(17))); - assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); - assertThat(parsed.monthOfYear().get(), is(equalTo(12))); - assertThat(parsed.millisOfSecond().get(), is(equalTo(734))); - } - - @Test - public void validCET() { - DateTime parsed = parseUTC("2014-12-25T12:00:00+01:00"); - assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); - assertThat(parsed.hourOfDay().get(), is(equalTo(11))); - assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); - assertThat(parsed.monthOfYear().get(), is(equalTo(12))); - } - - @Test - public void validCETSubSecond() { - DateTime parsed = parseUTC("2014-12-25T12:00:00.7+01:00"); - assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); - assertThat(parsed.hourOfDay().get(), is(equalTo(11))); - assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); - assertThat(parsed.monthOfYear().get(), is(equalTo(12))); - assertThat(parsed.millisOfSecond().get(), is(equalTo(700))); - } - - @Test - public void validCETSubSecondMultidigit() { - DateTime parsed = parseUTC("2014-12-25T12:00:00.7343+01:00"); - assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); - assertThat(parsed.hourOfDay().get(), is(equalTo(11))); - assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); - assertThat(parsed.monthOfYear().get(), is(equalTo(12))); - assertThat(parsed.millisOfSecond().get(), is(equalTo(734))); - } - - @Test - public void validLong() { - DateTime parsed = parseUTC("1419505200734"); - assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); - assertThat(parsed.hourOfDay().get(), is(equalTo(11))); - assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); - assertThat(parsed.monthOfYear().get(), is(equalTo(12))); - assertThat(parsed.millisOfSecond().get(), is(equalTo(734))); - } - - @Test - public void validFormatUTC() { - DateTime parsed = new DateTime(1419505200734L); - assertThat(format(parsed), is(equalTo("2014-12-25T11:00:00.734Z"))); - } - - @Test - public void validFormat() { - TimeZone cet = TimeZone.getTimeZone("CET"); - DateTime parsed = new DateTime(1419505200734L); - assertThat(format(parsed, cet), is(equalTo("2014-12-25T12:00:00.734+0100"))); - } - - @Test - public void testParseVariousDateFormats() { - String date = "Thu April 24 04:43:10 -0500 2014"; - DateTime expected = new DateTime(2014, 4, 24, 9, 43, 10, DateTimeZone.forOffsetHours(0)); - testHelper(expected, date); - date = "2014/04/24 04:43:10"; - expected = new DateTime(2014, 4, 24, 4, 43, 10, DateTimeZone.forOffsetHours(0)); - testHelper(expected, date); - date = "2014-04-24T04:43:10Z"; - testHelper(expected, date); - date = "04:43:10 2014/04/24"; - testHelper(expected, date); - date = "4/24/2014 04:43:10"; - testHelper(expected, date); - date = "04:43:10 4/24/2014"; - testHelper(expected, date); - date = "04:43:10 2014-04-24"; - testHelper(expected, date); - date = "4-24-2014 04:43:10"; - testHelper(expected, date); - date = "04:43:10 4-24-2014"; - testHelper(expected, date); - expected = new DateTime(2014, 4, 24, 0, 0, 0, DateTimeZone.forOffsetHours(0)); - date = "24-4-2014"; - testHelper(expected, date); - date = "2014-4-24"; - testHelper(expected, date); - date = "2014/4/24"; - testHelper(expected, date); - date = "2014/4/24 fesdfs"; - try { - RFC3339Utils.parseToUTC(date); - fail("Should not have been able to parse : "+date); - } catch (Exception e) { - } - } - - private void testHelper(DateTime expected, String dateString) { - DateTime parsedDate = RFC3339Utils.parseToUTC(dateString); - assertEquals("Failed to parse : "+dateString, expected, parsedDate); - String rfc3339String = RFC3339Utils.format(dateString); - String parsedRfc3339String = RFC3339Utils.format(parsedDate); - assertEquals("Parsed String should be equal.", parsedRfc3339String, rfc3339String); - DateTime convertedBack = RFC3339Utils.parseToUTC(parsedRfc3339String); - assertEquals(expected, convertedBack); - } -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/java/org/apache/streams/pojo/test/ActivitySerDeTest.java ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/java/org/apache/streams/pojo/test/ActivitySerDeTest.java b/streams-pojo/src/test/java/org/apache/streams/pojo/test/ActivitySerDeTest.java new file mode 100644 index 0000000..1498ac1 --- /dev/null +++ b/streams-pojo/src/test/java/org/apache/streams/pojo/test/ActivitySerDeTest.java @@ -0,0 +1,104 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.streams.pojo.test; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.commons.io.Charsets; +import org.apache.commons.io.IOUtils; +import org.apache.streams.jackson.StreamsJacksonMapper; +import org.apache.streams.pojo.json.Activity; +import org.junit.Test; +import org.reflections.Reflections; +import org.reflections.scanners.SubTypesScanner; +import org.reflections.util.ClasspathHelper; +import org.reflections.util.ConfigurationBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.InputStream; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; + +/** + * Test that Activity beans are compatible with the example activities in the spec. + */ +public class ActivitySerDeTest { + + private final static Logger LOGGER = LoggerFactory.getLogger(ActivitySerDeTest.class); + + private final static ObjectMapper MAPPER = StreamsJacksonMapper.getInstance(); + + /** + * Tests that all example activities can be loaded into Activity beans + * @throws Exception + */ + @Test + public void testActivitySerDe() throws Exception { + + InputStream testActivityFolderStream = ActivitySerDeTest.class.getClassLoader() + .getResourceAsStream("activities"); + List<String> files = IOUtils.readLines(testActivityFolderStream, Charsets.UTF_8); + + for( String file : files) { + LOGGER.info("File: " + file ); + LOGGER.info("Serializing: activities/" + file ); + InputStream testActivityFileStream = ActivitySerDeTest.class.getClassLoader() + .getResourceAsStream("activities/" + file); + Activity activity = MAPPER.readValue(testActivityFileStream, Activity.class); + activity.setGenerator(null); + activity.setLinks(new LinkedList<String>()); + String activityString = MAPPER.writeValueAsString(activity); + LOGGER.info("Deserialized: " + activityString ); + assert( !activityString.contains("null") ); + assert( !activityString.contains("[]") ); + } + } + + /** + * Tests that defined activity verbs have an example which can be loaded into + * Activity beans and into verb-specific beans + * @throws Exception + */ + @Test + public void testVerbSerDe() throws Exception { + + Reflections reflections = new Reflections(new ConfigurationBuilder() + .setUrls(ClasspathHelper.forPackage("org.apache.streams.pojo.json")) + .setScanners(new SubTypesScanner())); + Set<Class<? extends Activity>> verbs = reflections.getSubTypesOf(Activity.class); + + for( Class verbClass : verbs) { + LOGGER.info("Verb: " + verbClass.getSimpleName() ); + Activity activity = (Activity) verbClass.newInstance(); + String verbName = activity.getVerb(); + String testfile = verbName.toLowerCase() + ".json"; + LOGGER.info("Serializing: activities/" + testfile ); + assert(ActivitySerDeTest.class.getClassLoader().getResource("activities/" + testfile) != null); + InputStream testActivityFileStream = ActivitySerDeTest.class.getClassLoader() + .getResourceAsStream("activities/" + testfile); + assert(testActivityFileStream != null); + activity = MAPPER.convertValue(MAPPER.readValue(testActivityFileStream, verbClass), Activity.class); + String activityString = MAPPER.writeValueAsString(activity); + LOGGER.info("Deserialized: " + activityString ); + assert( !activityString.contains("null") ); + assert( !activityString.contains("[]") ); + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/java/org/apache/streams/pojo/test/CustomDateTimeFormat.java ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/java/org/apache/streams/pojo/test/CustomDateTimeFormat.java b/streams-pojo/src/test/java/org/apache/streams/pojo/test/CustomDateTimeFormat.java new file mode 100644 index 0000000..15bbaca --- /dev/null +++ b/streams-pojo/src/test/java/org/apache/streams/pojo/test/CustomDateTimeFormat.java @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.streams.pojo.test; + +import org.apache.streams.jackson.StreamsDateTimeFormat; + +/** + * Supporting class for {@link CustomDateTimeFormatTest} + */ +public class CustomDateTimeFormat implements StreamsDateTimeFormat { + + @Override + public String getFormat() { + return "EEE MMM dd HH:mm:ss Z yyyy"; + } +} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/java/org/apache/streams/pojo/test/CustomDateTimeFormatTest.java ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/java/org/apache/streams/pojo/test/CustomDateTimeFormatTest.java b/streams-pojo/src/test/java/org/apache/streams/pojo/test/CustomDateTimeFormatTest.java new file mode 100644 index 0000000..edaa085 --- /dev/null +++ b/streams-pojo/src/test/java/org/apache/streams/pojo/test/CustomDateTimeFormatTest.java @@ -0,0 +1,79 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.streams.pojo.test; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.apache.streams.jackson.StreamsJacksonMapper; +import org.apache.streams.pojo.json.Activity; +import org.joda.time.DateTime; +import org.junit.Assert; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +/** + * Testing {@link org.apache.streams.jackson.StreamsJacksonMapper} ability to bind + * custom DateTime formats. + */ +public class CustomDateTimeFormatTest { + + @Test + public void testCustomDateTimeFormatExplicit() { + String format = "EEE MMM dd HH:mm:ss Z yyyy"; + String input = "Tue Jan 17 21:21:46 Z 2012"; + Long outputMillis = 1326835306000L; + ObjectMapper mapper = StreamsJacksonMapper.getInstance(format); + DateTime time; + try { + String json = "{\"published\":\"" + input + "\"}"; + Activity activity = mapper.readValue(json, Activity.class); + + //Writes out value as a String including quotes + Long result = activity.getPublished().getMillis(); + + assertEquals(result, outputMillis); + } catch (Exception e) { + e.printStackTrace(); + Assert.fail(); + } + } + + @Test + public void testCustomDateTimeFormatReflection() { + String input = "Tue Jan 17 21:21:46 Z 2012"; + Long outputMillis = 1326835306000L; + ObjectMapper mapper = StreamsJacksonMapper.getInstance(); + DateTime time; + try { + String json = "{\"published\":\"" + input + "\"}"; + Activity activity = mapper.readValue(json, Activity.class); + + //Writes out value as a String including quotes + Long result = activity.getPublished().getMillis(); + + assertEquals(result, outputMillis); + } catch (Exception e) { + e.printStackTrace(); + Assert.fail(); + } + } + + +} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/java/org/apache/streams/pojo/test/DateTimeSerDeTest.java ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/java/org/apache/streams/pojo/test/DateTimeSerDeTest.java b/streams-pojo/src/test/java/org/apache/streams/pojo/test/DateTimeSerDeTest.java new file mode 100644 index 0000000..9fdda61 --- /dev/null +++ b/streams-pojo/src/test/java/org/apache/streams/pojo/test/DateTimeSerDeTest.java @@ -0,0 +1,81 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.streams.pojo.test; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.streams.jackson.StreamsJacksonMapper; +import org.joda.time.DateTime; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.junit.Assert.assertEquals; + +/** + * Testing {@link org.apache.streams.jackson.StreamsJacksonMapper} ability to read and write + * RFC3339 format. + */ +public class DateTimeSerDeTest { + + private final static Logger LOGGER = LoggerFactory.getLogger(DateTimeSerDeTest.class); + private ObjectMapper mapper = StreamsJacksonMapper.getInstance(); + + @Ignore + @Test + // this really needs to be able to pass... + public void testActivityStringSer() { + String input = "2012-01-17T21:21:46.000Z"; + try { + DateTime output = mapper.readValue(input, DateTime.class); + } catch (Exception e) { + e.printStackTrace(); + Assert.fail(); + } + } + + @Test + public void testMillisDeser() { + Long input = 1326856906000l; + try { + DateTime output = mapper.readValue(input.toString(), DateTime.class); + } catch (Exception e) { + e.printStackTrace(); + Assert.fail(); + } + } + + @Test + public void testActivityStringDeser() { + String output = "2012-01-17T21:21:46.000Z"; + long inputMillis = 1326835306000L; + DateTime input; + try { + input = new DateTime(inputMillis); + //Writes out value as a String including quotes + String result = mapper.writeValueAsString(input); + assertEquals(result.replace("\"", ""), output); + } catch (Exception e) { + e.printStackTrace(); + Assert.fail(); + } + } + +} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/java/org/apache/streams/pojo/test/RFC3339UtilsTest.java ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/java/org/apache/streams/pojo/test/RFC3339UtilsTest.java b/streams-pojo/src/test/java/org/apache/streams/pojo/test/RFC3339UtilsTest.java new file mode 100644 index 0000000..b44e72a --- /dev/null +++ b/streams-pojo/src/test/java/org/apache/streams/pojo/test/RFC3339UtilsTest.java @@ -0,0 +1,226 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ + +package org.apache.streams.pojo.test; + +import org.apache.streams.data.util.RFC3339Utils; +import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; +import org.junit.Test; + +import java.util.TimeZone; + +import static org.apache.streams.data.util.RFC3339Utils.format; +import static org.apache.streams.data.util.RFC3339Utils.parseUTC; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; + +/** + * Testing {@link org.apache.streams.data.util.RFC3339Utils} + */ +public class RFC3339UtilsTest { + + @Test + public void validUTC() { + DateTime parsed = parseUTC("2014-12-25T12:00:00Z"); + assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); + assertThat(parsed.hourOfDay().get(), is(equalTo(12))); + assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); + assertThat(parsed.monthOfYear().get(), is(equalTo(12))); + } + + @Test + public void validUTCSubSecond() { + DateTime parsed = parseUTC("2014-12-25T12:00:00.7Z"); + assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); + assertThat(parsed.hourOfDay().get(), is(equalTo(12))); + assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); + assertThat(parsed.monthOfYear().get(), is(equalTo(12))); + assertThat(parsed.millisOfSecond().get(), is(equalTo(700))); + } + + @Test + public void validUTCSubSecondMultiDigit() { + DateTime parsed = parseUTC("2014-12-25T12:00:00.7343Z"); + assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); + assertThat(parsed.hourOfDay().get(), is(equalTo(12))); + assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); + assertThat(parsed.monthOfYear().get(), is(equalTo(12))); + assertThat(parsed.millisOfSecond().get(), is(equalTo(734))); + } + + @Test + public void validEST() { + DateTime parsed = parseUTC("2014-12-25T12:00:00-05:00"); + assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); + assertThat(parsed.hourOfDay().get(), is(equalTo(17))); + assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); + assertThat(parsed.monthOfYear().get(), is(equalTo(12))); + } + + @Test + public void validESTSubSecond() { + DateTime parsed = parseUTC("2014-12-25T12:00:00.7-05:00"); + assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); + assertThat(parsed.hourOfDay().get(), is(equalTo(17))); + assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); + assertThat(parsed.monthOfYear().get(), is(equalTo(12))); + assertThat(parsed.millisOfSecond().get(), is(equalTo(700))); + } + + @Test + public void validESTSubSecondMultiDigit() { + DateTime parsed = parseUTC("2014-12-25T12:00:00.7343-05:00"); + assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); + assertThat(parsed.hourOfDay().get(), is(equalTo(17))); + assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); + assertThat(parsed.monthOfYear().get(), is(equalTo(12))); + assertThat(parsed.millisOfSecond().get(), is(equalTo(734))); + } + + @Test + public void validESTNoSeparator() { + DateTime parsed = parseUTC("2014-12-25T12:00:00-0500"); + assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); + assertThat(parsed.hourOfDay().get(), is(equalTo(17))); + assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); + assertThat(parsed.monthOfYear().get(), is(equalTo(12))); + } + + @Test + public void validESTSubSecondNoSeparator() { + DateTime parsed = parseUTC("2014-12-25T12:00:00.7-0500"); + assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); + assertThat(parsed.hourOfDay().get(), is(equalTo(17))); + assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); + assertThat(parsed.monthOfYear().get(), is(equalTo(12))); + assertThat(parsed.millisOfSecond().get(), is(equalTo(700))); + } + + @Test + public void validESTSubSecondMultiDigitNoSeparator() { + DateTime parsed = parseUTC("2014-12-25T12:00:00.7343-0500"); + assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); + assertThat(parsed.hourOfDay().get(), is(equalTo(17))); + assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); + assertThat(parsed.monthOfYear().get(), is(equalTo(12))); + assertThat(parsed.millisOfSecond().get(), is(equalTo(734))); + } + + @Test + public void validCET() { + DateTime parsed = parseUTC("2014-12-25T12:00:00+01:00"); + assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); + assertThat(parsed.hourOfDay().get(), is(equalTo(11))); + assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); + assertThat(parsed.monthOfYear().get(), is(equalTo(12))); + } + + @Test + public void validCETSubSecond() { + DateTime parsed = parseUTC("2014-12-25T12:00:00.7+01:00"); + assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); + assertThat(parsed.hourOfDay().get(), is(equalTo(11))); + assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); + assertThat(parsed.monthOfYear().get(), is(equalTo(12))); + assertThat(parsed.millisOfSecond().get(), is(equalTo(700))); + } + + @Test + public void validCETSubSecondMultidigit() { + DateTime parsed = parseUTC("2014-12-25T12:00:00.7343+01:00"); + assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); + assertThat(parsed.hourOfDay().get(), is(equalTo(11))); + assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); + assertThat(parsed.monthOfYear().get(), is(equalTo(12))); + assertThat(parsed.millisOfSecond().get(), is(equalTo(734))); + } + + @Test + public void validLong() { + DateTime parsed = parseUTC("1419505200734"); + assertThat(parsed.minuteOfHour().get(), is(equalTo(0))); + assertThat(parsed.hourOfDay().get(), is(equalTo(11))); + assertThat(parsed.dayOfMonth().get(), is(equalTo(25))); + assertThat(parsed.monthOfYear().get(), is(equalTo(12))); + assertThat(parsed.millisOfSecond().get(), is(equalTo(734))); + } + + @Test + public void validFormatUTC() { + DateTime parsed = new DateTime(1419505200734L); + assertThat(format(parsed), is(equalTo("2014-12-25T11:00:00.734Z"))); + } + + @Test + public void validFormat() { + TimeZone cet = TimeZone.getTimeZone("CET"); + DateTime parsed = new DateTime(1419505200734L); + assertThat(format(parsed, cet), is(equalTo("2014-12-25T12:00:00.734+0100"))); + } + + @Test + public void testParseVariousDateFormats() { + String date = "Thu April 24 04:43:10 -0500 2014"; + DateTime expected = new DateTime(2014, 4, 24, 9, 43, 10, DateTimeZone.forOffsetHours(0)); + testHelper(expected, date); + date = "2014/04/24 04:43:10"; + expected = new DateTime(2014, 4, 24, 4, 43, 10, DateTimeZone.forOffsetHours(0)); + testHelper(expected, date); + date = "2014-04-24T04:43:10Z"; + testHelper(expected, date); + date = "04:43:10 2014/04/24"; + testHelper(expected, date); + date = "4/24/2014 04:43:10"; + testHelper(expected, date); + date = "04:43:10 4/24/2014"; + testHelper(expected, date); + date = "04:43:10 2014-04-24"; + testHelper(expected, date); + date = "4-24-2014 04:43:10"; + testHelper(expected, date); + date = "04:43:10 4-24-2014"; + testHelper(expected, date); + expected = new DateTime(2014, 4, 24, 0, 0, 0, DateTimeZone.forOffsetHours(0)); + date = "24-4-2014"; + testHelper(expected, date); + date = "2014-4-24"; + testHelper(expected, date); + date = "2014/4/24"; + testHelper(expected, date); + date = "2014/4/24 fesdfs"; + try { + RFC3339Utils.parseToUTC(date); + fail("Should not have been able to parse : "+date); + } catch (Exception e) { + } + } + + private void testHelper(DateTime expected, String dateString) { + DateTime parsedDate = RFC3339Utils.parseToUTC(dateString); + assertEquals("Failed to parse : "+dateString, expected, parsedDate); + String rfc3339String = RFC3339Utils.format(dateString); + String parsedRfc3339String = RFC3339Utils.format(parsedDate); + assertEquals("Parsed String should be equal.", parsedRfc3339String, rfc3339String); + DateTime convertedBack = RFC3339Utils.parseToUTC(parsedRfc3339String); + assertEquals(expected, convertedBack); + } +} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/accept.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/accept.json b/streams-pojo/src/test/resources/activities/accept.json deleted file mode 100644 index c1dfd5f..0000000 --- a/streams-pojo/src/test/resources/activities/accept.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Sally" - }, - "verb": "accept", - "object": { - "objectType": "job", - "displayName": "Director of Marketing" - }, - "title": "Sally accepted the Director of Marketing job." -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/access.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/access.json b/streams-pojo/src/test/resources/activities/access.json deleted file mode 100644 index 93bc6e2..0000000 --- a/streams-pojo/src/test/resources/activities/access.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Joe" - }, - "verb": "access", - "object": { - "objectType": "file", - "displayName": "4Q2012 Sales Forecast.xls" - }, - "published": "2012-12-12T12:12:12Z", - "title": "Joe accessed the file \"4Q2012 Sales Forecast.xls\"" -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/acknowledge.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/acknowledge.json b/streams-pojo/src/test/resources/activities/acknowledge.json deleted file mode 100644 index 2b69fa7..0000000 --- a/streams-pojo/src/test/resources/activities/acknowledge.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Sally" - }, - "verb": "acknowledge", - "object": { - "objectType": "issue", - "displayName": "#123: There is a problem with the build" - }, - "content": "Sally acknowledged Issue #123" -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/add.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/add.json b/streams-pojo/src/test/resources/activities/add.json deleted file mode 100644 index b4e8151..0000000 --- a/streams-pojo/src/test/resources/activities/add.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Joe" - }, - "verb": "add", - "object": { - "objectType": "image", - "displayName": "My cat", - "fullImage": {"url": "http://example.org/cat.jpg"} - }, - "target": { - "objectType": "collection", - "displayName": "Joe's Photo Album", - "objectTypes": ["image"] - } -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/agree.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/agree.json b/streams-pojo/src/test/resources/activities/agree.json deleted file mode 100644 index 3034cd8..0000000 --- a/streams-pojo/src/test/resources/activities/agree.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Sally" - }, - "verb": "agree", - "object": { - "objectType": "article", - "displayName": "Some Random Article Online" - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/append.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/append.json b/streams-pojo/src/test/resources/activities/append.json deleted file mode 100644 index d8fb3be..0000000 --- a/streams-pojo/src/test/resources/activities/append.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Joe" - }, - "verb": "append", - "object": {"content": "This is some text"}, - "target": { - "objectType": "file", - "displayName": "log.txt" - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/approve.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/approve.json b/streams-pojo/src/test/resources/activities/approve.json deleted file mode 100644 index b6f378e..0000000 --- a/streams-pojo/src/test/resources/activities/approve.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Sally" - }, - "verb": "approve", - "object": { - "objectType": "task", - "actor": {"displayName": "Joe"}, - "verb": "join", - "object": { - "objectType": "group", - "displayName": "Administrators" - } - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/archive.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/archive.json b/streams-pojo/src/test/resources/activities/archive.json deleted file mode 100644 index 557dcdf..0000000 --- a/streams-pojo/src/test/resources/activities/archive.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Joe" - }, - "verb": "archive", - "object": { - "objectType": "file", - "displayName": "4Q2012 Sales Forecast.xls" - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/assign.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/assign.json b/streams-pojo/src/test/resources/activities/assign.json deleted file mode 100644 index 51b8a51..0000000 --- a/streams-pojo/src/test/resources/activities/assign.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Sally" - }, - "verb": "assign", - "object": { - "objectType": "issue", - "displayName": "Issue #123: Some Issue" - }, - "target": { - "objectType": "person", - "displayName": "Joe" - }, - "title": "Sally assigned Issue #123 to Joe" -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/at.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/at.json b/streams-pojo/src/test/resources/activities/at.json deleted file mode 100644 index 64a77f9..0000000 --- a/streams-pojo/src/test/resources/activities/at.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Joe" - }, - "verb": "at", - "object": { - "objectType": "place", - "displayName": "Acme, Co." - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/attach.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/attach.json b/streams-pojo/src/test/resources/activities/attach.json deleted file mode 100644 index 716616b..0000000 --- a/streams-pojo/src/test/resources/activities/attach.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Sally" - }, - "verb": "attach", - "object": { - "objectType": "binary", - "data": "dGhpcyBpcyB1bmNvbXByZXNzZWQgZGF0YQo=" - }, - "target": { - "objectType": "issue", - "displayName": "Issue #123" - }, - "title": "Sally added an attachment to Issue #123" -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/attend.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/attend.json b/streams-pojo/src/test/resources/activities/attend.json deleted file mode 100644 index f8c0838..0000000 --- a/streams-pojo/src/test/resources/activities/attend.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Joe" - }, - "verb": "attend", - "object": { - "objectType": "event", - "displayName": "Sally's Meeting" - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/author.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/author.json b/streams-pojo/src/test/resources/activities/author.json deleted file mode 100644 index 1903700..0000000 --- a/streams-pojo/src/test/resources/activities/author.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Sally" - }, - "verb": "author", - "object": { - "objectType": "file", - "displayName": "4Q2012 Sales Forecast.xls" - } -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/authorize.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/authorize.json b/streams-pojo/src/test/resources/activities/authorize.json deleted file mode 100644 index 2d9d1b3..0000000 --- a/streams-pojo/src/test/resources/activities/authorize.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Joe" - }, - "verb": "authorize", - "object": { - "objectType": "task", - "actor": { - "objectType": "person", - "displayName": "Sally" - }, - "verb": "access", - "object": { - "objectType": "place", - "displayName": "Joe's Home" - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/borrow.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/borrow.json b/streams-pojo/src/test/resources/activities/borrow.json deleted file mode 100644 index e21809a..0000000 --- a/streams-pojo/src/test/resources/activities/borrow.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Sally" - }, - "verb": "borrow", - "object": { - "objectType": "book", - "displayName": "Cloud Atlas" - }, - "target": { - "objectType": "person", - "displayName": "Joe" - }, - "title": "Sally borrowed the book 'Cloud Atlas' from Joe" -} - http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/build.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/build.json b/streams-pojo/src/test/resources/activities/build.json deleted file mode 100644 index 78878e1..0000000 --- a/streams-pojo/src/test/resources/activities/build.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Joe" - }, - "verb": "build", - "object": { - "objectType": "application", - "displayName": "MyApp Builder 12345" - } -} - http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/cancel.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/cancel.json b/streams-pojo/src/test/resources/activities/cancel.json deleted file mode 100644 index b7aba81..0000000 --- a/streams-pojo/src/test/resources/activities/cancel.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Sally" - }, - "verb": "cancel", - "object": { - "objectType": "offer", - "displayName": "Free Money!" - }, - "title": "Sally cancelled the offer for free money." -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/checkin.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/checkin.json b/streams-pojo/src/test/resources/activities/checkin.json deleted file mode 100644 index 97216b9..0000000 --- a/streams-pojo/src/test/resources/activities/checkin.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Joe" - }, - "verb": "checkin", - "object": { - "objectType": "place", - "displayName": "Acme, Co" - }, - "title": "Joe checked in at Acme, Co" -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/close.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/close.json b/streams-pojo/src/test/resources/activities/close.json deleted file mode 100644 index 362e3f6..0000000 --- a/streams-pojo/src/test/resources/activities/close.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Joe" - }, - "verb": "close", - "object": { - "objectType": "issue", - "displayName": "Issue #123" - }, - "title": "Joe closed issue #123" -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/complete.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/complete.json b/streams-pojo/src/test/resources/activities/complete.json deleted file mode 100644 index 06694a7..0000000 --- a/streams-pojo/src/test/resources/activities/complete.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Sally" - }, - "verb": "complete", - "object": { - "objectType": "process", - "displayName": "Some long process" - } -} - http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/confirm.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/confirm.json b/streams-pojo/src/test/resources/activities/confirm.json deleted file mode 100644 index 9307c38..0000000 --- a/streams-pojo/src/test/resources/activities/confirm.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Joe" - }, - "verb": "confirm", - "object": { - "objectType": "issue", - "displayName": "Issue #123" - }, - "title": "Joe confirmed issue #123" -} - http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/consume.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/consume.json b/streams-pojo/src/test/resources/activities/consume.json deleted file mode 100644 index ed907e3..0000000 --- a/streams-pojo/src/test/resources/activities/consume.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Sally" - }, - "verb": "consume", - "object": { - "objectType": "product", - "displayName": "Some amazing product" - } -} - http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/create.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/create.json b/streams-pojo/src/test/resources/activities/create.json deleted file mode 100644 index 5d8afb3..0000000 --- a/streams-pojo/src/test/resources/activities/create.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Sally" - }, - "verb": "create", - "object": { - "objectType": "product", - "displayName": "Some amazing product" - } -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/delete.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/delete.json b/streams-pojo/src/test/resources/activities/delete.json deleted file mode 100644 index 6943046..0000000 --- a/streams-pojo/src/test/resources/activities/delete.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Joe" - }, - "verb": "delete", - "object": { - "objectType": "file", - "displayName": "4Q2012 Sales Forecast.xls" - }, - "title": "Joe is probably going to get fired." -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/deliver.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/deliver.json b/streams-pojo/src/test/resources/activities/deliver.json deleted file mode 100644 index 620f0b5..0000000 --- a/streams-pojo/src/test/resources/activities/deliver.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Sally" - }, - "verb": "deliver", - "object": { - "objectType": "note", - "displayName": "Bad News", - "content": "Joe deleted the sales forecast" - }, - "target": { - "objectType": "person", - "displayName": "Joe's Boss" - } -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/deny.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/deny.json b/streams-pojo/src/test/resources/activities/deny.json deleted file mode 100644 index b83ca60..0000000 --- a/streams-pojo/src/test/resources/activities/deny.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Joe" - }, - "verb": "deny", - "object": { - "objectType": "task", - "actor": { - "objectType": "person", - "displayName": "Joe" - }, - "verb": "delete", - "object": { - "objectType": "file", - "displayName": "4Q2012 Sales Forecast.xls" - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/disagree.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/disagree.json b/streams-pojo/src/test/resources/activities/disagree.json deleted file mode 100644 index 8614e88..0000000 --- a/streams-pojo/src/test/resources/activities/disagree.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Sally" - }, - "verb": "disagree", - "object": { - "actor": { - "objectType": "person", - "displayName": "Joe" - }, - "verb": "deny", - "object": { - "objectType": "task", - "actor": { - "objectType": "person", - "displayName": "Joe" - }, - "verb": "delete", - "object": { - "objectType": "file", - "displayName": "4Q2012 Sales Forecast.xls" - } - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/dislike.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/dislike.json b/streams-pojo/src/test/resources/activities/dislike.json deleted file mode 100644 index 16c2148..0000000 --- a/streams-pojo/src/test/resources/activities/dislike.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Joe" - }, - "verb": "dislike", - "object": { - "objectType": "person", - "displayName": "Sally" - } -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/experience.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/experience.json b/streams-pojo/src/test/resources/activities/experience.json deleted file mode 100644 index d81d024..0000000 --- a/streams-pojo/src/test/resources/activities/experience.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Sally" - }, - "verb": "experience", - "object": { - "objectType": "event", - "displayName": "Disciplinary Action for Joe" - } -} - http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/favorite.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/favorite.json b/streams-pojo/src/test/resources/activities/favorite.json deleted file mode 100644 index 3df99bf..0000000 --- a/streams-pojo/src/test/resources/activities/favorite.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Joe's Boss" - }, - "verb": "favorite", - "object": { - "objectType": "person", - "displayName": "Sally" - } -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/find.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/find.json b/streams-pojo/src/test/resources/activities/find.json deleted file mode 100644 index 9c25c59..0000000 --- a/streams-pojo/src/test/resources/activities/find.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Joe" - }, - "verb": "find", - "object": { - "objectType": "application", - "displayName": "Unapproved Software Application" - }, - "location": { - "objectType": "place", - "displayName": "Sally's Computer" - } -} http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/flag-as-inappropriate.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/flag-as-inappropriate.json b/streams-pojo/src/test/resources/activities/flag-as-inappropriate.json deleted file mode 100644 index 6f4d202..0000000 --- a/streams-pojo/src/test/resources/activities/flag-as-inappropriate.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Sally's Boss" - }, - "verb": "flag-as-inappropriate", - "object": { - "objectType": "application", - "displayName": "Unapproved Software Application", - "location": { - "displayName": "Sally's Computer" - } - }, - "context": { - "objectType": "issue", - "displayName": "Issue #125", - "types": ["http://example.org/violation-of-corporate-policy";] - } -} - http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/77d780c8/streams-pojo/src/test/resources/activities/follow.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/test/resources/activities/follow.json b/streams-pojo/src/test/resources/activities/follow.json deleted file mode 100644 index fc8c992..0000000 --- a/streams-pojo/src/test/resources/activities/follow.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "$license": [ - "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";, - "http://www.apache.org/licenses/LICENSE-2.0"; - ], - "actor": { - "objectType": "person", - "displayName": "Joe" - }, - "verb": "follow", - "object": { - "objectType": "issue", - "displayName": "Issue #125" - } -}
![http://example.org/cat.jpg"}](http://example.org/cat.jpg"}){kind=link}