You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2018/09/26 13:40:12 UTC
[42/45] wicket git commit: - wicket-arquilian / wicket-cdi-1.1 :
Enable Junit Vintage Engine to run old Testrunners - BaseWicketTester.java:
remove dependency on AssertionFailedException - global: use AssertionError
instead of AssertionFailedError - upda
- wicket-arquilian / wicket-cdi-1.1 : Enable Junit Vintage Engine to run old Testrunners
- BaseWicketTester.java: remove dependency on AssertionFailedException
- global: use AssertionError instead of AssertionFailedError
- updated Templates to use Junit 5 imports and classes
- remove opentest4j as a dependency of wicket-util again
- update cdi-unit to version 4.1.0 from 4.0.2
- Excluded Tests tagged with SLOW from surefire plugin
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4c6cb67e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4c6cb67e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4c6cb67e
Branch: refs/heads/master
Commit: 4c6cb67e5d625b58c6a1e16911103a8c11e45c87
Parents: 0465d2c
Author: renoth <jo...@gmx.de>
Authored: Sat Sep 1 12:15:17 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 16:17:37 2018 +0300
----------------------------------------------------------------------
testing/wicket-arquillian/pom.xml | 6 ++++++
.../deployment/AbstractDeploymentTest.java | 5 +++--
wicket-cdi-1.1/pom.xml | 19 +++++++++++++++----
.../wicket/util/tester/BaseWicketTester.java | 4 ++--
.../apache/wicket/util/tester/WicketTester.java | 15 ++++++---------
wicket-util/pom.xml | 6 ------
.../license/AbstractLicenseHeaderHandler.java | 17 +++++++++++------
.../license/ApacheLicenseHeaderTestCase.java | 3 +--
.../util/license/CssLicenseHeaderHandler.java | 4 ++--
.../util/license/JavaLicenseHeaderHandler.java | 5 ++---
.../license/PropertiesLicenseHeaderHandler.java | 9 ++++-----
.../license/VelocityLicenseHeaderHandler.java | 9 ++++-----
.../util/license/XmlLicenseHeaderHandler.java | 12 ++++++------
.../util/license/XmlPrologHeaderHandler.java | 4 +---
14 files changed, 63 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/testing/wicket-arquillian/pom.xml
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml
index 2190f5c..d093dff 100644
--- a/testing/wicket-arquillian/pom.xml
+++ b/testing/wicket-arquillian/pom.xml
@@ -144,6 +144,12 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- Wicket CDI integration. -->
<dependency>
<groupId>org.apache.wicket</groupId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
----------------------------------------------------------------------
diff --git a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
index d5ad762..52b9014 100644
--- a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
+++ b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java
@@ -58,8 +58,9 @@ import org.slf4j.LoggerFactory;
*
*/
@Tag(WicketTestTag.SLOW)
-public abstract class AbstractDeploymentTest {
-
+public abstract class AbstractDeploymentTest
+{
+
private static final Logger log = LoggerFactory.getLogger(AbstractDeploymentTest.class);
private static final String WEBAPP_SRC = "src/main/webapp";
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-cdi-1.1/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-cdi-1.1/pom.xml b/wicket-cdi-1.1/pom.xml
index 6860248..ead682d 100644
--- a/wicket-cdi-1.1/pom.xml
+++ b/wicket-cdi-1.1/pom.xml
@@ -66,12 +66,23 @@
<artifactId>weld-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.weld.module</groupId>
- <artifactId>weld-web</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld.module</groupId>
+ <artifactId>weld-web</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index 92686b5..313cb2d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -34,6 +34,7 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.regex.Pattern;
+
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import javax.servlet.http.Cookie;
@@ -133,7 +134,6 @@ import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
-import org.opentest4j.AssertionFailedError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -723,7 +723,7 @@ public class BaseWicketTester
{
if (redirectCount++ >= 100)
{
- throw new AssertionFailedError("Possible infinite redirect detected. Bailing out.");
+ throw new AssertionError("Possible infinite redirect detected. Bailing out.");
}
Url newUrl = Url.parse(lastResponse.getRedirectLocation(),
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
index 1b469a8..651c0ef 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
@@ -51,7 +51,6 @@ import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Objects;
-import org.opentest4j.AssertionFailedError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -284,15 +283,13 @@ public class WicketTester extends BaseWicketTester
{
if (null != getLastResponse().getHeader("Location"))
{
- throw new AssertionFailedError(
- "Location header should *not* be present when using Ajax");
+ fail("Location header should *not* be present when using Ajax");
}
String ajaxLocation = getLastResponse().getHeader("Ajax-Location");
if (null == ajaxLocation)
{
- throw new AssertionFailedError(
- "Ajax-Location header should be present when using Ajax");
+ fail("Ajax-Location header should be present when using Ajax");
}
int statusCode = getLastResponse().getStatus();
@@ -480,7 +477,7 @@ public class WicketTester extends BaseWicketTester
if (markup == null)
{
- throw new AssertionFailedError(String.format("Cannot find the markup of component: %s",
+ fail(String.format("Cannot find the markup of component: %s",
component.getPageRelativePath()));
}
@@ -600,13 +597,13 @@ public class WicketTester extends BaseWicketTester
final List<FeedbackMessage> renderedMessages = model.getObject();
if (renderedMessages == null)
{
- throw new AssertionFailedError(
+ fail(
String.format("feedback panel at path [%s] returned null messages", path));
}
if (messages.length != renderedMessages.size())
{
- throw new AssertionFailedError(String.format(
+ fail(String.format(
"you expected '%d' messages for the feedback panel [%s], but there were actually '%d'",
messages.length, path, renderedMessages.size()));
}
@@ -822,7 +819,7 @@ public class WicketTester extends BaseWicketTester
{
if (result.wasFailed())
{
- throw new AssertionFailedError(result.getMessage());
+ fail(result.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-util/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml
index 6f71806..d5777f8 100755
--- a/wicket-util/pom.xml
+++ b/wicket-util/pom.xml
@@ -44,11 +44,5 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
- <dependency>
- <groupId>org.opentest4j</groupId>
- <artifactId>opentest4j</artifactId>
- <version>RELEASE</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
index cbbc934..c6e5685 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
@@ -16,12 +16,17 @@
*/
package org.apache.wicket.util.license;
-import java.io.*;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
import java.util.List;
import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.string.Strings;
-import org.opentest4j.AssertionFailedError;
+
abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
{
@@ -76,7 +81,7 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
finally
{
@@ -86,7 +91,7 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
}
catch (IOException e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
}
@@ -110,7 +115,7 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
}
@@ -142,7 +147,7 @@ abstract class AbstractLicenseHeaderHandler implements ILicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
finally
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java b/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
index 596b2ed..d03f8ad 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
@@ -29,7 +29,6 @@ import org.apache.wicket.util.lang.Generics;
import org.apache.wicket.util.string.Strings;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.opentest4j.AssertionFailedError;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -187,7 +186,7 @@ public abstract class ApacheLicenseHeaderTestCase
}
System.out.println(failString);
- throw new AssertionFailedError(failString.toString());
+ throw new AssertionError(failString.toString());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
index 7652e10..694239b 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.wicket.util.diff.Diff;
import org.apache.wicket.util.diff.Revision;
-import org.opentest4j.AssertionFailedError;
+
class CssLicenseHeaderHandler extends AbstractLicenseHeaderHandler
@@ -56,7 +56,7 @@ class CssLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
return revision.size() == 0;
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
index d38c008..3165ebc 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
@@ -23,7 +23,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.wicket.util.string.Strings;
-import org.opentest4j.AssertionFailedError;
class JavaLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
@@ -64,13 +63,13 @@ class JavaLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
else
{
- throw new AssertionFailedError();
+ throw new AssertionError();
}
}
catch (Exception e)
{
e.printStackTrace();
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
return added;
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
index 4a0447d..3da2788 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
@@ -16,14 +16,13 @@
*/
package org.apache.wicket.util.license;
-import org.apache.wicket.util.diff.Diff;
-import org.apache.wicket.util.diff.Revision;
-import org.opentest4j.AssertionFailedError;
-
import java.io.File;
import java.util.Arrays;
import java.util.List;
+import org.apache.wicket.util.diff.Diff;
+import org.apache.wicket.util.diff.Revision;
+
class PropertiesLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
/**
@@ -55,7 +54,7 @@ class PropertiesLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
return revision.size() == 0;
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
index 2d1286b..54fd6a6 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
@@ -16,14 +16,13 @@
*/
package org.apache.wicket.util.license;
-import org.apache.wicket.util.diff.Diff;
-import org.apache.wicket.util.diff.Revision;
-import org.opentest4j.AssertionFailedError;
-
import java.io.File;
import java.util.Arrays;
import java.util.List;
+import org.apache.wicket.util.diff.Diff;
+import org.apache.wicket.util.diff.Revision;
+
class VelocityLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
/**
@@ -55,7 +54,7 @@ class VelocityLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
return revision.size() == 0;
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
index e8b1ad2..10e4988 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
@@ -16,17 +16,17 @@
*/
package org.apache.wicket.util.license;
-import org.apache.wicket.util.diff.Diff;
-import org.apache.wicket.util.diff.Revision;
-import org.apache.wicket.util.string.Strings;
-import org.opentest4j.AssertionFailedError;
-
import java.io.File;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.wicket.util.diff.Diff;
+import org.apache.wicket.util.diff.Revision;
+import org.apache.wicket.util.string.Strings;
+import org.opentest4j.AssertionFailedError;
+
class XmlLicenseHeaderHandler extends AbstractLicenseHeaderHandler
{
private final Pattern xmlHeader = Pattern.compile(
@@ -125,7 +125,7 @@ class XmlLicenseHeaderHandler extends AbstractLicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
return added;
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c6cb67e/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
index ab5a73e..73597d8 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.util.license;
-import org.opentest4j.AssertionFailedError;
-
import java.io.File;
import java.util.Arrays;
import java.util.List;
@@ -47,7 +45,7 @@ class XmlPrologHeaderHandler extends XmlLicenseHeaderHandler
}
catch (Exception e)
{
- throw new AssertionFailedError(e.getMessage());
+ throw new AssertionError(e.getMessage());
}
}