This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 7890eec CAMEL-11869: Upgrade mockito-core to version 2.11.0 for
camel-nagios
7890eec is described below
commit 7890eecafc2d9c81abe86871f5d55ac60efcd9ef
Author: aldettinger <aldettin...@gmail.com>
AuthorDate: Tue Nov 14 21:53:50 2017 +0100
CAMEL-11869: Upgrade mockito-core to version 2.11.0 for camel-nagios
---
components/camel-nagios/pom.xml | 1 +
.../org/apache/camel/component/nagios/NagiosAsyncSendTest.java | 9 ++++-----
.../test/java/org/apache/camel/component/nagios/NagiosTest.java | 9 ++++-----
.../apache/camel/component/nagios/NagiosXorEncryptionTest.java | 9 ++++-----
4 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/components/camel-nagios/pom.xml b/components/camel-nagios/pom.xml
index 8fb9e50..e5c3213 100644
--- a/components/camel-nagios/pom.xml
+++ b/components/camel-nagios/pom.xml
@@ -80,6 +80,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>${mockito2-version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
diff --git
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
index b420022..825a707 100644
---
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
+++
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.nagios;
import com.googlecode.jsendnsca.NonBlockingNagiosPassiveCheckSender;
-import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.junit.BeforeClass;
import org.mockito.Mockito;
@@ -42,12 +41,12 @@ public class NagiosAsyncSendTest extends NagiosTest {
NagiosComponent nagiosComponent = new NagiosComponent();
nagiosComponent.setCamelContext(context);
- NagiosEndpoint nagiousEndpoint = (NagiosEndpoint)
nagiosComponent.createEndpoint(uri);
- nagiousEndpoint.setSender(nagiosPassiveCheckSender);
- Producer nagiosProducer = nagiousEndpoint.createProducer();
+ NagiosEndpoint nagiosEndpoint = (NagiosEndpoint)
nagiosComponent.createEndpoint(uri);
+ nagiosEndpoint.setSender(nagiosPassiveCheckSender);
+ nagiosEndpoint.createProducer();
from("direct:start")
- .to(nagiousEndpoint)
+ .to(nagiosEndpoint)
.to("mock:result");
}
};
diff --git
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
index b3e903d..d67b910 100644
---
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
+++
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
@@ -24,7 +24,6 @@ import com.googlecode.jsendnsca.MessagePayload;
import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
import com.googlecode.jsendnsca.PassiveCheckSender;
-import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -169,12 +168,12 @@ public class NagiosTest extends CamelTestSupport {
NagiosComponent nagiosComponent = new NagiosComponent();
nagiosComponent.setCamelContext(context);
- NagiosEndpoint nagiousEndpoint = (NagiosEndpoint)
nagiosComponent.createEndpoint(uri);
- nagiousEndpoint.setSender(nagiosPassiveCheckSender);
- Producer nagiosProducer = nagiousEndpoint.createProducer();
+ NagiosEndpoint nagiosEndpoint = (NagiosEndpoint)
nagiosComponent.createEndpoint(uri);
+ nagiosEndpoint.setSender(nagiosPassiveCheckSender);
+ nagiosEndpoint.createProducer();
from("direct:start")
- .to(nagiousEndpoint)
+ .to(nagiosEndpoint)
.to("mock:result");
}
};
diff --git
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosXorEncryptionTest.java
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosXorEncryptionTest.java
index cf4766c..270f80e9 100644
---
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosXorEncryptionTest.java
+++
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosXorEncryptionTest.java
@@ -21,7 +21,6 @@ import com.googlecode.jsendnsca.MessagePayload;
import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
import com.googlecode.jsendnsca.PassiveCheckSender;
-import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -76,12 +75,12 @@ public class NagiosXorEncryptionTest extends
CamelTestSupport {
NagiosComponent nagiosComponent = new NagiosComponent();
nagiosComponent.setCamelContext(context);
- NagiosEndpoint nagiousEndpoint = (NagiosEndpoint)
nagiosComponent.createEndpoint(uri);
- nagiousEndpoint.setSender(nagiosPassiveCheckSender);
- Producer nagiosProducer = nagiousEndpoint.createProducer();
+ NagiosEndpoint nagiosEndpoint = (NagiosEndpoint)
nagiosComponent.createEndpoint(uri);
+ nagiosEndpoint.setSender(nagiosPassiveCheckSender);
+ nagiosEndpoint.createProducer();
from("direct:start")
- .to(nagiousEndpoint)
+ .to(nagiosEndpoint)
.to("mock:result");
}
};
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <commits@camel.apache.org>'].
