This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 274749fdde672bdb53b49a34981f100bb7091dc8
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jul 24 16:20:26 2020 +0200
[CAMEL-11807] Upgrade camel-weka to junit5
---
components/camel-weka/pom.xml | 4 ++--
.../camel/component/weka/DecisionTreeTest.java | 17 +++++++--------
.../apache/camel/component/weka/FilterTest.java | 13 ++++++------
.../camel/component/weka/PredictionTest.java | 7 ++++---
.../apache/camel/component/weka/ReadWriteTest.java | 24 ++++++++++++----------
5 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/components/camel-weka/pom.xml b/components/camel-weka/pom.xml
index d2f489a..620289b 100644
--- a/components/camel-weka/pom.xml
+++ b/components/camel-weka/pom.xml
@@ -56,8 +56,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-weka/src/test/java/org/apache/camel/component/weka/DecisionTreeTest.java
b/components/camel-weka/src/test/java/org/apache/camel/component/weka/DecisionTreeTest.java
index ee79c22..aec4a88 100644
---
a/components/camel-weka/src/test/java/org/apache/camel/component/weka/DecisionTreeTest.java
+++
b/components/camel-weka/src/test/java/org/apache/camel/component/weka/DecisionTreeTest.java
@@ -25,11 +25,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import weka.classifiers.Classifier;
import weka.classifiers.Evaluation;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class DecisionTreeTest extends AbstractWekaTest {
@Test
@@ -60,11 +61,11 @@ public class DecisionTreeTest extends AbstractWekaTest {
Dataset dataset = producer.requestBody("direct:start", inpath,
Dataset.class);
Classifier classifier = dataset.getClassifier();
- Assert.assertNotNull(classifier);
+ assertNotNull(classifier);
logInfo("{}", classifier);
Evaluation evaluation = dataset.getEvaluation();
- Assert.assertNotNull(evaluation);
+ assertNotNull(evaluation);
logInfo("{}", evaluation);
}
}
@@ -97,11 +98,11 @@ public class DecisionTreeTest extends AbstractWekaTest {
Dataset dataset = producer.requestBody("direct:start", inpath,
Dataset.class);
Classifier classifier = dataset.getClassifier();
- Assert.assertNotNull(classifier);
+ assertNotNull(classifier);
logInfo("{}", classifier);
Evaluation evaluation = dataset.getEvaluation();
- Assert.assertNotNull(evaluation);
+ assertNotNull(evaluation);
logInfo("{}", evaluation);
}
}
@@ -131,11 +132,11 @@ public class DecisionTreeTest extends AbstractWekaTest {
Dataset dataset = producer.requestBody("direct:start", inpath,
Dataset.class);
Classifier classifier = dataset.getClassifier();
- Assert.assertNotNull(classifier);
+ assertNotNull(classifier);
logInfo("{}", classifier);
Evaluation evaluation = dataset.getEvaluation();
- Assert.assertNotNull(evaluation);
+ assertNotNull(evaluation);
logInfo("{}", evaluation);
}
}
diff --git
a/components/camel-weka/src/test/java/org/apache/camel/component/weka/FilterTest.java
b/components/camel-weka/src/test/java/org/apache/camel/component/weka/FilterTest.java
index 5275dc5..0d209ef 100644
---
a/components/camel-weka/src/test/java/org/apache/camel/component/weka/FilterTest.java
+++
b/components/camel-weka/src/test/java/org/apache/camel/component/weka/FilterTest.java
@@ -26,10 +26,11 @@ import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import weka.core.Instances;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class FilterTest {
@Test
@@ -64,10 +65,10 @@ public class FilterTest {
ConsumerTemplate consumer = camelctx.createConsumerTemplate();
Dataset dataset = consumer.receiveBody("direct:end",
Dataset.class);
- Assert.assertEquals("sfny", dataset.getInstances().relationName());
+ assertEquals("sfny", dataset.getInstances().relationName());
Instances instances = DatasetUtils.read("target/data/sfny.arff");
- Assert.assertEquals("sfny", instances.relationName());
+ assertEquals("sfny", instances.relationName());
}
}
@@ -103,10 +104,10 @@ public class FilterTest {
ProducerTemplate producer = camelctx.createProducerTemplate();
Dataset dataset = producer.requestBody("direct:start", inpath,
Dataset.class);
- Assert.assertEquals("sfny", dataset.getInstances().relationName());
+ assertEquals("sfny", dataset.getInstances().relationName());
Instances instances = DatasetUtils.read("target/data/sfny.arff");
- Assert.assertEquals("sfny", instances.relationName());
+ assertEquals("sfny", instances.relationName());
}
}
}
diff --git
a/components/camel-weka/src/test/java/org/apache/camel/component/weka/PredictionTest.java
b/components/camel-weka/src/test/java/org/apache/camel/component/weka/PredictionTest.java
index 574e203..7ad5bd4 100644
---
a/components/camel-weka/src/test/java/org/apache/camel/component/weka/PredictionTest.java
+++
b/components/camel-weka/src/test/java/org/apache/camel/component/weka/PredictionTest.java
@@ -28,10 +28,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import weka.core.Instances;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class PredictionTest extends AbstractWekaTest {
@Test
@@ -93,7 +94,7 @@ public class PredictionTest extends AbstractWekaTest {
logInfo(String.format("Correctly Classified Instances %d %.4f
%%", correct, accuracy));
logInfo(String.format("Incorrectly Classified Instances %d %.4f
%%", incorrect, 100 - accuracy));
- Assert.assertEquals("88.8889", String.format(Locale.ENGLISH,
"%.4f", accuracy));
+ assertEquals("88.8889", String.format(Locale.ENGLISH, "%.4f",
accuracy));
}
}
diff --git
a/components/camel-weka/src/test/java/org/apache/camel/component/weka/ReadWriteTest.java
b/components/camel-weka/src/test/java/org/apache/camel/component/weka/ReadWriteTest.java
index 8e6eefd..f0d2021 100644
---
a/components/camel-weka/src/test/java/org/apache/camel/component/weka/ReadWriteTest.java
+++
b/components/camel-weka/src/test/java/org/apache/camel/component/weka/ReadWriteTest.java
@@ -27,8 +27,10 @@ import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ReadWriteTest {
@@ -48,7 +50,7 @@ public class ReadWriteTest {
ProducerTemplate producer = camelctx.createProducerTemplate();
String res = producer.requestBody("direct:start", null,
String.class);
- Assert.assertTrue(res.startsWith("3.8"));
+ assertTrue(res.startsWith("3.8"));
}
}
@@ -69,7 +71,7 @@ public class ReadWriteTest {
ConsumerTemplate consumer = camelctx.createConsumerTemplate();
Dataset dataset = consumer.receiveBody("direct:end",
Dataset.class);
- Assert.assertNotNull(dataset);
+ assertNotNull(dataset);
}
}
@@ -92,7 +94,7 @@ public class ReadWriteTest {
ProducerTemplate producer = camelctx.createProducerTemplate();
Dataset dataset = producer.requestBody("direct:start", sourceUrl,
Dataset.class);
- Assert.assertNotNull(dataset);
+ assertNotNull(dataset);
}
}
@@ -115,7 +117,7 @@ public class ReadWriteTest {
ProducerTemplate producer = camelctx.createProducerTemplate();
Dataset dataset = producer.requestBody("direct:start", input,
Dataset.class);
- Assert.assertNotNull(dataset);
+ assertNotNull(dataset);
}
}
@@ -135,7 +137,7 @@ public class ReadWriteTest {
ProducerTemplate producer = camelctx.createProducerTemplate();
Dataset dataset = producer.requestBody("direct:start", null,
Dataset.class);
- Assert.assertNotNull(dataset);
+ assertNotNull(dataset);
}
}
@@ -158,7 +160,7 @@ public class ReadWriteTest {
ProducerTemplate producer = camelctx.createProducerTemplate();
Dataset dataset = producer.requestBody("direct:start", input,
Dataset.class);
- Assert.assertNotNull(dataset);
+ assertNotNull(dataset);
}
}
@@ -184,7 +186,7 @@ public class ReadWriteTest {
Path outpath = Paths.get("target/data/sfny.arff");
dataset = Dataset.create(outpath);
- Assert.assertNotNull(dataset);
+ assertNotNull(dataset);
}
}
@@ -211,7 +213,7 @@ public class ReadWriteTest {
Path outpath = Paths.get("target/data/sfny.arff");
dataset = Dataset.create(outpath);
- Assert.assertNotNull(dataset);
+ assertNotNull(dataset);
}
}
@@ -237,7 +239,7 @@ public class ReadWriteTest {
Path outpath = Paths.get("target/data/sfny.arff");
dataset = Dataset.create(outpath);
- Assert.assertNotNull(dataset);
+ assertNotNull(dataset);
}
}
}
