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 2014/08/07 16:18:48 UTC
git commit: WICKET-4941 Component.initModel() does not cause parent
models to be initialized
Repository: wicket
Updated Branches:
refs/heads/wicket-6.x 7b0d8ea0c -> 51094d1ef
WICKET-4941 Component.initModel() does not cause parent models to be initialized
Fix the test as explained at http://markmail.org/message/mxyja6rutrghwo6v
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/51094d1e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/51094d1e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/51094d1e
Branch: refs/heads/wicket-6.x
Commit: 51094d1ef5193761378cb8e2f6690b07fa0753cd
Parents: 7b0d8ea
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Aug 7 16:17:58 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Aug 7 16:17:58 2014 +0200
----------------------------------------------------------------------
.../org/apache/wicket/model/CompoundPropertyModelTest.java | 8 --------
.../wicket/model/CompoundPropertyModelTwoLevelsDeepPage.html | 2 +-
.../wicket/model/CompoundPropertyModelTwoLevelsDeepPage.java | 2 +-
3 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/51094d1e/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java
index 5f0ffac..31184d5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java
@@ -17,7 +17,6 @@
package org.apache.wicket.model;
import org.apache.wicket.WicketTestCase;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -26,13 +25,6 @@ import org.junit.Test;
public class CompoundPropertyModelTest extends WicketTestCase
{
@Test
- public void dummy()
- {
- // dummy test to keep maven-surefire-plugin happy that there are some non-ignored tests in this class
- }
-
- @Test
- @Ignore
public void twoLevelsDeepHierarchy()
{
tester.startPage(CompoundPropertyModelTwoLevelsDeepPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/51094d1e/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.html b/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.html
index cc4fcd9..933febe 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.html
+++ b/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.html
@@ -8,7 +8,7 @@
<div wicket:id="person">
<span wicket:id="name">[name]</span>
<div wicket:id="address">
- <span wicket:id="street1">[street1]</span>
+ <span wicket:id="address.street1">[street1]</span>
</div>
</div>
</body>
http://git-wip-us.apache.org/repos/asf/wicket/blob/51094d1e/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.java b/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.java
index 3e42f21..8b993e7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.java
@@ -38,7 +38,7 @@ public class CompoundPropertyModelTwoLevelsDeepPage extends WebPage
WebMarkupContainer addressContainer = new WebMarkupContainer("address");
personContainer.add(addressContainer);
- addressContainer.add(new Label("street1"));
+ addressContainer.add(new Label("address.street1"));
}
public static class Person implements Serializable