[GitHub] wicket issue #284: Adds missing @Override annotations

[try0]

Github user try0 commented on the issue:

https://github.com/apache/wicket/pull/284
  
Hi @klopfdreh
Thank you for merging this PR.


---

[GitHub] wicket issue #284: Adds missing @Override annotations

[klopfdreh]

Github user klopfdreh commented on the issue:

https://github.com/apache/wicket/pull/284
  
This PR has been merged.

Thanks a lot for the changes!


---

[GitHub] wicket pull request #284: Adds missing @Override annotations

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/wicket/pull/284


---

[GitHub] wicket issue #285: Improve some logging statements

[klopfdreh]

Github user klopfdreh commented on the issue:

https://github.com/apache/wicket/pull/285
  
This PR has been merged and can be closed.

Thanks a lot for the changes!


---

[GitHub] wicket pull request #285: Improve some logging statements

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/wicket/pull/285


---

[GitHub] wicket pull request #287: Considering upgrading to Junit5

[renoth]

Github user renoth commented on a diff in the pull request:

https://github.com/apache/wicket/pull/287#discussion_r206494911
  
--- Diff: 
wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java ---
@@ -54,14 +38,24 @@
 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;
 
+import javax.servlet.ServletContext;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+
+import static org.junit.jupiter.api.Assertions.*;
--- End diff --

Sorry, i will try to properly adjust the autoformatter


---

[GitHub] wicket pull request #287: Considering upgrading to Junit5

[solomax]

Github user solomax commented on a diff in the pull request:

https://github.com/apache/wicket/pull/287#discussion_r206493340
  
--- Diff: 
wicket-util/src/test/java/org/apache/wicket/util/collections/IntHashMapTest.java
 ---
@@ -48,9 +46,9 @@ public void serialize() throws IOException, 
ClassNotFoundException
ByteArrayInputStream bais = new 
ByteArrayInputStream(serialized);
ObjectInputStream ois = new ObjectInputStream(bais);
IntHashMap deserialized = (IntHashMap) 
ois.readObject();
-   assertThat(deserialized, is(notNullValue()));
-   assertThat(deserialized.get(1), is(equalTo("one")));
-   assertThat(deserialized.get(2), is(equalTo("two")));
+   assertNotNull(deserialized);
+   assertEquals(deserialized.get(1), "one");
--- End diff --

Is this correct parameter order?


---

[GitHub] wicket pull request #287: Considering upgrading to Junit5

[solomax]

Github user solomax commented on a diff in the pull request:

https://github.com/apache/wicket/pull/287#discussion_r206492111
  
--- Diff: 
wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java ---
@@ -54,14 +38,24 @@
 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;
 
+import javax.servlet.ServletContext;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+
+import static org.junit.jupiter.api.Assertions.*;
--- End diff --

Whild card imports should be expanded

Lot's of re-formatting here :( hard to get the changes 


---

[GitHub] wicket pull request #287: Considering upgrading to Junit5

[solomax]

Github user solomax commented on a diff in the pull request:

https://github.com/apache/wicket/pull/287#discussion_r206493069
  
--- Diff: 
wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
 ---
@@ -16,23 +16,18 @@
  */
 package org.apache.wicket.util.markup.xhtml;
 
+import org.junit.jupiter.api.Test;
+import org.xml.sax.*;
--- End diff --

Another wild-card import


---

[GitHub] wicket pull request #287: Considering upgrading to Junit5

[renoth]

GitHub user renoth opened a pull request:

https://github.com/apache/wicket/pull/287

Considering upgrading to Junit5

Proof of concept of the upgrade to Junit5:

Thanks for the quick reply, i supplied the changes to WicketTester to 
remove the junit4 dependencies, i think TagTester and Formtester also have 
junit4 dependencies, ideally Junit would be removed as a dependency altogether 
here and some more light-weight assertion framework could be used, maybe 
assertj or hamcrest.

 i also did the migration to Junit5 in the wicket-util module to show how 
the testcode would change. i commented out some tedious refactoring classes, 
the remaining tests should run.

As for the pom.xml changes i am not sure if these are correct (especially 
in wicket-util)

The removal of Junit as a dependency to WicketTester could also be 
considered if it is acceptable to jave AssertJ or Hamcrest  or another 
validation library as dependency.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/renoth/wicket master

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/wicket/pull/287.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #287


commit daeab2145d710fe090d6cf419f3859d71f016f0b
Author: renoth 
Date:   2018-07-31T10:32:49Z

- upgrade junit4 with junit5 in wicket-util
- replace Junit4 Methods in WicketTester.java
- remove junit 4 dependencies in pom.xml

commit 4bc8b6fa79c6ca3ed6d4463340f15f2b22abeed4
Author: renoth 
Date:   2018-07-31T10:45:28Z

removed import, added some imports

commit 4939c5b3d502c68d1c0bd42f742a071fb22f7580
Author: renoth 
Date:   2018-07-31T10:46:57Z

commented out some tedious refactorings




---