Repository: wicket Updated Branches: refs/heads/WICKET-6563 e49d95df2 -> bf72e2798 (forced update)
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestBehavior.java ---------------------------------------------------------------------- diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestBehavior.java b/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestBehavior.java index 04988dd..96cd2ab 100644 --- a/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestBehavior.java +++ b/wicket-guice/src/test/java/org/apache/wicket/guice/JavaxInjectTestBehavior.java @@ -16,11 +16,13 @@ */ package org.apache.wicket.guice; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import javax.inject.Inject; import org.apache.wicket.Component; import org.apache.wicket.behavior.Behavior; -import org.junit.Assert; /** * A behavior that will be use injected services @@ -40,8 +42,8 @@ public class JavaxInjectTestBehavior extends Behavior { super.bind(component); - Assert.assertNotNull(injectedFieldBlue); - Assert.assertEquals("blue", injectedFieldBlue.getString()); + assertNotNull(injectedFieldBlue); + assertEquals("blue", injectedFieldBlue.getString()); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java ---------------------------------------------------------------------- diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java b/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java index 603534b..08c8b71 100644 --- a/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java +++ b/wicket-guice/src/test/java/org/apache/wicket/guice/TestBehavior.java @@ -16,10 +16,13 @@ */ package org.apache.wicket.guice; -import com.google.inject.Inject; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import org.apache.wicket.Component; import org.apache.wicket.behavior.Behavior; -import org.junit.Assert; + +import com.google.inject.Inject; /** * A behavior that will be use injected services @@ -39,8 +42,8 @@ public class TestBehavior extends Behavior { super.bind(component); - Assert.assertNotNull(injectedFieldBlue); - Assert.assertEquals("blue", injectedFieldBlue.getString()); + assertNotNull(injectedFieldBlue); + assertEquals("blue", injectedFieldBlue.getString()); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/0b48f270/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/0b48f270/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/0b48f270/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/0b48f270/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 eddaaa7..2797d8a 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 { @@ -55,7 +55,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/0b48f270/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 e88a043..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 @@ -16,15 +16,14 @@ */ package org.apache.wicket.util.license; -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.string.Strings; + class JavaLicenseHeaderHandler extends AbstractLicenseHeaderHandler { private final Pattern javaHeaderPattern = Pattern.compile("^(.*?)package.*$", @@ -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/0b48f270/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/0b48f270/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/0b48f270/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 8287622..822cd65 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,16 @@ */ 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; + class XmlLicenseHeaderHandler extends AbstractLicenseHeaderHandler { private final Pattern xmlHeader = Pattern.compile( @@ -83,7 +82,7 @@ class XmlLicenseHeaderHandler extends AbstractLicenseHeaderHandler catch (Exception e) { e.printStackTrace(); - throw new AssertionFailedError(e.getMessage()); + throw new AssertionError(e.getMessage()); } return revision.size() == 0; @@ -126,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/0b48f270/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 3d652df..3206165 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,7 +16,7 @@ */ package org.apache.wicket.util.license; -import org.opentest4j.AssertionFailedError; + import java.io.File; import java.util.Arrays; @@ -47,7 +47,7 @@ class XmlPrologHeaderHandler extends XmlLicenseHeaderHandler } catch (Exception e) { - throw new AssertionFailedError(e.getMessage()); + throw new AssertionError(e.getMessage()); } }
