You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/01/25 13:54:35 UTC
[1/4] camel git commit: Upgrade Hamcrest to version 2.0.0.0
Repository: camel
Updated Branches:
refs/heads/master 607e14f60 -> 712b33524
Upgrade Hamcrest to version 2.0.0.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/40eea30f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/40eea30f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/40eea30f
Branch: refs/heads/master
Commit: 40eea30f9ccd5b04b70b67172081fcd66f96a3ce
Parents: 607e14f
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Mon Jan 25 10:01:46 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jan 25 13:53:38 2016 +0100
----------------------------------------------------------------------
components/camel-cdi/pom.xml | 2 +-
components/camel-hipchat/pom.xml | 2 +-
components/camel-metrics/pom.xml | 2 +-
.../camel/component/metrics/AbstractMetricsProducerTest.java | 4 ++--
.../apache/camel/component/metrics/CounterEndpointTest.java | 4 ++--
.../apache/camel/component/metrics/CounterProducerTest.java | 4 ++--
.../camel/component/metrics/HistogramEndpointTest.java | 7 ++++---
.../camel/component/metrics/HistogramProducerTest.java | 4 ++--
.../apache/camel/component/metrics/MeterEndpointTest.java | 4 ++--
.../apache/camel/component/metrics/MeterProducerTest.java | 7 ++++---
.../apache/camel/component/metrics/MetricsComponentTest.java | 2 +-
.../apache/camel/component/metrics/MetricsEndpointTest.java | 4 ++--
.../org/apache/camel/component/metrics/MetricsTypeTest.java | 4 ++--
.../apache/camel/component/metrics/TimerEndpointTest.java | 4 ++--
.../apache/camel/component/metrics/TimerProducerTest.java | 4 ++--
components/camel-pdf/pom.xml | 2 +-
.../java/org/apache/camel/component/pdf/PdfAppendTest.java | 4 ++--
.../java/org/apache/camel/component/pdf/PdfCreationTest.java | 4 ++--
.../apache/camel/component/pdf/PdfTextExtractionTest.java | 4 ++--
components/camel-splunk/pom.xml | 2 +-
parent/pom.xml | 8 +++++++-
.../camel-eip-documentation-enricher-maven-plugin/pom.xml | 3 +--
.../camel/maven/integration/EIPDocumentationMojoTest.java | 4 ++--
23 files changed, 48 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index 348a43d..61296f1 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -127,7 +127,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
+ <artifactId>java-hamcrest</artifactId>
<version>${hamcrest-version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-hipchat/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-hipchat/pom.xml b/components/camel-hipchat/pom.xml
index 6f77379..5706659 100644
--- a/components/camel-hipchat/pom.xml
+++ b/components/camel-hipchat/pom.xml
@@ -94,7 +94,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
+ <artifactId>java-hamcrest</artifactId>
<version>${hamcrest-version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml
index b80bf52..cc20b3a 100644
--- a/components/camel-metrics/pom.xml
+++ b/components/camel-metrics/pom.xml
@@ -93,7 +93,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
+ <artifactId>java-hamcrest</artifactId>
<version>${hamcrest-version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/AbstractMetricsProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/AbstractMetricsProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/AbstractMetricsProducerTest.java
index 706002c..037f473 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/AbstractMetricsProducerTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/AbstractMetricsProducerTest.java
@@ -31,8 +31,8 @@ import org.mockito.runners.MockitoJUnitRunner;
import static org.apache.camel.component.metrics.AbstractMetricsProducer.HEADER_PATTERN;
import static org.apache.camel.component.metrics.MetricsConstants.HEADER_HISTOGRAM_VALUE;
import static org.apache.camel.component.metrics.MetricsConstants.HEADER_METRIC_NAME;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterEndpointTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterEndpointTest.java
index ba423b7..6dff310 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterEndpointTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterEndpointTest.java
@@ -27,11 +27,11 @@ import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertThat;
@RunWith(MockitoJUnitRunner.class)
public class CounterEndpointTest {
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterProducerTest.java
index d2edf44..e59ca32 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterProducerTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterProducerTest.java
@@ -30,8 +30,8 @@ import org.mockito.runners.MockitoJUnitRunner;
import static org.apache.camel.component.metrics.MetricsConstants.HEADER_COUNTER_DECREMENT;
import static org.apache.camel.component.metrics.MetricsConstants.HEADER_COUNTER_INCREMENT;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramEndpointTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramEndpointTest.java
index 60b743d..0e03af5 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramEndpointTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramEndpointTest.java
@@ -27,10 +27,11 @@ import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertThat;
@RunWith(MockitoJUnitRunner.class)
public class HistogramEndpointTest {
@@ -67,7 +68,7 @@ public class HistogramEndpointTest {
public void testCreateProducer() throws Exception {
Producer producer = endpoint.createProducer();
assertThat(producer, is(notNullValue()));
- assertThat(producer, is(HistogramProducer.class));
+ assertThat(producer, is(instanceOf(HistogramProducer.class)));
}
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramProducerTest.java
index 6c4ce68..99ed77f 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramProducerTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramProducerTest.java
@@ -29,8 +29,8 @@ import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import static org.apache.camel.component.metrics.MetricsConstants.HEADER_HISTOGRAM_VALUE;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterEndpointTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterEndpointTest.java
index 5842cd0..d58d539 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterEndpointTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterEndpointTest.java
@@ -27,11 +27,11 @@ import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertThat;
@RunWith(MockitoJUnitRunner.class)
public class MeterEndpointTest {
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterProducerTest.java
index dfa85c4..02f5c61 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterProducerTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterProducerTest.java
@@ -29,9 +29,10 @@ import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import static org.apache.camel.component.metrics.MetricsConstants.HEADER_METER_MARK;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
@@ -72,7 +73,7 @@ public class MeterProducerTest {
@Test
public void testMeterProducer() throws Exception {
assertThat(producer, is(notNullValue()));
- assertThat(producer.getEndpoint().equals(endpoint), is(true));
+ assertThat(producer.getEndpoint(), is(equalTo(endpoint)));
}
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java
index ec687a0..6f6b431 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java
@@ -33,8 +33,8 @@ import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
-import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertThat;
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsEndpointTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsEndpointTest.java
index 12978f0..e1607d2 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsEndpointTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsEndpointTest.java
@@ -31,8 +31,8 @@ import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsTypeTest.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsTypeTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsTypeTest.java
index e8f39d5..2e77114 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsTypeTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsTypeTest.java
@@ -20,8 +20,8 @@ import java.util.EnumSet;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
public class MetricsTypeTest {
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerEndpointTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerEndpointTest.java
index a9b7929..1cb8ea9 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerEndpointTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerEndpointTest.java
@@ -27,11 +27,11 @@ import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertThat;
@RunWith(MockitoJUnitRunner.class)
public class TimerEndpointTest {
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerProducerTest.java
index ce08aa9..fd66b16 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerProducerTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerProducerTest.java
@@ -29,10 +29,10 @@ import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import static org.apache.camel.component.metrics.MetricsConstants.HEADER_TIMER_ACTION;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-pdf/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-pdf/pom.xml b/components/camel-pdf/pom.xml
index c0817ba..e49da8c 100644
--- a/components/camel-pdf/pom.xml
+++ b/components/camel-pdf/pom.xml
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
+ <artifactId>java-hamcrest</artifactId>
<version>${hamcrest-version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java
----------------------------------------------------------------------
diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java
index 2f5da2d..8269f96 100644
--- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java
+++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java
@@ -39,8 +39,8 @@ import org.apache.pdfbox.util.PDFTextStripper;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.instanceOf;
public class PdfAppendTest extends CamelTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java
index 7b65cbb..c74e1fb 100644
--- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java
+++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java
@@ -33,8 +33,8 @@ import org.apache.pdfbox.util.PDFTextStripper;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.instanceOf;
public class PdfCreationTest extends CamelTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java
index db46882..6d93d8a 100644
--- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java
+++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java
@@ -34,8 +34,8 @@ import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy;
import org.apache.pdfbox.pdmodel.font.PDType1Font;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.instanceOf;
public class PdfTextExtractionTest extends CamelTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-splunk/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-splunk/pom.xml b/components/camel-splunk/pom.xml
index 4d7ace8..f3e275d 100644
--- a/components/camel-splunk/pom.xml
+++ b/components/camel-splunk/pom.xml
@@ -84,7 +84,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
+ <artifactId>java-hamcrest</artifactId>
<version>${hamcrest-version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d9bc26e..fa3c4b4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -217,7 +217,7 @@
<hadoop-version>1.2.1</hadoop-version>
<hadoop2-bundle-version>2.7.1_1</hadoop2-bundle-version>
<hadoop2-version>2.7.1</hadoop2-version>
- <hamcrest-version>1.3</hamcrest-version>
+ <hamcrest-version>2.0.0.0</hamcrest-version>
<hapi-version>2.2</hapi-version>
<hawtbuf-version>1.11</hawtbuf-version>
<hawtdb-version>1.6</hawtdb-version>
@@ -2304,6 +2304,12 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito-version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>hamcrest-core</artifactId>
+ <groupId>org.hamcrest</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>httpunit</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
index b2478e3..b6562cd 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
@@ -120,10 +120,9 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
+ <artifactId>java-hamcrest</artifactId>
<version>${hamcrest-version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java
index e5ce45a..efe20f7 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java
@@ -36,8 +36,8 @@ import org.apache.camel.maven.ResourceUtils;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
[4/4] camel git commit: Metrics CDI example automated tests
Posted by da...@apache.org.
Metrics CDI example automated tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/60068a90
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/60068a90
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/60068a90
Branch: refs/heads/master
Commit: 60068a90324e0d2f43fd15677cb5fb0eec7d3557
Parents: 6300194
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Mon Jan 25 10:35:56 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jan 25 13:53:39 2016 +0100
----------------------------------------------------------------------
examples/camel-example-metrics-cdi/pom.xml | 32 ++++++++
.../example/metrics/cdi/MetricsSampleTest.java | 81 ++++++++++++++++++++
2 files changed, 113 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/60068a90/examples/camel-example-metrics-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-metrics-cdi/pom.xml b/examples/camel-example-metrics-cdi/pom.xml
index c2958d6..293927a 100755
--- a/examples/camel-example-metrics-cdi/pom.xml
+++ b/examples/camel-example-metrics-cdi/pom.xml
@@ -96,6 +96,38 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
+
+ <!-- test -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>java-hamcrest</artifactId>
+ <version>${hamcrest-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <version>${arquillian-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.descriptors</groupId>
+ <artifactId>shrinkwrap-descriptors-depchain</artifactId>
+ <version>${shrinkwrap-descriptors-version}</version>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-weld-se-embedded-1.1</artifactId>
+ <version>${arquillian-weld-se-embedded-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/camel/blob/60068a90/examples/camel-example-metrics-cdi/src/test/java/org/apache/camel/example/metrics/cdi/MetricsSampleTest.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-metrics-cdi/src/test/java/org/apache/camel/example/metrics/cdi/MetricsSampleTest.java b/examples/camel-example-metrics-cdi/src/test/java/org/apache/camel/example/metrics/cdi/MetricsSampleTest.java
new file mode 100644
index 0000000..b9d41d4
--- /dev/null
+++ b/examples/camel-example-metrics-cdi/src/test/java/org/apache/camel/example/metrics/cdi/MetricsSampleTest.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 with
+ * the License. You may obtain a copy of the License at
+ *
+ * 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.camel.example.metrics.cdi;
+
+import javax.inject.Inject;
+import com.codahale.metrics.Gauge;
+import com.codahale.metrics.Meter;
+import com.codahale.metrics.annotation.Metric;
+import io.astefanutti.metrics.cdi.MetricsExtension;
+import org.apache.camel.CamelContext;
+import org.apache.camel.cdi.CdiCamelExtension;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+@RunWith(Arquillian.class)
+public class MetricsSampleTest {
+
+ @Inject
+ private Meter generated;
+ @Inject
+ private Meter attempt;
+ @Inject
+ private Meter success;
+ @Inject
+ private Meter redelivery;
+ @Inject
+ private Meter error;
+ @Inject
+ @Metric(name = "success-ratio")
+ private Gauge<Double> ratio;
+
+ @Deployment
+ public static Archive<?> deployment() {
+ return ShrinkWrap.create(JavaArchive.class)
+ // Camel CDI
+ .addPackage(CdiCamelExtension.class.getPackage())
+ // Metrics CDI
+ .addPackage(MetricsExtension.class.getPackage())
+ // Test classes
+ .addPackage(MetricsSampleTest.class.getPackage())
+ // Bean archive deployment descriptor
+ .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+ }
+
+ @Test
+ public void testMetricsValues(CamelContext context) throws Exception {
+ // Wait a while so that the timer can kick in
+ Thread.sleep(5000);
+
+ // And stop the Camel context so that inflight exchanges get completed
+ context.stop();
+
+ assertThat("Meter counts are not consistent!", attempt.getCount() - redelivery.getCount() - success.getCount() - error.getCount(), is(equalTo(0L)));
+
+ assertThat("Success rate gauge value is incorrect!", ratio.getValue(), is(equalTo(success.getOneMinuteRate() / generated.getOneMinuteRate())));
+ }
+}
[3/4] camel git commit: Add Camel context name test assertion
Posted by da...@apache.org.
Add Camel context name test assertion
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/712b3352
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/712b3352
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/712b3352
Branch: refs/heads/master
Commit: 712b335248ee6c5d04e91fb438ed8b88feeb57c6
Parents: 60068a9
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Mon Jan 25 13:47:19 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jan 25 13:53:39 2016 +0100
----------------------------------------------------------------------
.../apache/camel/example/metrics/cdi/MetricsRoute.java | 2 ++
.../camel/example/metrics/cdi/MetricsSampleTest.java | 11 ++++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/712b3352/examples/camel-example-metrics-cdi/src/main/java/org/apache/camel/example/metrics/cdi/MetricsRoute.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-metrics-cdi/src/main/java/org/apache/camel/example/metrics/cdi/MetricsRoute.java b/examples/camel-example-metrics-cdi/src/main/java/org/apache/camel/example/metrics/cdi/MetricsRoute.java
index 0622475..49f0acd 100644
--- a/examples/camel-example-metrics-cdi/src/main/java/org/apache/camel/example/metrics/cdi/MetricsRoute.java
+++ b/examples/camel-example-metrics-cdi/src/main/java/org/apache/camel/example/metrics/cdi/MetricsRoute.java
@@ -19,8 +19,10 @@ package org.apache.camel.example.metrics.cdi;
import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.cdi.ContextName;
import org.apache.camel.component.metrics.MetricsConstants;
+@ContextName("camel-example-metrics-cdi")
class MetricsRoute extends RouteBuilder {
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/712b3352/examples/camel-example-metrics-cdi/src/test/java/org/apache/camel/example/metrics/cdi/MetricsSampleTest.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-metrics-cdi/src/test/java/org/apache/camel/example/metrics/cdi/MetricsSampleTest.java b/examples/camel-example-metrics-cdi/src/test/java/org/apache/camel/example/metrics/cdi/MetricsSampleTest.java
index b9d41d4..2ac1210 100644
--- a/examples/camel-example-metrics-cdi/src/test/java/org/apache/camel/example/metrics/cdi/MetricsSampleTest.java
+++ b/examples/camel-example-metrics-cdi/src/test/java/org/apache/camel/example/metrics/cdi/MetricsSampleTest.java
@@ -49,10 +49,14 @@ public class MetricsSampleTest {
private Meter redelivery;
@Inject
private Meter error;
+
@Inject
@Metric(name = "success-ratio")
private Gauge<Double> ratio;
+ @Inject
+ private CamelContext context;
+
@Deployment
public static Archive<?> deployment() {
return ShrinkWrap.create(JavaArchive.class)
@@ -67,7 +71,12 @@ public class MetricsSampleTest {
}
@Test
- public void testMetricsValues(CamelContext context) throws Exception {
+ public void testContextName() {
+ assertThat("Context name is incorrect!", context.getName(), is(equalTo("camel-example-metrics-cdi")));
+ }
+
+ @Test
+ public void testMetricsValues() throws Exception {
// Wait a while so that the timer can kick in
Thread.sleep(5000);
[2/4] camel git commit: Do not expose Metrics reporter as CDI bean
Posted by da...@apache.org.
Do not expose Metrics reporter as CDI bean
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6300194a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6300194a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6300194a
Branch: refs/heads/master
Commit: 6300194a1d45e190c264009a82be1ec30a7261e2
Parents: 40eea30
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Mon Jan 25 10:34:48 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jan 25 13:53:39 2016 +0100
----------------------------------------------------------------------
.../example/metrics/cdi/MetricsCdiConfig.java | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6300194a/examples/camel-example-metrics-cdi/src/main/java/org/apache/camel/example/metrics/cdi/MetricsCdiConfig.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-metrics-cdi/src/main/java/org/apache/camel/example/metrics/cdi/MetricsCdiConfig.java b/examples/camel-example-metrics-cdi/src/main/java/org/apache/camel/example/metrics/cdi/MetricsCdiConfig.java
index 0b543c8..8509804 100644
--- a/examples/camel-example-metrics-cdi/src/main/java/org/apache/camel/example/metrics/cdi/MetricsCdiConfig.java
+++ b/examples/camel-example-metrics-cdi/src/main/java/org/apache/camel/example/metrics/cdi/MetricsCdiConfig.java
@@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
import javax.inject.Named;
import com.codahale.metrics.MetricRegistry;
@@ -29,6 +30,7 @@ import org.apache.camel.component.metrics.MetricsComponent;
import org.apache.camel.management.event.CamelContextStartedEvent;
import org.apache.camel.management.event.CamelContextStoppedEvent;
+@ApplicationScoped
class MetricsCdiConfig {
@Produces
@@ -37,24 +39,25 @@ class MetricsCdiConfig {
// TODO: remove when Camel Metrics component looks up for the Metrics registry by type only
private MetricRegistry registry = new MetricRegistry();
- @Produces
- @ApplicationScoped
- private Slf4jReporter reporter(MetricRegistry registry) {
- return Slf4jReporter.forRegistry(registry)
+ private final Slf4jReporter reporter;
+
+ @Inject
+ MetricsCdiConfig(MetricRegistry registry) {
+ reporter = Slf4jReporter.forRegistry(registry)
.convertRatesTo(TimeUnit.SECONDS)
.convertDurationsTo(TimeUnit.MILLISECONDS)
.build();
}
- private static void onStart(@Observes CamelContextStartedEvent event, Slf4jReporter reporter) {
+ private void onStart(@Observes CamelContextStartedEvent event) {
reporter.start(10L, TimeUnit.SECONDS);
}
- private static void onStop(@Observes CamelContextStoppedEvent event, Slf4jReporter reporter) {
+ private void onStop(@Observes CamelContextStoppedEvent event) {
reporter.stop();
}
- private static void configure(@Observes MetricsConfiguration config) {
+ private void configure(@Observes MetricsConfiguration config) {
config.useAbsoluteName(true);
}
}