This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0e657234cf Improved: Migrate integration tests to unit tests when
possible (OFBIZ-11067)
0e657234cf is described below
commit 0e657234cf59da498c5365760096a0c3fec63c95
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Thu Feb 22 12:47:06 2024 +0100
Improved: Migrate integration tests to unit tests when possible
(OFBIZ-11067)
According to Mathieu, this closes the Jira. As he mentioned:
The remaining classes to convert to unit test before closing this ticket
are:
FlexibleStringExpanderTests
FlexibleMapAccessorTests
---
.../{test => }/FlexibleMapAccessorTests.java | 23 +++++++------
.../{test => }/FlexibleStringExpanderTests.java | 38 +++++-----------------
framework/base/testdef/basetests.xml | 2 --
3 files changed, 22 insertions(+), 41 deletions(-)
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java
b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessorTests.java
similarity index 95%
rename from
framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java
rename to
framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessorTests.java
index 7af5bb2d97..0a0527df32 100644
---
a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java
+++
b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessorTests.java
@@ -16,7 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
-package org.apache.ofbiz.base.util.collections.test;
+package org.apache.ofbiz.base.util.collections;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import java.math.BigDecimal;
import java.util.HashMap;
@@ -25,22 +33,15 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import org.apache.ofbiz.base.lang.SourceMonitored;
-import org.apache.ofbiz.base.test.GenericTestCaseBase;
import org.apache.ofbiz.base.util.Debug;
-import org.apache.ofbiz.base.util.collections.FlexibleMapAccessor;
import org.apache.ofbiz.base.util.string.FlexibleStringExpander;
+import org.junit.Test;
-@SourceMonitored
-public class FlexibleMapAccessorTests extends GenericTestCaseBase {
+public class FlexibleMapAccessorTests {
private static final Locale LOCALE_TO_TEST = new Locale("en", "US");
private static FlexibleMapAccessor<?> fmaEmpty =
FlexibleMapAccessor.getInstance("");
private static FlexibleMapAccessor<?> fmaNull =
FlexibleMapAccessor.getInstance(null);
- public FlexibleMapAccessorTests(String name) {
- super(name);
- }
-
private static <T> void fmaTest(String label, String getText, String
fseText, T var, String value) {
fmaTest(label, getText, getText, fseText, null, var, value);
}
@@ -129,6 +130,7 @@ public class FlexibleMapAccessorTests extends
GenericTestCaseBase {
assertNotNull(label + ":toString", fma.toString());
}
+ @Test
/** These tests rely upon FlexibleStringExpander, so they should follow
the FlexibleStringExpander tests. */
public void testFlexibleMapAccessor() {
fmaEmptyTest("fmaEmpty", "");
@@ -181,6 +183,7 @@ public class FlexibleMapAccessorTests extends
GenericTestCaseBase {
}
}
+ @Test
/**
* Test verbosity and errors.
*/
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java
b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpanderTests.java
similarity index 95%
rename from
framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java
rename to
framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpanderTests.java
index a7573fdad6..d3e7dd3d65 100644
---
a/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java
+++
b/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpanderTests.java
@@ -16,7 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
-package org.apache.ofbiz.base.util.string.test;
+package org.apache.ofbiz.base.util.string;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
import java.math.BigDecimal;
import java.util.ArrayList;
@@ -28,26 +31,14 @@ import java.util.TimeZone;
import org.apache.ofbiz.base.conversion.AbstractConverter;
import org.apache.ofbiz.base.conversion.ConversionException;
-import org.apache.ofbiz.base.conversion.Converters;
-import org.apache.ofbiz.base.lang.SourceMonitored;
-import org.apache.ofbiz.base.util.Debug;
-import org.apache.ofbiz.base.util.string.FlexibleStringExpander;
-
-import junit.framework.TestCase;
+import org.junit.Test;
-@SourceMonitored
-public class FlexibleStringExpanderTests extends TestCase {
+public class FlexibleStringExpanderTests {
private static final Locale LOCALE_TO_TEST = new Locale("en", "US");
private static final Locale BAD_LOCALE = new Locale("fr");
private static final TimeZone TIME_ZONE_TO_TEST =
TimeZone.getTimeZone("PST");
private static final TimeZone BAD_TIME_ZONE = TimeZone.getTimeZone("GMT");
- private boolean wasVerbose;
-
- public FlexibleStringExpanderTests(String name) {
- super(name);
- }
-
private static void parserTest(String label, String input, boolean
checkCache, String toString) {
FlexibleStringExpander fse = FlexibleStringExpander.getInstance(input,
false);
assertEquals(label + ":toString(no-cache)", toString, fse.toString());
@@ -58,6 +49,7 @@ public class FlexibleStringExpanderTests extends TestCase {
}
}
+ @Test
/**
* Test parsing.
*/
@@ -217,20 +209,6 @@ public class FlexibleStringExpanderTests extends TestCase {
return null;
}
- @Override
- public void setUp() {
- wasVerbose = Debug.isOn(Debug.VERBOSE);
- if ("testWithVerbosity".equals(getName())) {
- Debug.set(Debug.VERBOSE, true);
- }
- Converters.registerConverter(new SpecialNumberToString());
- }
-
- @Override
- public void tearDown() {
- Debug.set(Debug.VERBOSE, wasVerbose);
- }
-
@SuppressWarnings("serial")
public static class ThrowException extends Exception {
/**
@@ -276,6 +254,7 @@ public class FlexibleStringExpanderTests extends TestCase {
}
}
+ @Test
/**
* Test with verbosity.
*/
@@ -284,6 +263,7 @@ public class FlexibleStringExpanderTests extends TestCase {
}
/**
+ @Test
* Test quietly.
*/
public void testQuietly() {
diff --git a/framework/base/testdef/basetests.xml
b/framework/base/testdef/basetests.xml
index 02e78e530d..9bbab645a2 100644
--- a/framework/base/testdef/basetests.xml
+++ b/framework/base/testdef/basetests.xml
@@ -23,8 +23,6 @@
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd";>
<test-group case-name="basetests">
<junit-test-suite
class-name="org.apache.ofbiz.base.util.UtilObjectTests"/>
- <junit-test-suite
class-name="org.apache.ofbiz.base.util.string.test.FlexibleStringExpanderTests"/>
- <junit-test-suite
class-name="org.apache.ofbiz.base.util.collections.test.FlexibleMapAccessorTests"/>
<groovy-test-suite name="simple"
location="component://base/src/test/groovy/org/apache/ofbizbase/test/SimpleTests.groovy"/>
</test-group>
</test-suite>
