You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2011/08/08 01:31:26 UTC
svn commit: r1154800 - in /tapestry/tapestry5/trunk/tapestry-core/src/test:
app1/ java/org/apache/tapestry5/integration/app1/
java/org/apache/tapestry5/integration/app1/pages/
Author: hlship
Date: Sun Aug 7 23:31:25 2011
New Revision: 1154800
URL: http://svn.apache.org/viewvc?rev=1154800&view=rev
Log:
TAP5-1596: Update some tests that were broken by the new component id validation
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/app1/GridDemo.tml
tapestry/tapestry5/trunk/tapestry-core/src/test/app1/GridRemoveReorderDemo.tml
tapestry/tapestry5/trunk/tapestry-core/src/test/app1/InplaceGridDemo.tml
tapestry/tapestry5/trunk/tapestry-core/src/test/app1/LeanGridDemo.tml
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/GridTests.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridDemo.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridRemoveReorderDemo.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InplaceGridDemo.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/LeanGridDemo.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/app1/GridDemo.tml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/app1/GridDemo.tml?rev=1154800&r1=1154799&r2=1154800&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/app1/GridDemo.tml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/app1/GridDemo.tml Sun Aug 7 23:31:25 2011
@@ -2,7 +2,7 @@
<h1>Grid Demo</h1>
- <table t:id="grid" source="tracks" row="track">
+ <table t:type="grid" t:id="grid" source="tracks" row="track">
<t:parameter name="ratingheader">
<t:actionlink t:id="sortRating">Sort Rating</t:actionlink>
</t:parameter>
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/app1/GridRemoveReorderDemo.tml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/app1/GridRemoveReorderDemo.tml?rev=1154800&r1=1154799&r2=1154800&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/app1/GridRemoveReorderDemo.tml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/app1/GridRemoveReorderDemo.tml Sun Aug 7 23:31:25 2011
@@ -2,7 +2,7 @@
<h1>Grid Remove/Reorder Demo</h1>
- <table t:id="grid" source="tracks" row="track" remove="playCount" reorder="rating,title">
+ <table t:type="grid" source="library.tracks" row="track" remove="playCount" reorder="rating,title">
<t:parameter name="ratingcell">
<t:outputRating rating="track.rating"/>
</t:parameter>
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/app1/InplaceGridDemo.tml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/app1/InplaceGridDemo.tml?rev=1154800&r1=1154799&r2=1154800&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/app1/InplaceGridDemo.tml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/app1/InplaceGridDemo.tml Sun Aug 7 23:31:25 2011
@@ -7,7 +7,7 @@
<span id="lastupdate">${date}</span>
</p>
- <table t:id="grid" source="tracks" row="track" inplace="true">
+ <table t:type="grid" t:id="grid" source="tracks" row="track" inplace="true">
<t:parameter name="ratingheader">
<t:actionlink t:id="sortRating">Sort Rating</t:actionlink>
</t:parameter>
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/app1/LeanGridDemo.tml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/app1/LeanGridDemo.tml?rev=1154800&r1=1154799&r2=1154800&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/app1/LeanGridDemo.tml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/app1/LeanGridDemo.tml Sun Aug 7 23:31:25 2011
@@ -2,7 +2,7 @@
<h1>Lean Grid Demo</h1>
- <table t:id="grid" source="tracks" row="track" rowIndex="rowIndex" columnIndex="columnIndex" add="indexes"
+ <table t:type="grid" source="library.tracks" row="track" rowIndex="rowIndex" columnIndex="columnIndex" add="indexes"
lean="true">
<t:parameter name="ratingcell">
<t:outputRating rating="track.rating"/>
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/GridTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/GridTests.java?rev=1154800&r1=1154799&r2=1154800&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/GridTests.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/GridTests.java Sun Aug 7 23:31:25 2011
@@ -29,7 +29,7 @@ public class GridTests extends TapestryC
@Test
public void basic_grid()
{
- openLinks("Grid Demo");
+ openLinks("Grid Demo", "reset the Grid");
// "Sort Rating" via the header cell override (TAPESTRY-2081)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridDemo.java?rev=1154800&r1=1154799&r2=1154800&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridDemo.java Sun Aug 7 23:31:25 2011
@@ -1,4 +1,4 @@
-// Copyright 2007, 2008 The Apache Software Foundation
+// Copyright 2007, 2008, 2011 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,7 +14,8 @@
package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.InjectComponent;
+import org.apache.tapestry5.annotations.Property;
import org.apache.tapestry5.corelib.components.Grid;
import org.apache.tapestry5.integration.app1.data.Track;
import org.apache.tapestry5.integration.app1.services.MusicLibrary;
@@ -27,24 +28,20 @@ public class GridDemo
@Inject
private MusicLibrary library;
+ @Property
private Track track;
- @Component
+ @InjectComponent
private Grid grid;
- public Track getTrack()
- {
- return track;
- }
-
- public void setTrack(Track track)
+ public List<Track> getTracks()
{
- this.track = track;
+ return library.getTracks();
}
- public List<Track> getTracks()
+ void onActionFromReset()
{
- return library.getTracks();
+ grid.reset();
}
void onActionFromSortRating()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridRemoveReorderDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridRemoveReorderDemo.java?rev=1154800&r1=1154799&r2=1154800&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridRemoveReorderDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridRemoveReorderDemo.java Sun Aug 7 23:31:25 2011
@@ -1,4 +1,4 @@
-// Copyright 2007 The Apache Software Foundation
+// Copyright 2007, 2011 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,7 +14,20 @@
package org.apache.tapestry5.integration.app1.pages;
-public class GridRemoveReorderDemo extends GridDemo
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.integration.app1.data.Track;
+import org.apache.tapestry5.integration.app1.services.MusicLibrary;
+import org.apache.tapestry5.ioc.annotations.Inject;
+
+
+public class GridRemoveReorderDemo
{
+ @Property
+ @Inject
+ private MusicLibrary library;
+
+ @Property
+ private Track track;
+
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InplaceGridDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InplaceGridDemo.java?rev=1154800&r1=1154799&r2=1154800&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InplaceGridDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InplaceGridDemo.java Sun Aug 7 23:31:25 2011
@@ -1,4 +1,4 @@
-// Copyright 2008 The Apache Software Foundation
+// Copyright 2008, 2011 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/LeanGridDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/LeanGridDemo.java?rev=1154800&r1=1154799&r2=1154800&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/LeanGridDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/LeanGridDemo.java Sun Aug 7 23:31:25 2011
@@ -1,4 +1,4 @@
-// Copyright 2008 The Apache Software Foundation
+// Copyright 2008, 2011 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -16,10 +16,20 @@
package org.apache.tapestry5.integration.app1.pages;
import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.integration.app1.data.Track;
+import org.apache.tapestry5.integration.app1.services.MusicLibrary;
+import org.apache.tapestry5.ioc.annotations.Inject;
-public class LeanGridDemo extends GridDemo
+public class LeanGridDemo
{
@Property
+ @Inject
+ private MusicLibrary library;
+
+ @Property
+ private Track track;
+
+ @Property
private int rowIndex;
@Property