This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 8ecf0aa HOP-3265 Fix JUnit tests failure if the environment is not in
English
new c938353 Merge pull request #1052 from nadment/HOP-3265
8ecf0aa is described below
commit 8ecf0aab3063ded72aadb0813e04a301042f6fe7
Author: Nicolas Adment <[email protected]>
AuthorDate: Sun Sep 12 12:22:18 2021 +0200
HOP-3265 Fix JUnit tests failure if the environment is not in English
---
.../src/test/java/org/apache/hop/core/logging/LogMessageTest.java | 4 ++++
.../src/test/java/org/apache/hop/pipeline/DatabaseImpactTest.java | 4 ++++
.../hop/pipeline/transforms/xml/xmloutput/XmlOutputMetaTest.java | 4 ++++
.../org/apache/hop/pipeline/transforms/zipfile/ZipFileMetaTest.java | 6 +++++-
4 files changed, 17 insertions(+), 1 deletion(-)
diff --git
a/engine/src/test/java/org/apache/hop/core/logging/LogMessageTest.java
b/engine/src/test/java/org/apache/hop/core/logging/LogMessageTest.java
index 91d2e37..dfeccba 100644
--- a/engine/src/test/java/org/apache/hop/core/logging/LogMessageTest.java
+++ b/engine/src/test/java/org/apache/hop/core/logging/LogMessageTest.java
@@ -20,8 +20,10 @@ package org.apache.hop.core.logging;
import org.apache.hop.core.Const;
import org.apache.hop.core.config.DescribedVariable;
import org.apache.hop.core.config.HopConfig;
+import org.apache.hop.junit.rules.RestoreHopEngineEnvironment;
import org.junit.After;
import org.junit.Before;
+import org.junit.ClassRule;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -36,6 +38,8 @@ public class LogMessageTest {
private static String treeLogChannelId;
private static String simpleLogChannelId;
+ @ClassRule public static RestoreHopEngineEnvironment env = new
RestoreHopEngineEnvironment();
+
@Before
public void setUp() {
treeLogChannelId =
LoggingRegistry.getInstance().registerLoggingSource(getTreeLoggingObject());
diff --git
a/engine/src/test/java/org/apache/hop/pipeline/DatabaseImpactTest.java
b/engine/src/test/java/org/apache/hop/pipeline/DatabaseImpactTest.java
index 2aa559f..69f6355 100644
--- a/engine/src/test/java/org/apache/hop/pipeline/DatabaseImpactTest.java
+++ b/engine/src/test/java/org/apache/hop/pipeline/DatabaseImpactTest.java
@@ -21,6 +21,8 @@ import org.apache.hop.core.RowMetaAndData;
import org.apache.hop.core.exception.HopValueException;
import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.i18n.BaseMessages;
+import org.apache.hop.junit.rules.RestoreHopEngineEnvironment;
+import org.junit.ClassRule;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -30,6 +32,8 @@ public class DatabaseImpactTest {
private Class<?> PKG = Pipeline.class;
+ @ClassRule public static RestoreHopEngineEnvironment env = new
RestoreHopEngineEnvironment();
+
@Test
public void testGetRow() throws HopValueException {
DatabaseImpact testObject =
diff --git
a/plugins/transforms/xml/src/test/java/org/apache/hop/pipeline/transforms/xml/xmloutput/XmlOutputMetaTest.java
b/plugins/transforms/xml/src/test/java/org/apache/hop/pipeline/transforms/xml/xmloutput/XmlOutputMetaTest.java
index bfa9a59..effc9da 100644
---
a/plugins/transforms/xml/src/test/java/org/apache/hop/pipeline/transforms/xml/xmloutput/XmlOutputMetaTest.java
+++
b/plugins/transforms/xml/src/test/java/org/apache/hop/pipeline/transforms/xml/xmloutput/XmlOutputMetaTest.java
@@ -28,11 +28,13 @@ import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.core.util.StringUtil;
import org.apache.hop.core.variables.Variables;
import org.apache.hop.core.xml.XmlHandler;
+import org.apache.hop.junit.rules.RestoreHopEngineEnvironment;
import org.apache.hop.metadata.api.IHopMetadataProvider;
import org.apache.hop.pipeline.PipelineMeta;
import org.apache.hop.pipeline.transform.TransformMeta;
import org.apache.hop.resource.IResourceNaming;
import org.junit.BeforeClass;
+import org.junit.ClassRule;
import org.junit.Test;
import org.w3c.dom.Node;
@@ -45,6 +47,8 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.*;
public class XmlOutputMetaTest {
+ @ClassRule public static RestoreHopEngineEnvironment env = new
RestoreHopEngineEnvironment();
+
@BeforeClass
public static void setUp() throws Exception {
if (!HopClientEnvironment.isInitialized()) {
diff --git
a/plugins/transforms/zipfile/src/test/java/org/apache/hop/pipeline/transforms/zipfile/ZipFileMetaTest.java
b/plugins/transforms/zipfile/src/test/java/org/apache/hop/pipeline/transforms/zipfile/ZipFileMetaTest.java
index 327dfb7b..8847e99 100644
---
a/plugins/transforms/zipfile/src/test/java/org/apache/hop/pipeline/transforms/zipfile/ZipFileMetaTest.java
+++
b/plugins/transforms/zipfile/src/test/java/org/apache/hop/pipeline/transforms/zipfile/ZipFileMetaTest.java
@@ -24,11 +24,13 @@ import org.apache.hop.core.exception.HopXmlException;
import org.apache.hop.core.row.IRowMeta;
import org.apache.hop.core.variables.Variables;
import org.apache.hop.core.xml.XmlHandler;
+import org.apache.hop.junit.rules.RestoreHopEngineEnvironment;
import org.apache.hop.metadata.api.IHopMetadataProvider;
import org.apache.hop.pipeline.Pipeline;
import org.apache.hop.pipeline.PipelineMeta;
import org.apache.hop.pipeline.engines.local.LocalPipelineEngine;
import org.apache.hop.pipeline.transform.TransformMeta;
+import org.junit.ClassRule;
import org.junit.Test;
import org.w3c.dom.Node;
@@ -48,7 +50,9 @@ public class ZipFileMetaTest {
private static final boolean CREATE_PARENT_FOLDER = true;
private static final boolean KEEP_SOURCE_FOLDER = true;
private static final String MOVE_TO_FOLDER_FIELD = "movetothisfolder";
-
+
+ @ClassRule public static RestoreHopEngineEnvironment env = new
RestoreHopEngineEnvironment();
+
@Test
public void testGettersSetters() {
ZipFileMeta zipFileMeta = new ZipFileMeta();
