From bf1a3bfb782499f0269d92a67fd515a2d85c20d2 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Sun, 9 Dec 2018 00:47:15 -0500 Subject: [PATCH] Moves json samples to directory --- ...ropertyPathNotificationExtractorTests.java | 24 +++++++++---------- ...ropertyPathNotificationExtractorTests.java | 4 ++-- ...ropertyPathNotificationExtractorTests.java | 4 ++-- ...ropertyPathNotificationExtractorTests.java | 4 ++-- ...ropertyPathNotificationExtractorTests.java | 4 ++-- ...ropertyPathNotificationExtractorTests.java | 4 ++-- ...ropertyPathNotificationExtractorTests.java | 4 ++-- .../{ => pathsamples}/bitbucket-invalid.json | 0 .../{ => pathsamples}/bitbucket.json | 0 .../bitbucketserver-invalid.json | 0 .../{ => pathsamples}/bitbucketserver.json | 0 .../resources/{ => pathsamples}/gitea.json | 0 .../resources/{ => pathsamples}/gitee.json | 0 .../resources/{ => pathsamples}/github.json | 0 .../resources/{ => pathsamples}/gitlab.json | 0 .../resources/{ => pathsamples}/gogs.json | 0 16 files changed, 24 insertions(+), 24 deletions(-) rename spring-cloud-config-monitor/src/test/resources/{ => pathsamples}/bitbucket-invalid.json (100%) rename spring-cloud-config-monitor/src/test/resources/{ => pathsamples}/bitbucket.json (100%) rename spring-cloud-config-monitor/src/test/resources/{ => pathsamples}/bitbucketserver-invalid.json (100%) rename spring-cloud-config-monitor/src/test/resources/{ => pathsamples}/bitbucketserver.json (100%) rename spring-cloud-config-monitor/src/test/resources/{ => pathsamples}/gitea.json (100%) rename spring-cloud-config-monitor/src/test/resources/{ => pathsamples}/gitee.json (100%) rename spring-cloud-config-monitor/src/test/resources/{ => pathsamples}/github.json (100%) rename spring-cloud-config-monitor/src/test/resources/{ => pathsamples}/gitlab.json (100%) rename spring-cloud-config-monitor/src/test/resources/{ => pathsamples}/gogs.json (100%) diff --git a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/BitbucketPropertyPathNotificationExtractorTests.java b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/BitbucketPropertyPathNotificationExtractorTests.java index 41b27729..f2ddfb8f 100644 --- a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/BitbucketPropertyPathNotificationExtractorTests.java +++ b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/BitbucketPropertyPathNotificationExtractorTests.java @@ -51,7 +51,7 @@ public class BitbucketPropertyPathNotificationExtractorTests { @Test public void bitbucketSample() throws Exception { // https://confluence.atlassian.com/bitbucket/event-payloads-740262817.html#EventPayloads-Push - Map value = readPayload("bitbucket.json"); + Map value = readPayload("pathsamples/bitbucket.json"); setHeaders("repo:push"); PropertyPathNotification extracted = this.extractor.extract(this.headers, value); assertNotNull(extracted); @@ -61,7 +61,7 @@ public class BitbucketPropertyPathNotificationExtractorTests { @Test public void bitbucketPullRequestFulfillmentDetected() throws Exception { // https://confluence.atlassian.com/bitbucket/event-payloads-740262817.html#EventPayloads-Merged - Map value = readPayload("bitbucket.json"); + Map value = readPayload("pathsamples/bitbucket.json"); setHeaders("pullrequest:fulfilled"); PropertyPathNotification extracted = this.extractor.extract(this.headers, value); assertNotNull(extracted); @@ -75,23 +75,23 @@ public class BitbucketPropertyPathNotificationExtractorTests { @Test public void notAPushOrPullRequestNotDetected() throws Exception { - assertNotExtracted("bitbucket.json", "issue:created"); + assertNotExtracted("pathsamples/bitbucket.json", "issue:created"); } @Test public void gitlabNotDetected() throws Exception { - assertNotExtracted("gitlab.json", "repo:push"); + assertNotExtracted("pathsamples/gitlab.json", "repo:push"); } @Test public void githubNotDetected() throws Exception { - assertNotExtracted("github.json", "repo:push"); + assertNotExtracted("pathsamples/github.json", "repo:push"); } @Test public void missingUuidHeader() throws Exception { // https://confluence.atlassian.com/bitbucket/event-payloads-740262817.html#EventPayloads-Push - Map value = readPayload("bitbucket.json"); + Map value = readPayload("pathsamples/bitbucket.json"); this.headers.set("X-Event-Key", "repo:push"); PropertyPathNotification extracted = this.extractor.extract(this.headers, value); assertNull(extracted); @@ -100,7 +100,7 @@ public class BitbucketPropertyPathNotificationExtractorTests { @Test public void missingChanges() throws Exception { // https://confluence.atlassian.com/bitbucket/event-payloads-740262817.html#EventPayloads-Push - Map value = readPayload("bitbucket-invalid.json"); + Map value = readPayload("pathsamples/bitbucket-invalid.json"); setHeaders("repo:push"); PropertyPathNotification extracted = this.extractor.extract(this.headers, value); assertNull(extracted); @@ -116,7 +116,7 @@ public class BitbucketPropertyPathNotificationExtractorTests { @Test public void bitbucketServerSample() throws Exception { // https://confluence.atlassian.com/bitbucketserver/event-payload-938025882.html - Map value = readPayload("bitbucketserver.json"); + Map value = readPayload("pathsamples/bitbucketserver.json"); setServerHeaders("repo:refs_changed"); PropertyPathNotification extracted = this.extractor.extract(this.headers, value); assertNotNull(extracted); @@ -126,7 +126,7 @@ public class BitbucketPropertyPathNotificationExtractorTests { @Test public void bitbucketServerSamplePullRequest() throws Exception { // https://confluence.atlassian.com/bitbucketserver/event-payload-938025882.html - Map value = readPayload("bitbucketserver.json"); + Map value = readPayload("pathsamples/bitbucketserver.json"); setServerHeaders("pr:merged"); PropertyPathNotification extracted = this.extractor.extract(this.headers, value); assertNotNull(extracted); @@ -140,13 +140,13 @@ public class BitbucketPropertyPathNotificationExtractorTests { @Test public void notAPushOrPullRequestServer() throws Exception { - assertNotExtractedServer("bitbucketserver.json", "repo:comment:added"); + assertNotExtractedServer("pathsamples/bitbucketserver.json", "repo:comment:added"); } @Test public void missingUuidHeaderServer() throws Exception { // https://confluence.atlassian.com/bitbucketserver/event-payload-938025882.html - Map value = readPayload("bitbucketserver.json"); + Map value = readPayload("pathsamples/bitbucketserver.json"); this.headers.set("X-Event-Key", "repo:refs_changed"); PropertyPathNotification extracted = this.extractor.extract(this.headers, value); assertNull(extracted); @@ -155,7 +155,7 @@ public class BitbucketPropertyPathNotificationExtractorTests { @Test public void missingChangesServer() throws Exception { // https://confluence.atlassian.com/bitbucketserver/event-payload-938025882.html - Map value = readPayload("bitbucketserver-invalid.json"); + Map value = readPayload("pathsamples/bitbucketserver-invalid.json"); setServerHeaders("repo:refs_changed"); PropertyPathNotification extracted = this.extractor.extract(this.headers, value); assertNull(extracted); diff --git a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/CompositePropertyPathNotificationExtractorTests.java b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/CompositePropertyPathNotificationExtractorTests.java index a9f71286..efbd06c9 100644 --- a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/CompositePropertyPathNotificationExtractorTests.java +++ b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/CompositePropertyPathNotificationExtractorTests.java @@ -48,7 +48,7 @@ public class CompositePropertyPathNotificationExtractorTests { public void githubSample() throws Exception { // See https://developer.github.com/v3/activity/events/types/#pushevent Map value = new ObjectMapper().readValue( - new ClassPathResource("github.json").getInputStream(), + new ClassPathResource("pathsamples/github.json").getInputStream(), new TypeReference>() { }); this.headers.set("X-Github-Event", "push"); @@ -60,7 +60,7 @@ public class CompositePropertyPathNotificationExtractorTests { @Test public void gitlabDetected() throws Exception { Map value = new ObjectMapper().readValue( - new ClassPathResource("gitlab.json").getInputStream(), + new ClassPathResource("pathsamples/gitlab.json").getInputStream(), new TypeReference>() { }); this.headers.set("X-Gitlab-Event", "Push Hook"); diff --git a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GiteaPropertyPathNotificationExtractorTests.java b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GiteaPropertyPathNotificationExtractorTests.java index bff70952..e77fd00f 100755 --- a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GiteaPropertyPathNotificationExtractorTests.java +++ b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GiteaPropertyPathNotificationExtractorTests.java @@ -43,7 +43,7 @@ public class GiteaPropertyPathNotificationExtractorTests { public void giteaSample() throws Exception { // See https://docs.gitea.io/en-us/webhooks/ Map value = new ObjectMapper().readValue( - new ClassPathResource("gitea.json").getInputStream(), + new ClassPathResource("pathsamples/gitea.json").getInputStream(), new TypeReference>() { }); this.headers.set("X-Gitea-Event", "push"); @@ -55,7 +55,7 @@ public class GiteaPropertyPathNotificationExtractorTests { @Test public void notAPushNotDetected() throws Exception { Map value = new ObjectMapper().readValue( - new ClassPathResource("gitea.json").getInputStream(), + new ClassPathResource("pathsamples/gitea.json").getInputStream(), new TypeReference>() { }); this.headers.set("X-Gitea-Event", "issues"); diff --git a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GiteePropertyPathNotificationExtractorTests.java b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GiteePropertyPathNotificationExtractorTests.java index 48cc4b5b..0ad93d40 100644 --- a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GiteePropertyPathNotificationExtractorTests.java +++ b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GiteePropertyPathNotificationExtractorTests.java @@ -41,7 +41,7 @@ public class GiteePropertyPathNotificationExtractorTests { public void giteeSample() throws Exception { // See http://git.mydoc.io/?t=154711 Map value = new ObjectMapper().readValue( - new ClassPathResource("gitee.json").getInputStream(), + new ClassPathResource("pathsamples/gitee.json").getInputStream(), new TypeReference>() { }); this.headers.set("x-git-oschina-event", "Push Hook"); @@ -53,7 +53,7 @@ public class GiteePropertyPathNotificationExtractorTests { @Test public void notAPushNotDetected() throws Exception { Map value = new ObjectMapper().readValue( - new ClassPathResource("github.json").getInputStream(), + new ClassPathResource("pathsamples/github.json").getInputStream(), new TypeReference>() { }); this.headers.set("x-git-oschina-event", "Issue Hook"); diff --git a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GithubPropertyPathNotificationExtractorTests.java b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GithubPropertyPathNotificationExtractorTests.java index 6706c9f4..36f49de4 100644 --- a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GithubPropertyPathNotificationExtractorTests.java +++ b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GithubPropertyPathNotificationExtractorTests.java @@ -43,7 +43,7 @@ public class GithubPropertyPathNotificationExtractorTests { public void githubSample() throws Exception { // See https://developer.github.com/v3/activity/events/types/#pushevent Map value = new ObjectMapper().readValue( - new ClassPathResource("github.json").getInputStream(), + new ClassPathResource("pathsamples/github.json").getInputStream(), new TypeReference>() { }); this.headers.set("X-Github-Event", "push"); @@ -55,7 +55,7 @@ public class GithubPropertyPathNotificationExtractorTests { @Test public void notAPushNotDetected() throws Exception { Map value = new ObjectMapper().readValue( - new ClassPathResource("github.json").getInputStream(), + new ClassPathResource("pathsamples/github.json").getInputStream(), new TypeReference>() { }); this.headers.set("X-Github-Event", "issues"); diff --git a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GitlabPropertyPathNotificationExtractorTests.java b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GitlabPropertyPathNotificationExtractorTests.java index ed19755c..752cdc5d 100644 --- a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GitlabPropertyPathNotificationExtractorTests.java +++ b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GitlabPropertyPathNotificationExtractorTests.java @@ -44,7 +44,7 @@ public class GitlabPropertyPathNotificationExtractorTests { public void pushEvent() throws Exception { // See http://doc.gitlab.com/ee/web_hooks/web_hooks.html#push-events Map value = new ObjectMapper().readValue( - new ClassPathResource("gitlab.json").getInputStream(), + new ClassPathResource("pathsamples/gitlab.json").getInputStream(), new TypeReference>() { }); this.headers.set("X-Gitlab-Event", "Push Hook"); @@ -58,7 +58,7 @@ public class GitlabPropertyPathNotificationExtractorTests { public void nonPushEventNotDetected() throws Exception { // See http://doc.gitlab.com/ee/web_hooks/web_hooks.html#push-events Map value = new ObjectMapper().readValue( - new ClassPathResource("gitlab.json").getInputStream(), + new ClassPathResource("pathsamples/gitlab.json").getInputStream(), new TypeReference>() { }); this.headers.set("X-Gitlab-Event", "Issue Hook"); diff --git a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GogsPropertyPathNotificationExtractorTests.java b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GogsPropertyPathNotificationExtractorTests.java index 4cefb929..b5363497 100755 --- a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GogsPropertyPathNotificationExtractorTests.java +++ b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/GogsPropertyPathNotificationExtractorTests.java @@ -41,7 +41,7 @@ public class GogsPropertyPathNotificationExtractorTests { public void gogsSample() throws Exception { // See https://gogs.io/docs/features/webhook Map value = new ObjectMapper().readValue( - new ClassPathResource("gogs.json").getInputStream(), + new ClassPathResource("pathsamples/gogs.json").getInputStream(), new TypeReference>() { }); this.headers.set("X-Gogs-Event", "push"); @@ -53,7 +53,7 @@ public class GogsPropertyPathNotificationExtractorTests { @Test public void notAPushNotDetected() throws Exception { Map value = new ObjectMapper().readValue( - new ClassPathResource("gogs.json").getInputStream(), + new ClassPathResource("pathsamples/gogs.json").getInputStream(), new TypeReference>() { }); this.headers.set("X-Gogs-Event", "issues"); diff --git a/spring-cloud-config-monitor/src/test/resources/bitbucket-invalid.json b/spring-cloud-config-monitor/src/test/resources/pathsamples/bitbucket-invalid.json similarity index 100% rename from spring-cloud-config-monitor/src/test/resources/bitbucket-invalid.json rename to spring-cloud-config-monitor/src/test/resources/pathsamples/bitbucket-invalid.json diff --git a/spring-cloud-config-monitor/src/test/resources/bitbucket.json b/spring-cloud-config-monitor/src/test/resources/pathsamples/bitbucket.json similarity index 100% rename from spring-cloud-config-monitor/src/test/resources/bitbucket.json rename to spring-cloud-config-monitor/src/test/resources/pathsamples/bitbucket.json diff --git a/spring-cloud-config-monitor/src/test/resources/bitbucketserver-invalid.json b/spring-cloud-config-monitor/src/test/resources/pathsamples/bitbucketserver-invalid.json similarity index 100% rename from spring-cloud-config-monitor/src/test/resources/bitbucketserver-invalid.json rename to spring-cloud-config-monitor/src/test/resources/pathsamples/bitbucketserver-invalid.json diff --git a/spring-cloud-config-monitor/src/test/resources/bitbucketserver.json b/spring-cloud-config-monitor/src/test/resources/pathsamples/bitbucketserver.json similarity index 100% rename from spring-cloud-config-monitor/src/test/resources/bitbucketserver.json rename to spring-cloud-config-monitor/src/test/resources/pathsamples/bitbucketserver.json diff --git a/spring-cloud-config-monitor/src/test/resources/gitea.json b/spring-cloud-config-monitor/src/test/resources/pathsamples/gitea.json similarity index 100% rename from spring-cloud-config-monitor/src/test/resources/gitea.json rename to spring-cloud-config-monitor/src/test/resources/pathsamples/gitea.json diff --git a/spring-cloud-config-monitor/src/test/resources/gitee.json b/spring-cloud-config-monitor/src/test/resources/pathsamples/gitee.json similarity index 100% rename from spring-cloud-config-monitor/src/test/resources/gitee.json rename to spring-cloud-config-monitor/src/test/resources/pathsamples/gitee.json diff --git a/spring-cloud-config-monitor/src/test/resources/github.json b/spring-cloud-config-monitor/src/test/resources/pathsamples/github.json similarity index 100% rename from spring-cloud-config-monitor/src/test/resources/github.json rename to spring-cloud-config-monitor/src/test/resources/pathsamples/github.json diff --git a/spring-cloud-config-monitor/src/test/resources/gitlab.json b/spring-cloud-config-monitor/src/test/resources/pathsamples/gitlab.json similarity index 100% rename from spring-cloud-config-monitor/src/test/resources/gitlab.json rename to spring-cloud-config-monitor/src/test/resources/pathsamples/gitlab.json diff --git a/spring-cloud-config-monitor/src/test/resources/gogs.json b/spring-cloud-config-monitor/src/test/resources/pathsamples/gogs.json similarity index 100% rename from spring-cloud-config-monitor/src/test/resources/gogs.json rename to spring-cloud-config-monitor/src/test/resources/pathsamples/gogs.json