wicket git commit: WICKET-6042 improve CompoundPropertyModel usage test

[svenmeier]

Repository: wicket
Updated Branches:
  refs/heads/master ee572d0ee -> bf53ec3e9


WICKET-6042 improve CompoundPropertyModel usage test


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/bf53ec3e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/bf53ec3e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/bf53ec3e

Branch: refs/heads/master
Commit: bf53ec3e90882f4236e75ef049ba32a21f4b2015
Parents: ee572d0
Author: Sven Meier <svenme...@apache.org>
Authored: Sun Dec 6 14:17:28 2015 +0100
Committer: Sven Meier <svenme...@apache.org>
Committed: Sun Dec 6 14:17:28 2015 +0100

----------------------------------------------------------------------
 .../org/apache/wicket/markup/html/image/ExternalImageTest.java   | 2 +-
 .../apache/wicket/markup/html/image/ExternalImageTestPage.html   | 2 +-
 .../apache/wicket/markup/html/image/ExternalImageTestPage.java   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/bf53ec3e/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java
index 6c285ed..c0a77c7 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java
@@ -47,7 +47,7 @@ public class ExternalImageTest extends WicketTestCase
                Assert.assertTrue(lastResponseAsString.contains(
                        "<source wicket:id=\"externalSource\" 
srcset=\"http://wicket.apache.org/img/wicket-7-bg-1.jpg , 
http://wicket.apache.org/img/wicket-7-bg-2.jpg x2\" sizes=\"1\" 
media=\"(min-width: 650px)\"/>"));
                Assert.assertTrue(lastResponseAsString.contains(
-                       "<img wicket:id=\"compoundImage\" 
src=\"http://www.google.de/test.jpg\"/>"));
+                       "<img wicket:id=\"url\" 
src=\"http://www.google.de/test.jpg\"/>"));
        }
 
        @Test

http://git-wip-us.apache.org/repos/asf/wicket/blob/bf53ec3e/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.html
index 498daed..745b770 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.html
@@ -9,6 +9,6 @@
                        <source wicket:id="externalSource"/>
                        <img wicket:id="externalImage3"/>
                </picture>
-               <img wicket:id="compoundImage" />
+               <img wicket:id="url" />
        </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/bf53ec3e/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java
index dd0ce95..5c4a670 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java
@@ -64,8 +64,8 @@ public class ExternalImageTestPage extends WebPage
 
                ImageSrc imageSrc = new ImageSrc();
                imageSrc.setUrl("http://www.google.de/test.jpg";);
-               CompoundPropertyModel<ImageSrc> compoundPropertyModel = new 
CompoundPropertyModel<ImageSrc>(imageSrc);
-               add(new 
ExternalImage("compoundImage",compoundPropertyModel.bind("url")));
+               setDefaultModel(new CompoundPropertyModel<>(imageSrc));
+               add(new ExternalImage("url"));
        }
 
        /**