You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2021/10/22 13:15:01 UTC
[incubator-hop] branch 2.0.0 updated: HOP-3426: cleanup powermock
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch 2.0.0
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/2.0.0 by this push:
new 66fdf4c HOP-3426: cleanup powermock
new c8e8ec1 Merge pull request #1166 from hansva/2.0.0
66fdf4c is described below
commit 66fdf4c22b5afa9bb16b2664ef9f0ff7bb0a079a
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Fri Oct 22 15:13:52 2021 +0200
HOP-3426: cleanup powermock
---
assemblies/core/lib/pom.xml | 12 ++++++------
assemblies/lib/pom.xml | 12 ++++++------
core/pom.xml | 2 +-
engine/pom.xml | 22 ----------------------
.../org/apache/hop/pipeline/PipelineMetaTest.java | 7 -------
.../java/org/apache/hop/pipeline/PipelineTest.java | 3 ---
.../apache/hop/pipeline/PipelineTestingUtil.java | 1 -
.../hop/pipeline/PipelineTransformCollector.java | 2 --
.../org/apache/hop/pipeline/RowProducerTest.java | 1 -
.../hop/pipeline/TransformWithMappingMetaTest.java | 2 --
.../FieldSplitter_EmptyStringVsNull_Test.java | 2 --
plugins/transforms/ifnull/pom.xml | 15 ---------------
.../hop/pipeline/transforms/ifnull/IfNullTest.java | 18 +++++++-----------
.../RegexEval_EmptyStringVsNull_Test.java | 2 --
plugins/transforms/textfile/pom.xml | 11 -----------
.../transforms/csvinput/PDI_15270_Test.java | 6 +-----
pom.xml | 2 +-
.../EditRowsDialog_EmptyStringVsNull_Test.java | 2 --
18 files changed, 22 insertions(+), 100 deletions(-)
diff --git a/assemblies/core/lib/pom.xml b/assemblies/core/lib/pom.xml
index bb7e271..cf1dc20 100644
--- a/assemblies/core/lib/pom.xml
+++ b/assemblies/core/lib/pom.xml
@@ -36,9 +36,9 @@
<!-- third party -->
<geronimo-servlet_3.0_spec.version>1.0</geronimo-servlet_3.0_spec.version>
- <slf4j-api.version>1.7.7</slf4j-api.version>
- <slf4j-log4j12.version>1.7.7</slf4j-log4j12.version>
- <apache-log4j-extras>1.2.17</apache-log4j-extras>
+ <slf4j-api.version>1.7.32</slf4j-api.version>
+ <slf4j-log4j12.version>1.7.32</slf4j-log4j12.version>
+ <log4j.version>2.14.1</log4j.version>
<webservices-api.version>2.3.1</webservices-api.version>
<webservices-rt.version>2.3.1</webservices-rt.version>
<asm.version>3.2</asm.version>
@@ -111,9 +111,9 @@
<!-- Other third-party dependencies -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>apache-log4j-extras</artifactId>
- <version>${apache-log4j-extras}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/assemblies/lib/pom.xml b/assemblies/lib/pom.xml
index 66d362c..568fcc8 100644
--- a/assemblies/lib/pom.xml
+++ b/assemblies/lib/pom.xml
@@ -34,9 +34,9 @@
<properties>
<!-- third party -->
- <slf4j-api.version>1.7.7</slf4j-api.version>
- <slf4j-log4j12.version>1.7.7</slf4j-log4j12.version>
- <apache-log4j-extras>1.2.17</apache-log4j-extras>
+ <slf4j-api.version>1.7.32</slf4j-api.version>
+ <slf4j-log4j12.version>1.7.32</slf4j-log4j12.version>
+ <log4j.version>2.14.1</log4j.version>
<webservices-api.version>2.3.1</webservices-api.version>
<webservices-rt.version>2.3.1</webservices-rt.version>
<asm.version>3.2</asm.version>
@@ -121,9 +121,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>apache-log4j-extras</artifactId>
- <version>${apache-log4j-extras}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index 91a8541..b1cb149 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -37,7 +37,7 @@
<properties>
<!-- Test running configuration -->
<maven-surefire-plugin.reuseForks>true</maven-surefire-plugin.reuseForks>
- <maven-surefire-plugin.argLine>-Duser.timezone=UTC -Dfile.encoding=UTF-8 -Duser.language=en -Duser.country=US
+ <maven-surefire-plugin.argLine>-Duser.timezone=UTC -Dfile.encoding=UTF-8 -Duser.language=en -Duser.country=US --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED
</maven-surefire-plugin.argLine>
<!-- Third-party dependencies -->
<slf4j-api.version>1.7.30</slf4j-api.version>
diff --git a/engine/pom.xml b/engine/pom.xml
index c39a437..0b5ee41 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -535,28 +535,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>hamcrest-core</artifactId>
- <groupId>org.hamcrest</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>hamcrest-core</artifactId>
- <groupId>org.hamcrest</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>2.2</version>
diff --git a/engine/src/test/java/org/apache/hop/pipeline/PipelineMetaTest.java b/engine/src/test/java/org/apache/hop/pipeline/PipelineMetaTest.java
index 995efe4..71ce4f9 100644
--- a/engine/src/test/java/org/apache/hop/pipeline/PipelineMetaTest.java
+++ b/engine/src/test/java/org/apache/hop/pipeline/PipelineMetaTest.java
@@ -53,13 +53,6 @@ import static org.junit.Assert.*;
import static org.mockito.Matchers.same;
import static org.mockito.Mockito.*;
-// import org.apache.hop.pipeline.transforms.datagrid.DataGridMeta;
-// import org.apache.hop.pipeline.transforms.textfileoutput.TextFileOutputMeta;
-// import org.apache.hop.pipeline.transforms.userdefinedjavaclass.InfoTransformDefinition;
-// import org.apache.hop.pipeline.transforms.userdefinedjavaclass.UserDefinedJavaClassDef;
-// import org.apache.hop.pipeline.transforms.userdefinedjavaclass.UserDefinedJavaClassMeta;
-
-@RunWith(PowerMockRunner.class)
public class PipelineMetaTest {
public static final String TRANSFORM_NAME = "Any transform name";
diff --git a/engine/src/test/java/org/apache/hop/pipeline/PipelineTest.java b/engine/src/test/java/org/apache/hop/pipeline/PipelineTest.java
index 59b3a9c..6c78b41 100644
--- a/engine/src/test/java/org/apache/hop/pipeline/PipelineTest.java
+++ b/engine/src/test/java/org/apache/hop/pipeline/PipelineTest.java
@@ -32,10 +32,8 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
import java.util.Collections;
import java.util.concurrent.CountDownLatch;
@@ -44,7 +42,6 @@ import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.*;
-@RunWith(MockitoJUnitRunner.class)
public class PipelineTest {
@ClassRule public static RestoreHopEngineEnvironment env = new RestoreHopEngineEnvironment();
@Mock private ITransform transformMock, transformMock2;
diff --git a/engine/src/test/java/org/apache/hop/pipeline/PipelineTestingUtil.java b/engine/src/test/java/org/apache/hop/pipeline/PipelineTestingUtil.java
index 19b2b33..16f33ce 100644
--- a/engine/src/test/java/org/apache/hop/pipeline/PipelineTestingUtil.java
+++ b/engine/src/test/java/org/apache/hop/pipeline/PipelineTestingUtil.java
@@ -27,7 +27,6 @@ import java.util.List;
import static org.junit.Assert.*;
-/** @author Andrey Khayrutdinov */
public class PipelineTestingUtil {
public static List<Object[]> execute(
diff --git a/engine/src/test/java/org/apache/hop/pipeline/PipelineTransformCollector.java b/engine/src/test/java/org/apache/hop/pipeline/PipelineTransformCollector.java
index 13fcadd..7c8fd48 100644
--- a/engine/src/test/java/org/apache/hop/pipeline/PipelineTransformCollector.java
+++ b/engine/src/test/java/org/apache/hop/pipeline/PipelineTransformCollector.java
@@ -27,8 +27,6 @@ import java.util.List;
/**
* Helper class for testcases. You can add an instance of this class to a transform to read all of
* the Rows the transform read or wrote.
- *
- * @author Sven Boden
*/
public class PipelineTransformCollector implements IRowListener {
private List<RowMetaAndData> rowsRead;
diff --git a/engine/src/test/java/org/apache/hop/pipeline/RowProducerTest.java b/engine/src/test/java/org/apache/hop/pipeline/RowProducerTest.java
index 52049db..f841307 100644
--- a/engine/src/test/java/org/apache/hop/pipeline/RowProducerTest.java
+++ b/engine/src/test/java/org/apache/hop/pipeline/RowProducerTest.java
@@ -29,7 +29,6 @@ import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Mockito.*;
-/** Created by mburgess on 10/7/15. */
public class RowProducerTest {
RowProducer rowProducer;
diff --git a/engine/src/test/java/org/apache/hop/pipeline/TransformWithMappingMetaTest.java b/engine/src/test/java/org/apache/hop/pipeline/TransformWithMappingMetaTest.java
index 5e0e872..cd8c298 100644
--- a/engine/src/test/java/org/apache/hop/pipeline/TransformWithMappingMetaTest.java
+++ b/engine/src/test/java/org/apache/hop/pipeline/TransformWithMappingMetaTest.java
@@ -30,8 +30,6 @@ import org.mockito.Mock;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
-/** Created by Yury_Bakhmutski on 2/8/2017. */
-@RunWith(PowerMockRunner.class)
public class TransformWithMappingMetaTest {
@Mock PipelineMeta pipelineMeta;
diff --git a/plugins/transforms/fieldsplitter/src/test/java/org/apache/hop/pipeline/transforms/fieldsplitter/FieldSplitter_EmptyStringVsNull_Test.java b/plugins/transforms/fieldsplitter/src/test/java/org/apache/hop/pipeline/transforms/fieldsplitter/FieldSplitter_EmptyStringVsNull_Test.java
index 643aa4b..c88833f 100644
--- a/plugins/transforms/fieldsplitter/src/test/java/org/apache/hop/pipeline/transforms/fieldsplitter/FieldSplitter_EmptyStringVsNull_Test.java
+++ b/plugins/transforms/fieldsplitter/src/test/java/org/apache/hop/pipeline/transforms/fieldsplitter/FieldSplitter_EmptyStringVsNull_Test.java
@@ -35,8 +35,6 @@ import java.util.List;
import static org.mockito.Mockito.*;
-/** @author Andrey Khayrutdinov */
-@RunWith(PowerMockRunner.class)
public class FieldSplitter_EmptyStringVsNull_Test {
private TransformMockHelper<FieldSplitterMeta, ITransformData> helper;
@ClassRule public static RestoreHopEngineEnvironment env = new RestoreHopEngineEnvironment();
diff --git a/plugins/transforms/ifnull/pom.xml b/plugins/transforms/ifnull/pom.xml
index 102d1f9..9a5f3f2 100644
--- a/plugins/transforms/ifnull/pom.xml
+++ b/plugins/transforms/ifnull/pom.xml
@@ -33,19 +33,4 @@
<name>Hop Plugins Transforms If Null</name>
- <dependencies>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>${powermock-module-junit4.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
- <version>${powermock-api-mockito.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
</project>
\ No newline at end of file
diff --git a/plugins/transforms/ifnull/src/test/java/org/apache/hop/pipeline/transforms/ifnull/IfNullTest.java b/plugins/transforms/ifnull/src/test/java/org/apache/hop/pipeline/transforms/ifnull/IfNullTest.java
index 6b9293a..b5c0a19 100644
--- a/plugins/transforms/ifnull/src/test/java/org/apache/hop/pipeline/transforms/ifnull/IfNullTest.java
+++ b/plugins/transforms/ifnull/src/test/java/org/apache/hop/pipeline/transforms/ifnull/IfNullTest.java
@@ -35,24 +35,19 @@ import org.apache.hop.metadata.api.IHopMetadataProvider;
import org.apache.hop.pipeline.transform.TransformMeta;
import org.apache.hop.pipeline.transforms.ifnull.IfNullMeta.Fields;
import org.apache.hop.pipeline.transforms.mock.TransformMockHelper;
-import org.junit.*;
-import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.*;
-/**
- * Tests for IfNull transform
- *
- * @author Ivan Pogodin
- * @see IfNull
- */
-@RunWith(PowerMockRunner.class)
+/** Tests for IfNull transform */
public class IfNullTest {
TransformMockHelper<IfNullMeta, IfNullData> smh;
- @ClassRule public static RestoreHopEngineEnvironment env = new RestoreHopEngineEnvironment();
+ private RestoreHopEngineEnvironment env;
@BeforeClass
public static void beforeClass() throws HopException {
@@ -61,6 +56,7 @@ public class IfNullTest {
@Before
public void setUp() {
+ env = new RestoreHopEngineEnvironment();
smh = new TransformMockHelper<>("Field IfNull processor", IfNullMeta.class, IfNullData.class);
when(smh.logChannelFactory.create(any(), any(ILoggingObject.class)))
.thenReturn(smh.iLogChannel);
diff --git a/plugins/transforms/regexeval/src/test/java/org/apache/hop/pipeline/transforms/regexeval/RegexEval_EmptyStringVsNull_Test.java b/plugins/transforms/regexeval/src/test/java/org/apache/hop/pipeline/transforms/regexeval/RegexEval_EmptyStringVsNull_Test.java
index e1e8682..bd77ffb 100644
--- a/plugins/transforms/regexeval/src/test/java/org/apache/hop/pipeline/transforms/regexeval/RegexEval_EmptyStringVsNull_Test.java
+++ b/plugins/transforms/regexeval/src/test/java/org/apache/hop/pipeline/transforms/regexeval/RegexEval_EmptyStringVsNull_Test.java
@@ -36,8 +36,6 @@ import java.util.regex.Pattern;
import static org.mockito.Mockito.*;
-/** @author Andrey Khayrutdinov */
-@RunWith(PowerMockRunner.class)
public class RegexEval_EmptyStringVsNull_Test {
private TransformMockHelper<RegexEvalMeta, ITransformData> helper;
@ClassRule public static RestoreHopEngineEnvironment env = new RestoreHopEngineEnvironment();
diff --git a/plugins/transforms/textfile/pom.xml b/plugins/transforms/textfile/pom.xml
index e548123..0bb884a 100644
--- a/plugins/transforms/textfile/pom.xml
+++ b/plugins/transforms/textfile/pom.xml
@@ -33,17 +33,6 @@
<name>Hop Plugins Transforms Text File</name>
- <dependencies>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
- </dependency>
- </dependencies>
-
<build>
<resources>
<resource>
diff --git a/plugins/transforms/textfile/src/test/java/org/apache/hop/pipeline/transforms/csvinput/PDI_15270_Test.java b/plugins/transforms/textfile/src/test/java/org/apache/hop/pipeline/transforms/csvinput/PDI_15270_Test.java
index bb6db16..db03ce3 100644
--- a/plugins/transforms/textfile/src/test/java/org/apache/hop/pipeline/transforms/csvinput/PDI_15270_Test.java
+++ b/plugins/transforms/textfile/src/test/java/org/apache/hop/pipeline/transforms/csvinput/PDI_15270_Test.java
@@ -26,8 +26,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
import java.io.File;
@@ -36,9 +34,7 @@ import static org.junit.Assert.*;
/**
* Csv data is taken from the attachment to the issue.
*
- * <p>Created by Yury_Bakhmutski on 10/7/2016.
- */
-@RunWith(PowerMockRunner.class)
+**/
public class PDI_15270_Test extends CsvInputUnitTestBase {
private CsvInput csvInput;
private String[] expected;
diff --git a/pom.xml b/pom.xml
index 964b175..26ca865 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.build.timestamp.format>yyyy-MM-dd hh.mm.ss</maven.build.timestamp.format>
- <maven-surefire-plugin.argLine>-Duser.timezone=UTC -Dfile.encoding=UTF-8 -Duser.language=en -Duser.country=US
+ <maven-surefire-plugin.argLine>-Duser.timezone=UTC -Dfile.encoding=UTF-8 -Duser.language=en -Duser.country=US --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED
</maven-surefire-plugin.argLine>
<!-- License Configuration -->
diff --git a/ui/src/test/java/org/apache/hop/ui/core/dialog/EditRowsDialog_EmptyStringVsNull_Test.java b/ui/src/test/java/org/apache/hop/ui/core/dialog/EditRowsDialog_EmptyStringVsNull_Test.java
index a39c7b9..f4cbd67 100644
--- a/ui/src/test/java/org/apache/hop/ui/core/dialog/EditRowsDialog_EmptyStringVsNull_Test.java
+++ b/ui/src/test/java/org/apache/hop/ui/core/dialog/EditRowsDialog_EmptyStringVsNull_Test.java
@@ -35,8 +35,6 @@ import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.*;
-/** @author Andrey Khayrutdinov */
-@RunWith(PowerMockRunner.class)
public class EditRowsDialog_EmptyStringVsNull_Test {
@ClassRule public static RestoreHopEngineEnvironment env = new RestoreHopEngineEnvironment();