Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b5281259 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b5281259 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b5281259 Branch: refs/heads/camel-2.16.x Commit: b528125960dfe75f919c99f2790f3a5abcaf3270 Parents: d8c3711 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Jan 10 14:15:44 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Jan 10 14:31:38 2016 +0100 ---------------------------------------------------------------------- .../component/github/GitHubComponentTestBase.java | 17 ----------------- .../github/consumer/CommitConsumerTest.java | 2 +- .../consumer/PullRequestCommentConsumerTest.java | 2 +- .../github/consumer/PullRequestConsumerTest.java | 2 +- .../component/github/consumer/TagConsumerTest.java | 2 +- .../producer/ClosePullRequestProducerTest.java | 2 +- .../producer/PullRequestCommentProducerTest.java | 2 +- .../producer/PullRequestFilesProducerTest.java | 2 +- .../producer/PullRequestStateProducerTest.java | 6 +----- 9 files changed, 8 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b5281259/components/camel-github/src/test/java/org/apache/camel/component/github/GitHubComponentTestBase.java ---------------------------------------------------------------------- diff --git a/components/camel-github/src/test/java/org/apache/camel/component/github/GitHubComponentTestBase.java b/components/camel-github/src/test/java/org/apache/camel/component/github/GitHubComponentTestBase.java index d0cba8c..39a16de 100644 --- a/components/camel-github/src/test/java/org/apache/camel/component/github/GitHubComponentTestBase.java +++ b/components/camel-github/src/test/java/org/apache/camel/component/github/GitHubComponentTestBase.java @@ -24,20 +24,9 @@ import org.apache.camel.component.github.services.MockRepositoryService; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.JndiRegistry; import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Before; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.TestName; public abstract class GitHubComponentTestBase extends CamelTestSupport { - public static final String USERNAME = "someguy"; - public static final String PASSWORD = "apassword"; - public static final String REPO_OWNER = "anotherguy"; - public static final String REPO_NAME = "somerepo"; - public static final String GITHUB_CREDENTIALS_STRING = "username=" + USERNAME + "&password=" + PASSWORD + "&repoOwner=" + REPO_OWNER + "&repoName=" + REPO_NAME; - - @Rule - public TestName testName = new TestName(); protected MockCommitService commitService; protected MockRepositoryService repositoryService; @@ -65,12 +54,6 @@ public abstract class GitHubComponentTestBase extends CamelTestSupport { return registry; } - @Before - public void setUp() throws Exception { - super.setUp(); - log.debug("Starting test " + testName.getMethodName()); - } - @Test public void emptyAtStartupTest() throws Exception { mockResultEndpoint.expectedMessageCount(0); http://git-wip-us.apache.org/repos/asf/camel/blob/b5281259/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/CommitConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/CommitConsumerTest.java b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/CommitConsumerTest.java index 196231c..aa25245 100644 --- a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/CommitConsumerTest.java +++ b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/CommitConsumerTest.java @@ -34,7 +34,7 @@ public class CommitConsumerTest extends GitHubComponentTestBase { @Override public void configure() throws Exception { context.addComponent("github", new GitHubComponent()); - from("github://commit/master?" + GITHUB_CREDENTIALS_STRING). + from("github://commit/master?username=someguy&password=apassword&repoOwner=anotherguy&repoName=somerepo"). process(new GitHubCommitProcessor()) .to(mockResultEndpoint); } http://git-wip-us.apache.org/repos/asf/camel/blob/b5281259/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/PullRequestCommentConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/PullRequestCommentConsumerTest.java b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/PullRequestCommentConsumerTest.java index e20bd1a..c18ac1d 100644 --- a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/PullRequestCommentConsumerTest.java +++ b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/PullRequestCommentConsumerTest.java @@ -39,7 +39,7 @@ public class PullRequestCommentConsumerTest extends GitHubComponentTestBase { @Override public void configure() throws Exception { context.addComponent("github", new GitHubComponent()); - from("github://pullRequestComment?" + GITHUB_CREDENTIALS_STRING) + from("github://pullRequestComment?username=someguy&password=apassword&repoOwner=anotherguy&repoName=somerepo") .process(new PullRequestCommentProcessor()) .to(mockResultEndpoint); } http://git-wip-us.apache.org/repos/asf/camel/blob/b5281259/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/PullRequestConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/PullRequestConsumerTest.java b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/PullRequestConsumerTest.java index c197085..b1ddd7c 100644 --- a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/PullRequestConsumerTest.java +++ b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/PullRequestConsumerTest.java @@ -38,7 +38,7 @@ public class PullRequestConsumerTest extends GitHubComponentTestBase { @Override public void configure() throws Exception { context.addComponent("github", new GitHubComponent()); - from("github://pullRequest?" + GITHUB_CREDENTIALS_STRING) + from("github://pullRequest?username=someguy&password=apassword&repoOwner=anotherguy&repoName=somerepo") .process(new MockPullRequestProcessor()) .to(mockResultEndpoint); } http://git-wip-us.apache.org/repos/asf/camel/blob/b5281259/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/TagConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/TagConsumerTest.java b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/TagConsumerTest.java index 4b0ffab..92a6fff 100644 --- a/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/TagConsumerTest.java +++ b/components/camel-github/src/test/java/org/apache/camel/component/github/consumer/TagConsumerTest.java @@ -34,7 +34,7 @@ public class TagConsumerTest extends GitHubComponentTestBase { @Override public void configure() throws Exception { context.addComponent("github", new GitHubComponent()); - from("github://tag?" + GITHUB_CREDENTIALS_STRING) + from("github://tag?username=someguy&password=apassword&repoOwner=anotherguy&repoName=somerepo") .process(new RepositoryTagProcessor()) .to(mockResultEndpoint); } http://git-wip-us.apache.org/repos/asf/camel/blob/b5281259/components/camel-github/src/test/java/org/apache/camel/component/github/producer/ClosePullRequestProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-github/src/test/java/org/apache/camel/component/github/producer/ClosePullRequestProducerTest.java b/components/camel-github/src/test/java/org/apache/camel/component/github/producer/ClosePullRequestProducerTest.java index c9a8a94..1707a56 100755 --- a/components/camel-github/src/test/java/org/apache/camel/component/github/producer/ClosePullRequestProducerTest.java +++ b/components/camel-github/src/test/java/org/apache/camel/component/github/producer/ClosePullRequestProducerTest.java @@ -46,7 +46,7 @@ public class ClosePullRequestProducerTest extends GitHubComponentTestBase { context.addComponent("github", new GitHubComponent()); from(PULL_REQUEST_PRODUCER_ENDPOINT) .process(new ClosePullRequestProducerProcessor()) - .to("github://closePullRequest?" + GITHUB_CREDENTIALS_STRING); + .to("github://closePullRequest?username=someguy&password=apassword&repoOwner=anotherguy&repoName=somerepo"); } // end of configure http://git-wip-us.apache.org/repos/asf/camel/blob/b5281259/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestCommentProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestCommentProducerTest.java b/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestCommentProducerTest.java index 9396b3e..ae5148e 100644 --- a/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestCommentProducerTest.java +++ b/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestCommentProducerTest.java @@ -46,7 +46,7 @@ public class PullRequestCommentProducerTest extends GitHubComponentTestBase { context.addComponent("github", new GitHubComponent()); from("direct:validPullRequest") .process(new MockPullRequestCommentProducerProcessor()) - .to("github://pullRequestComment?" + GITHUB_CREDENTIALS_STRING); + .to("github://pullRequestComment?username=someguy&password=apassword&repoOwner=anotherguy&repoName=somerepo"); } // end of configure http://git-wip-us.apache.org/repos/asf/camel/blob/b5281259/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestFilesProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestFilesProducerTest.java b/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestFilesProducerTest.java index fc4e97d..7ee4078 100644 --- a/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestFilesProducerTest.java +++ b/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestFilesProducerTest.java @@ -46,7 +46,7 @@ public class PullRequestFilesProducerTest extends GitHubComponentTestBase { context.addComponent("github", new GitHubComponent()); from("direct:validPullRequest") .process(new MockPullFilesProducerProcessor()) - .to("github://pullRequestFiles?" + GITHUB_CREDENTIALS_STRING); + .to("github://pullRequestFiles?username=someguy&password=apassword&repoOwner=anotherguy&repoName=somerepo"); } // end of configure http://git-wip-us.apache.org/repos/asf/camel/blob/b5281259/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestStateProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestStateProducerTest.java b/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestStateProducerTest.java index c6a6a93..b0cfb02 100644 --- a/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestStateProducerTest.java +++ b/components/camel-github/src/test/java/org/apache/camel/component/github/producer/PullRequestStateProducerTest.java @@ -28,11 +28,8 @@ import org.apache.camel.component.github.GitHubComponent; import org.apache.camel.component.github.GitHubComponentTestBase; import org.eclipse.egit.github.core.CommitStatus; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class PullRequestStateProducerTest extends GitHubComponentTestBase { - protected static final Logger LOG = LoggerFactory.getLogger(PullRequestStateProducerTest.class); private String commitsha; @Override @@ -44,14 +41,13 @@ public class PullRequestStateProducerTest extends GitHubComponentTestBase { context.addComponent("github", new GitHubComponent()); from("direct:validPullRequest") .process(new MockPullRequestStateProducerProcessor()) - .to("github://pullRequestState?state=success&" + GITHUB_CREDENTIALS_STRING); + .to("github://pullRequestState?state=success&username=someguy&password=apassword&repoOwner=anotherguy&repoName=somerepo"); } // end of configure }; } - @Test public void testPullRequestStateProducer() throws Exception { commitsha = commitService.getNextSha();
