You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2020/02/02 20:43:17 UTC
[wicket] 02/02: Silenced some warnings when running tests
This is an automated email from the ASF dual-hosted git repository.
papegaaij pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 9be9b718df19a1a6d6d08b21e608a8030da25deb
Author: Emond Papegaaij <em...@topicus.nl>
AuthorDate: Sun Feb 2 21:39:52 2020 +0100
Silenced some warnings when running tests
---
wicket-core/src/test/java/org/apache/wicket/MockPageWithForm.html | 5 +++++
.../java/org/apache/wicket/markup/html/XmlDeclResponseTest.java | 3 ++-
.../apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java | 8 ++++----
.../internal/InlineEnclosureDifferentNamespaceExpectedResult.html | 3 +--
.../markup/html/internal/InlineEnclosurePageExpectedResult_1.html | 3 +--
.../markup/html/internal/InlineEnclosurePageExpectedResult_2.html | 3 +--
.../html/internal/InlineEnclosurePanelPageExpectedResult.html | 3 +--
.../apache/wicket/markup/html/internal/InlineEnclosureTest.java | 3 ++-
.../InlineEnclosureWithWicketMessagePage_invisible_expected.html | 3 +--
.../InlineEnclosureWithWicketMessagePage_visible_expected.html | 3 +--
.../test/java/org/apache/wicket/protocol/http/TestErrorPage.html | 5 +++++
.../wicket/protocol/http/servlet/ServletWebRequestTest.java | 3 ++-
.../org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java | 3 ++-
.../protocol/ws/util/tester/SendPayloadWithContextTest.java | 2 +-
.../wicket/protocol/ws/util/tester/WebSocketBehaviorTestPage.java | 2 +-
15 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/wicket-core/src/test/java/org/apache/wicket/MockPageWithForm.html b/wicket-core/src/test/java/org/apache/wicket/MockPageWithForm.html
index 80fcd49..f531031 100644
--- a/wicket-core/src/test/java/org/apache/wicket/MockPageWithForm.html
+++ b/wicket-core/src/test/java/org/apache/wicket/MockPageWithForm.html
@@ -1,3 +1,8 @@
+<html>
+<head></head>
+<body>
<form wicket:id="form">
<select wicket:id="dropdown"></select>
</form>
+</body>
+</html>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/XmlDeclResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/XmlDeclResponseTest.java
index 95442fe..dbd7e29 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/XmlDeclResponseTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/XmlDeclResponseTest.java
@@ -22,6 +22,7 @@ import org.apache.wicket.Page;
import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.markup.Markup;
import org.apache.wicket.markup.MarkupType;
+import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.jupiter.api.Test;
@@ -42,7 +43,7 @@ class XmlDeclResponseTest extends WicketTestCase
@Override
protected WebApplication newApplication()
{
- return new WebApplication()
+ return new MockApplication()
{
@Override
public Class<? extends Page> getHomePage()
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java
index 0291b43..7ad0a54 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java
@@ -19,7 +19,7 @@ package org.apache.wicket.markup.html.autolink;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.autolink.sub.LogoPanel;
-import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.util.tester.WicketTestCase;
import org.apache.wicket.util.tester.WicketTester;
import org.junit.jupiter.api.BeforeEach;
@@ -43,7 +43,7 @@ class AutoLinkInPanelsTest extends WicketTestCase
@BeforeEach
void setUp()
{
- tester = new WicketTester(new WebApplication()
+ tester = new WicketTester(new MockApplication()
{
@Override
@@ -66,13 +66,13 @@ class AutoLinkInPanelsTest extends WicketTestCase
{
tester.startPage(TestPage.class);
// tester.dumpPage();
- tester.assertContains("<img src=\"\\./wicket/resource/org.apache.wicket.markup.html.autolink.sub.LogoPanel/logo-ver-\\d+.png\"/>");
+ tester.assertContains("<img src=\"\\./wicket/resource/org.apache.wicket.markup.html.autolink.sub.LogoPanel/logo.png\"/>");
}
@Test
void imgTagWorksInPanelWithoutExtraContainer() throws Exception
{
tester.startPage(TestPage.class);
- tester.assertContains("<img src=\"\\./wicket/resource/org.apache.wicket.markup.html.autolink.sub.LogoPanel/logo2-ver-\\d+.png\"/>");
+ tester.assertContains("<img src=\"\\./wicket/resource/org.apache.wicket.markup.html.autolink.sub.LogoPanel/logo2.png\"/>");
}
}
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureDifferentNamespaceExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureDifferentNamespaceExpectedResult.html
index a472438..245f47d 100755
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureDifferentNamespaceExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureDifferentNamespaceExpectedResult.html
@@ -1,6 +1,5 @@
<html>
-<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
-</head><body>
+<body>
<!-- nested inline enclosures with separate child depths. -->
<div id="w__InlineEnclosure__11193264691"><span>Test Label 1</span>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
index 406b7a6..fc28dc4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
@@ -1,6 +1,5 @@
<html>
-<head><link rel="stylesheet" type="text/css" href="./wicket/resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
-</head><body>
+<body>
<span id="wicket__InlineEnclosure__15719789331"> <span>Test Label 1</span> </span>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_2.html
index 6fcc322..bc6e4c6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_2.html
@@ -1,6 +1,5 @@
<html>
-<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
-</head><body>
+<body>
<!-- nested inline enclosures with separate child depths. -->
<div id="wicket__InlineEnclosure__15719789021"><span>Test Label 1</span>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePanelPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePanelPageExpectedResult.html
index 65d4910..9b8cf1a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePanelPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePanelPageExpectedResult.html
@@ -1,6 +1,5 @@
<html>
-<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
-</head><body>
+<body>
<div id="wicket__InlineEnclosure_12175729931">
<div>
<div>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java
index 1e84076..82b3bc6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java
@@ -24,6 +24,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
import org.apache.wicket.markup.parser.filter.InlineEnclosureHandler;
+import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.resource.caching.NoOpResourceCachingStrategy;
import org.apache.wicket.util.tester.WicketTestCase;
@@ -143,7 +144,7 @@ class InlineEnclosureTest extends WicketTestCase
@Override
protected WebApplication newApplication()
{
- return new WebApplication()
+ return new MockApplication()
{
@Override
public Class<? extends Page> getHomePage()
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html
index 17dd172..d1317ef 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html
@@ -17,8 +17,7 @@
-->
<!DOCTYPE html>
<html>
-<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
-
+<head>
<title>Wicket 4520</title>
</head>
<body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_visible_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_visible_expected.html
index ffa14c0..e7f6a18 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_visible_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_visible_expected.html
@@ -17,8 +17,7 @@
-->
<!DOCTYPE html>
<html>
-<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
-
+<head>
<title>Wicket 4520</title>
</head>
<body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/TestErrorPage.html b/wicket-core/src/test/java/org/apache/wicket/protocol/http/TestErrorPage.html
index 85dcbfe..acd1cdc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/TestErrorPage.html
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/TestErrorPage.html
@@ -1 +1,6 @@
+<html>
+<head></head>
+<body>
<a wicket:id="link">Click me to get an error</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebRequestTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebRequestTest.java
index 5033a20..dddb203 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebRequestTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebRequestTest.java
@@ -27,6 +27,7 @@ import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.mock.MockHttpServletRequest;
import org.apache.wicket.request.Url;
@@ -118,7 +119,7 @@ class ServletWebRequestTest
@Test
void useCustomServletWebRequest()
{
- WebApplication application = new WebApplication()
+ WebApplication application = new MockApplication()
{
@Override
public Class<? extends Page> getHomePage()
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java b/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java
index 6bcf58a..d0f433f 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java
@@ -22,6 +22,7 @@ import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import org.apache.wicket.Page;
+import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.WicketFilter;
import org.apache.wicket.protocol.http.mock.MockServletContext;
@@ -50,7 +51,7 @@ public class GuiceWebApplicationFactoryTest
@Override
protected void configure()
{
- bind(WebApplication.class).toInstance(new WebApplication()
+ bind(WebApplication.class).toInstance(new MockApplication()
{
@Override
public Class<? extends Page> getHomePage()
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/SendPayloadWithContextTest.java b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/SendPayloadWithContextTest.java
index a81e8c8..f63e35f 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/SendPayloadWithContextTest.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/SendPayloadWithContextTest.java
@@ -112,7 +112,7 @@ public class SendPayloadWithContextTest
@Override
public IResourceStream getMarkupResourceStream(MarkupContainer container, Class<?> containerClass)
{
- return new StringResourceStream("<html/>");
+ return new StringResourceStream("<html><head></head><body></body></html>");
}
}
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketBehaviorTestPage.java b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketBehaviorTestPage.java
index a6a03bd..156e2c7 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketBehaviorTestPage.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketBehaviorTestPage.java
@@ -101,6 +101,6 @@ class WebSocketBehaviorTestPage extends WebPage implements IMarkupResourceStream
@Override
public IResourceStream getMarkupResourceStream(MarkupContainer container, Class<?> containerClass)
{
- return new StringResourceStream("<html/>");
+ return new StringResourceStream("<html><head></head><body></body></html>");
}
}