You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2008/08/05 02:44:00 UTC
svn commit: r682554 [2/2] - in /tapestry/tapestry5/trunk: src/site/apt/
src/site/apt/cookbook/ src/site/resources/cookbook/
tapestry-core/src/main/java/org/apache/tapestry5/
tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/
tapestry-core/s...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/PropertyEditorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/PropertyEditorTest.java?rev=682554&r1=682553&r2=682554&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/PropertyEditorTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/PropertyEditorTest.java Mon Aug 4 17:43:59 2008
@@ -1,4 +1,4 @@
-// Copyright 2007 The Apache Software Foundation
+// Copyright 2007, 2008 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.
@@ -15,6 +15,7 @@
package org.apache.tapestry5.corelib.components;
import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.PropertyOverrides;
import org.apache.tapestry5.beaneditor.PropertyModel;
import org.apache.tapestry5.ioc.Location;
import org.apache.tapestry5.ioc.Messages;
@@ -33,7 +34,7 @@
public void no_editor_block_available()
{
PropertyModel model = mockPropertyModel();
- ComponentResources overrides = mockComponentResources();
+ PropertyOverrides overrides = mockPropertyOverrides();
ComponentResources resources = mockComponentResources();
BeanBlockSource source = newMock(BeanBlockSource.class);
RuntimeException exception = new RuntimeException("Simulated failure.");
@@ -48,7 +49,7 @@
expect(model.getId()).andReturn(propertyId);
- expect(overrides.getBlockParameter(propertyId)).andReturn(null);
+ train_getOverrideBlock(overrides, propertyId, null);
expect(model.getDataType()).andReturn(dataType);
@@ -78,4 +79,5 @@
}
}
+
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/AdditionalIntegrationTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/AdditionalIntegrationTests.java?rev=682554&r1=682553&r2=682554&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/AdditionalIntegrationTests.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/AdditionalIntegrationTests.java Mon Aug 4 17:43:59 2008
@@ -48,8 +48,8 @@
{
start("BeanDisplay Override Demo");
- assertText("//div[@class='t-beandisplay-value no']", "Nay");
- assertText("//div[@class='t-beandisplay-value yes']", "Yea");
+ assertText("//dd[@class='no']", "Nay");
+ assertText("//dd[@class='yes']", "Yea");
}
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java?rev=682554&r1=682553&r2=682554&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java Mon Aug 4 17:43:59 2008
@@ -1838,9 +1838,9 @@
assertText("activePageName", "music/Details2");
- assertText("//div[@class='t-beandisplay-value title']", "Wake Me Up");
+ assertText("//dd[@class='title']", "Wake Me Up");
- assertText("//div[@class='t-beandisplay-value artist']", "Norah Jones");
+ assertText("//dd[@class='artist']", "Norah Jones");
}
/**
@@ -1861,7 +1861,7 @@
clickAndWait(SUBMIT);
- assertText("//div[@class='t-beandisplay-value value']", "237");
+ assertText("//dd[@class='value']", "237");
}
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AddedGridColumnsDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AddedGridColumnsDemo.java?rev=682554&r1=682553&r2=682554&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AddedGridColumnsDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AddedGridColumnsDemo.java Mon Aug 4 17:43:59 2008
@@ -14,12 +14,12 @@
package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.annotations.Component;
import org.apache.tapestry5.beaneditor.BeanModel;
import org.apache.tapestry5.corelib.components.Grid;
import org.apache.tapestry5.integration.app1.data.Track;
import org.apache.tapestry5.integration.app1.services.MusicLibrary;
+import org.apache.tapestry5.ioc.Messages;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.services.BeanModelSource;
@@ -27,7 +27,7 @@
public class AddedGridColumnsDemo
{
- @Component(parameters = { "source=tracks", "row=track", "model=model" })
+ @Component(parameters = {"source=tracks", "row=track", "model=model"})
private Grid grid;
@Inject
@@ -41,10 +41,10 @@
private final BeanModel model;
@Inject
- private ComponentResources resources;
+ private Messages messages;
{
- model = source.create(Track.class, true, resources);
+ model = source.create(Track.class, true, messages);
model.exclude("album", "artist", "genre", "playcount", "rating");
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SimpleTrackGridDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SimpleTrackGridDemo.java?rev=682554&r1=682553&r2=682554&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SimpleTrackGridDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SimpleTrackGridDemo.java Mon Aug 4 17:43:59 2008
@@ -1,4 +1,4 @@
-// Copyright 2007 The Apache Software Foundation
+// Copyright 2007, 2008 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,11 +14,11 @@
package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.beaneditor.BeanModel;
import org.apache.tapestry5.integration.app1.data.SimpleTrack;
import org.apache.tapestry5.integration.app1.data.Track;
import org.apache.tapestry5.integration.app1.services.MusicLibrary;
+import org.apache.tapestry5.ioc.Messages;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.services.BeanModelSource;
@@ -33,7 +33,7 @@
private BeanModelSource beanModelSource;
@Inject
- private ComponentResources resources;
+ private Messages messages;
private SimpleTrack track;
@@ -54,6 +54,6 @@
public BeanModel getSimpleTrackModel()
{
- return beanModelSource.create(SimpleTrack.class, false, resources);
+ return beanModelSource.create(SimpleTrack.class, false, messages);
}
}
Added: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/PropertyOverridesImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/PropertyOverridesImplTest.java?rev=682554&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/PropertyOverridesImplTest.java (added)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/PropertyOverridesImplTest.java Mon Aug 4 17:43:59 2008
@@ -0,0 +1,68 @@
+// Copyright 2008 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.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.internal;
+
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.PropertyOverrides;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Messages;
+import org.testng.annotations.Test;
+
+public class PropertyOverridesImplTest extends InternalBaseTestCase
+{
+ @Test
+ public void block_found()
+ {
+ Messages messages = mockMessages();
+ ComponentResources resources = mockInternalComponentResources();
+ Block block = mockBlock();
+
+ String name = "alfred";
+
+ train_getContainerMessages(resources, messages);
+
+ train_getBlockParameter(resources, name, block);
+
+ replay();
+
+ PropertyOverrides po = new PropertyOverridesImpl(resources);
+
+ assertSame(po.getOverrideBlock(name), block);
+
+ verify();
+ }
+
+ @Test
+ public void block_not_found()
+ {
+ Messages messages = mockMessages();
+ ComponentResources resources = mockInternalComponentResources();
+
+ String name = "alfred";
+
+ train_getContainerMessages(resources, messages);
+
+ train_getBlockParameter(resources, name, null);
+
+ replay();
+
+ PropertyOverrides po = new PropertyOverridesImpl(resources);
+
+ assertNull(po.getOverrideBlock(name));
+
+ verify();
+ }
+}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/grid/CollectionGridDataSourceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/grid/CollectionGridDataSourceTest.java?rev=682554&r1=682553&r2=682554&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/grid/CollectionGridDataSourceTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/grid/CollectionGridDataSourceTest.java Mon Aug 4 17:43:59 2008
@@ -14,7 +14,6 @@
package org.apache.tapestry5.internal.grid;
-import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.beaneditor.BeanModel;
import org.apache.tapestry5.beaneditor.PropertyModel;
import org.apache.tapestry5.grid.ColumnSort;
@@ -56,15 +55,13 @@
{
BeanModelSource source = getService(BeanModelSource.class);
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- model = source.create(Datum.class, false, resources);
+ model = source.create(Datum.class, false, messages);
verify();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BeanModelSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BeanModelSourceImplTest.java?rev=682554&r1=682553&r2=682554&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BeanModelSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BeanModelSourceImplTest.java Mon Aug 4 17:43:59 2008
@@ -14,7 +14,6 @@
package org.apache.tapestry5.internal.services;
-import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.PropertyConduit;
import org.apache.tapestry5.beaneditor.BeanModel;
import org.apache.tapestry5.beaneditor.PropertyModel;
@@ -50,15 +49,13 @@
@Test
public void default_model_for_bean()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, messages);
assertSame(model.getBeanType(), SimpleBean.class);
@@ -107,15 +104,13 @@
@Test
public void include_properties()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, messages);
assertSame(model.getBeanType(), SimpleBean.class);
@@ -131,13 +126,11 @@
@Test
public void add_before()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
PropertyConduit conduit = mockPropertyConduit();
Class propertyType = String.class;
- train_getMessages(resources, messages);
stub_contains(messages, false);
expect(conduit.getPropertyType()).andReturn(propertyType).atLeastOnce();
@@ -145,7 +138,7 @@
replay();
- BeanModel model = source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, messages);
assertEquals(model.getPropertyNames(), Arrays.asList("firstName", "lastName", "age"));
@@ -168,15 +161,13 @@
@Test
public void new_instance()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel<SimpleBean> model = source.create(SimpleBean.class, true, resources);
+ BeanModel<SimpleBean> model = source.create(SimpleBean.class, true, messages);
SimpleBean s1 = model.newInstance();
@@ -193,15 +184,13 @@
@Test
public void add_before_using_default_conduit()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, messages);
model.exclude("firstname");
@@ -222,13 +211,11 @@
@Test
public void add_after()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
PropertyConduit conduit = mockPropertyConduit();
Class propertyType = String.class;
- train_getMessages(resources, messages);
stub_contains(messages, false);
expect(conduit.getPropertyType()).andReturn(propertyType).atLeastOnce();
@@ -237,7 +224,7 @@
replay();
- BeanModel model = source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, messages);
assertEquals(model.getPropertyNames(), Arrays.asList("firstName", "lastName", "age"));
@@ -255,19 +242,17 @@
@Test
public void filtering_out_read_only_properties()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(ReadOnlyBean.class, true, resources);
+ BeanModel model = source.create(ReadOnlyBean.class, true, messages);
assertEquals(model.getPropertyNames(), Arrays.asList("value"));
- model = source.create(ReadOnlyBean.class, false, resources);
+ model = source.create(ReadOnlyBean.class, false, messages);
assertEquals(model.getPropertyNames(), Arrays.asList("value", "readOnly"));
@@ -277,15 +262,13 @@
@Test
public void non_text_property()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(EnumBean.class, true, resources);
+ BeanModel model = source.create(EnumBean.class, true, messages);
assertEquals(model.getPropertyNames(), Arrays.asList("token"));
@@ -297,15 +280,13 @@
@Test
public void add_duplicate_property_name_is_failure()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, messages);
try
{
@@ -324,15 +305,13 @@
@Test
public void unknown_property_name()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, messages);
try
{
@@ -351,15 +330,13 @@
@Test
public void unknown_property_id()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, messages);
model.add("shrub.foo()", null);
@@ -381,15 +358,13 @@
@Test
public void get_added_property_by_name()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, messages);
PropertyModel pm = model.add("shrub.foo()", null);
@@ -401,15 +376,13 @@
@Test
public void get_added_property_by_id()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, messages);
PropertyModel pm = model.add("shrub.foo()", null);
@@ -422,15 +395,13 @@
@Test
public void order_via_annotation()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(StoogeBean.class, true, resources);
+ BeanModel model = source.create(StoogeBean.class, true, messages);
assertEquals(model.getPropertyNames(), Arrays.asList("larry", "moe", "shemp", "curly"));
@@ -440,15 +411,13 @@
@Test
public void edit_property_label()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(SimpleBean.class, true, resources).get("age").label("Decrepitude").model();
+ BeanModel model = source.create(SimpleBean.class, true, messages).get("age").label("Decrepitude").model();
assertEquals(model.get("age").getLabel(), "Decrepitude");
@@ -458,10 +427,8 @@
@Test
public void label_from_component_messages()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
train_contains(messages, "age-label", true);
@@ -469,7 +436,7 @@
replay();
- BeanModel model = source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, messages);
assertEquals(model.get("age").getLabel(), "Decrepitude");
@@ -479,15 +446,13 @@
@Test
public void array_type_bean()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(StringArrayBean.class, true, resources);
+ BeanModel model = source.create(StringArrayBean.class, true, messages);
// There's not editor for string arrays yet, so it won't show up normally.
@@ -495,7 +460,7 @@
assertSame(propertyModel.getPropertyType(), String[].class);
- String[] value = { "foo", "bar" };
+ String[] value = {"foo", "bar"};
StringArrayBean bean = new StringArrayBean();
@@ -513,10 +478,8 @@
@Test
public void composite_bean()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
train_contains(messages, "simpleage-label", true);
@@ -524,7 +487,7 @@
replay();
- BeanModel model = source.create(CompositeBean.class, true, resources);
+ BeanModel model = source.create(CompositeBean.class, true, messages);
// No editor for CompositeBean, so this will be empty.
@@ -557,15 +520,13 @@
@Test
public void default_properties_exclude_write_only()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(WriteOnlyBean.class, false, resources);
+ BeanModel model = source.create(WriteOnlyBean.class, false, messages);
assertEquals(model.getPropertyNames(), Arrays.asList("readOnly", "readWrite"));
@@ -575,15 +536,13 @@
@Test
public void add_synthetic_property()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, messages);
PropertyModel property = model.add("placeholder", null);
@@ -597,15 +556,13 @@
@Test
public void exclude_property()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, messages);
assertSame(model.exclude("age"), model);
@@ -617,15 +574,13 @@
@Test
public void exclude_unknown_property_is_noop()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, messages);
assertSame(model.exclude("frobozz"), model);
@@ -637,15 +592,13 @@
@Test
public void nonvisual_properties_are_excluded()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(NonVisualBean.class, true, resources);
+ BeanModel model = source.create(NonVisualBean.class, true, messages);
assertEquals(model.getPropertyNames(), Arrays.asList("name"));
@@ -655,15 +608,13 @@
@Test
public void reorder()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(SimpleBean.class, true, resources);
+ BeanModel model = source.create(SimpleBean.class, true, messages);
assertSame(model.getBeanType(), SimpleBean.class);
@@ -685,15 +636,13 @@
@Test
public void reoder_from_annotation()
{
- ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- train_getMessages(resources, messages);
stub_contains(messages, false);
replay();
- BeanModel model = source.create(PropertyOrderBean.class, true, resources);
+ BeanModel model = source.create(PropertyOrderBean.class, true, messages);
assertEquals(model.getPropertyNames(), Arrays.asList("third", "first", "second"));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResponseRendererImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResponseRendererImplTest.java?rev=682554&r1=682553&r2=682554&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResponseRendererImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResponseRendererImplTest.java Mon Aug 4 17:43:59 2008
@@ -20,6 +20,7 @@
import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.apache.tapestry5.runtime.Component;
import org.apache.tapestry5.services.Response;
+import org.apache.tapestry5.services.ResponseRenderer;
import org.testng.annotations.Test;
public class ResponseRendererImplTest extends InternalBaseTestCase