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 be49829 Improved: Update build.gradle to the latest dependencies (OFBIZ-11603) be49829 is described below commit be498295a5cd66b6b1a90c3835188cb2788993c9 Author: Jacques Le Roux <[hidden email]> AuthorDate: Mon Jul 27 16:14:51 2020 +0200 Improved: Update build.gradle to the latest dependencies (OFBIZ-11603) Fixes some new warnings coming from JUnit 4.13, a step ahead to JUnit 5. I left 2 complicated ExpectedException warnings. Change will be needed for JUnit 5. https://www.luxoft-training.com/news/migrating-from-junit-4-to-junit-5-replacing-rules-with-the-extension-model-part-1/ --- build.gradle | 2 +- .../ofbiz/base/collections/MultivaluedMapContextAdapterTests.java | 2 +- .../org/apache/ofbiz/base/collections/MultivaluedMapContextTests.java | 2 +- .../base/src/test/java/org/apache/ofbiz/base/util/UtilHttpTest.java | 2 +- .../base/src/test/java/org/apache/ofbiz/base/util/UtilObjectTests.java | 2 +- .../java/org/apache/ofbiz/base/util/collections/MapContextTest.java | 2 +- .../src/test/java/org/apache/ofbiz/common/GetLocaleListTests.java | 2 +- .../test/java/org/apache/ofbiz/base/start/OfbizStartupUnitTests.java | 2 +- .../webapp/src/test/java/org/apache/ofbiz/webapp/WebAppCacheTest.java | 2 +- .../test/java/org/apache/ofbiz/webapp/control/RequestHandlerTests.java | 2 +- .../src/test/java/org/apache/ofbiz/widget/model/ModelFormFieldTest.java | 2 +- .../org/apache/ofbiz/widget/renderer/macro/MacroFormRendererTest.java | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index bcdedf2..cfbd603 100644 --- a/build.gradle +++ b/build.gradle @@ -287,7 +287,7 @@ checkstyle { // the sum of errors found last time it was changed after using the // ‘checkstyle’ tool present in the framework and in the official // plugins. - tasks.checkstyleMain.maxErrors = 15022 + tasks.checkstyleMain.maxErrors = 15021 // Currently there are a lot of errors so we need to temporarily // hide them to avoid polluting the terminal output. showViolations = false diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextAdapterTests.java b/framework/base/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextAdapterTests.java index 98d6a5b..786db2f 100644 --- a/framework/base/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextAdapterTests.java +++ b/framework/base/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextAdapterTests.java @@ -21,7 +21,7 @@ package org.apache.ofbiz.base.collections; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import java.util.HashMap; diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextTests.java b/framework/base/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextTests.java index d54777a..43581cf 100644 --- a/framework/base/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextTests.java +++ b/framework/base/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextTests.java @@ -21,7 +21,7 @@ package org.apache.ofbiz.base.collections; import static org.hamcrest.Matchers.contains; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import org.apache.ofbiz.base.util.collections.MultivaluedMapContext; import org.junit.Before; diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHttpTest.java b/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHttpTest.java index 269a2dc..8ef5e30 100644 --- a/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHttpTest.java +++ b/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHttpTest.java @@ -28,7 +28,7 @@ import static org.hamcrest.Matchers.hasEntry; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; import java.sql.Timestamp; diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilObjectTests.java b/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilObjectTests.java index b2e0992..cddff9d 100644 --- a/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilObjectTests.java +++ b/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilObjectTests.java @@ -26,7 +26,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/util/collections/MapContextTest.java b/framework/base/src/test/java/org/apache/ofbiz/base/util/collections/MapContextTest.java index 74ad57b..491831a 100644 --- a/framework/base/src/test/java/org/apache/ofbiz/base/util/collections/MapContextTest.java +++ b/framework/base/src/test/java/org/apache/ofbiz/base/util/collections/MapContextTest.java @@ -19,7 +19,7 @@ package org.apache.ofbiz.base.util.collections; import static org.hamcrest.Matchers.contains; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import java.util.Arrays; import java.util.Collections; diff --git a/framework/common/src/test/java/org/apache/ofbiz/common/GetLocaleListTests.java b/framework/common/src/test/java/org/apache/ofbiz/common/GetLocaleListTests.java index 1d9ec97..86ee64a 100644 --- a/framework/common/src/test/java/org/apache/ofbiz/common/GetLocaleListTests.java +++ b/framework/common/src/test/java/org/apache/ofbiz/common/GetLocaleListTests.java @@ -23,7 +23,7 @@ import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.hasItems; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import java.util.HashMap; import java.util.HashSet; diff --git a/framework/start/src/test/java/org/apache/ofbiz/base/start/OfbizStartupUnitTests.java b/framework/start/src/test/java/org/apache/ofbiz/base/start/OfbizStartupUnitTests.java index 68cf869..0371428 100644 --- a/framework/start/src/test/java/org/apache/ofbiz/base/start/OfbizStartupUnitTests.java +++ b/framework/start/src/test/java/org/apache/ofbiz/base/start/OfbizStartupUnitTests.java @@ -20,7 +20,7 @@ package org.apache.ofbiz.base.start; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import java.util.List; diff --git a/framework/webapp/src/test/java/org/apache/ofbiz/webapp/WebAppCacheTest.java b/framework/webapp/src/test/java/org/apache/ofbiz/webapp/WebAppCacheTest.java index b74ee70..3961e3e 100644 --- a/framework/webapp/src/test/java/org/apache/ofbiz/webapp/WebAppCacheTest.java +++ b/framework/webapp/src/test/java/org/apache/ofbiz/webapp/WebAppCacheTest.java @@ -23,7 +23,7 @@ import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import java.util.ArrayList; diff --git a/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/RequestHandlerTests.java b/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/RequestHandlerTests.java index 53d760d..7ef9f8f 100644 --- a/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/RequestHandlerTests.java +++ b/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/RequestHandlerTests.java @@ -23,7 +23,7 @@ import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; diff --git a/framework/widget/src/test/java/org/apache/ofbiz/widget/model/ModelFormFieldTest.java b/framework/widget/src/test/java/org/apache/ofbiz/widget/model/ModelFormFieldTest.java index 1d4bd79..af69959 100644 --- a/framework/widget/src/test/java/org/apache/ofbiz/widget/model/ModelFormFieldTest.java +++ b/framework/widget/src/test/java/org/apache/ofbiz/widget/model/ModelFormFieldTest.java @@ -21,7 +21,7 @@ package org.apache.ofbiz.widget.model; import static org.apache.ofbiz.widget.model.ModelFormField.from; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; import java.util.Arrays; diff --git a/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRendererTest.java b/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRendererTest.java index 3e6f8de..3337167 100644 --- a/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRendererTest.java +++ b/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRendererTest.java @@ -61,7 +61,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.startsWith; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class MacroFormRendererTest { |
Free forum by Nabble | Edit this page |