Added: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/corelib/components/SelectTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/corelib/components/SelectTest.java?view=auto&rev=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/corelib/components/SelectTest.java (added) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/corelib/components/SelectTest.java Sun Jan 7 15:47:29 2007 @@ -0,0 +1,221 @@ +// Copyright 2007 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.tapestry.corelib.components; + +import java.io.BufferedInputStream; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import org.apache.tapestry.MarkupWriter; +import org.apache.tapestry.OptionGroupModel; +import org.apache.tapestry.OptionModel; +import org.apache.tapestry.SelectModel; +import org.apache.tapestry.dom.XMLMarkupModel; +import org.apache.tapestry.internal.OptionGroupModelImpl; +import org.apache.tapestry.internal.OptionModelImpl; +import org.apache.tapestry.internal.SelectModelImpl; +import org.apache.tapestry.internal.TapestryUtils; +import org.apache.tapestry.internal.services.MarkupWriterImpl; +import org.apache.tapestry.internal.test.InternalBaseTestCase; +import org.apache.tapestry.ioc.internal.util.CollectionFactory; +import org.testng.annotations.Test; + +/** + * Mostly, this is about how the Select component renders its [EMAIL PROTECTED] SelectModel}. The real nuts + * and bolts are tested in the integration tests. + */ +public class SelectTest extends InternalBaseTestCase +{ + @Test + public void empty_model() + { + Select select = new Select(); + + select.setModel(new SelectModelImpl(null, null)); + + select.options(null); + } + + private String read(String file) throws Exception + { + InputStream is = getClass().getResourceAsStream(file); + Reader reader = new InputStreamReader(new BufferedInputStream(is)); + + StringBuilder builder = new StringBuilder(); + char[] buffer = new char[1000]; + + while (true) + { + int length = reader.read(buffer); + + if (length < 0) + break; + + builder.append(buffer, 0, length); + } + + reader.close(); + + return builder.toString(); + } + + @Test + public void just_options() throws Exception + { + List<OptionModel> options = TapestryUtils + .toOptionModels("fred=Fred Flintstone,barney=Barney Rubble"); + + Select select = new Select(); + + select.setModel(new SelectModelImpl(null, options)); + select.setValue("barney"); + + MarkupWriter writer = new MarkupWriterImpl(new XMLMarkupModel(), null); + + writer.element("select"); + + select.options(writer); + + writer.end(); + + assertEquals(writer.toString(), read("just_options.html")); + } + + @Test + public void option_attributes() throws Exception + { + // Extra cast needed for Sun compiler, not Eclipse compiler. + + List<OptionModel> options = Arrays.asList((OptionModel) new OptionModelImpl("Fred", false, + "fred", "class", "pixie")); + + Select select = new Select(); + + select.setModel(new SelectModelImpl(null, options)); + select.setValue("barney"); + + MarkupWriter writer = new MarkupWriterImpl(new XMLMarkupModel(), null); + + writer.element("select"); + + select.options(writer); + + writer.end(); + + assertEquals(writer.toString(), read("option_attributes.html")); + } + + @Test + public void disabled_option() throws Exception + { + // Extra cast needed for Sun compiler, not Eclipse compiler. + + List<OptionModel> options = CollectionFactory.newList((OptionModel) new OptionModelImpl( + "Fred", true, "fred", "class", "pixie")); + + Select select = new Select(); + + select.setModel(new SelectModelImpl(null, options)); + select.setValue("barney"); + + MarkupWriter writer = new MarkupWriterImpl(new XMLMarkupModel(), null); + + writer.element("select"); + + select.options(writer); + + writer.end(); + + assertEquals(writer.toString(), read("disabled_option.html")); + + } + + @Test + public void option_groups() throws Exception + { + OptionGroupModel husbands = new OptionGroupModelImpl("Husbands", false, TapestryUtils + .toOptionModels("Fred,Barney")); + OptionGroupModel wives = new OptionGroupModelImpl("Wives", true, TapestryUtils + .toOptionModels("Wilma,Betty")); + List<OptionGroupModel> groupModels = CollectionFactory.newList(husbands, wives); + + Select select = new Select(); + + select.setModel(new SelectModelImpl(groupModels, null)); + select.setValue("Fred"); + + MarkupWriter writer = new MarkupWriterImpl(new XMLMarkupModel(), null); + + writer.element("select"); + + select.options(writer); + + writer.end(); + + assertEquals(writer.toString(), read("option_groups.html")); + } + + @Test + public void option_groups_precede_ungroup_options() throws Exception + { + OptionGroupModel husbands = new OptionGroupModelImpl("Husbands", false, TapestryUtils + .toOptionModels("Fred,Barney")); + + Select select = new Select(); + + select.setModel(new SelectModelImpl(Collections.singletonList(husbands), TapestryUtils + .toOptionModels("Wilma,Betty"))); + select.setValue("Fred"); + + MarkupWriter writer = new MarkupWriterImpl(new XMLMarkupModel(), null); + + writer.element("select"); + + select.options(writer); + + writer.end(); + + assertEquals(writer.toString(), read("option_groups_precede_ungroup_options.html")); + } + + @Test + public void option_group_attributes() throws Exception + { + Map<String, String> attributes = Collections.singletonMap("class", "pixie"); + + OptionGroupModel husbands = new OptionGroupModelImpl("Husbands", false, TapestryUtils + .toOptionModels("Fred,Barney"), attributes); + + Select select = new Select(); + + select.setModel(new SelectModelImpl(Collections.singletonList(husbands), null)); + select.setValue("Fred"); + + MarkupWriter writer = new MarkupWriterImpl(new XMLMarkupModel(), null); + + writer.element("select"); + + select.options(writer); + + writer.end(); + + assertEquals(writer.toString(), read("option_group_attributes.html")); + } +}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/IntegrationTests.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/IntegrationTests.java?view=diff&rev=493880&r1=493879&r2=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/IntegrationTests.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/IntegrationTests.java Sun Jan 7 15:47:29 2007 @@ -314,27 +314,31 @@ assertText("//label[1]", "Disabled"); assertText("//label[2]", "Email"); assertText("//label[3]", "Incident Message"); - assertText("//label[4]", "Urgent Processing Requested"); + assertText("//label[4]", "Operating System"); + assertText("//label[5]", "Urgent Processing Requested"); assertValue("email", ""); assertValue("message", ""); - assertValue("urgent", "off"); + assertValue("operatingSystem", "osx"); + assertValue("urgent", "on"); _selenium.type("email", "[EMAIL PROTECTED]"); _selenium.type("message", "Message for you, sir!"); + _selenium.select("operatingSystem", "Windows NT"); _selenium.click("urgent"); clickAndWait("//[EMAIL PROTECTED]'submit']"); assertValue("email", "[EMAIL PROTECTED]"); assertValue("message", "Message for you, sir!"); - assertValue("urgent", "on"); + assertValue("urgent", "off"); // Tried to use "email:" and "exact:email:" but Selenium 0.8.1 doesn't seem to accept that. assertTextPresent("[EMAIL PROTECTED]"); assertTextPresent("[Message for you, sir!]"); - assertTextPresent("[true]"); + assertTextPresent("[false]"); + assertTextPresent("[winnt]"); // Haven't figured out how to get selenium to check that fields are disabled. } Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/data/IncidentData.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/data/IncidentData.java?view=diff&rev=493880&r1=493879&r2=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/data/IncidentData.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/data/IncidentData.java Sun Jan 7 15:47:29 2007 @@ -26,6 +26,8 @@ private boolean _urgent; + private String _operatingSystem; + public String getEmail() { return _email; @@ -54,6 +56,16 @@ public void setUrgent(boolean urgent) { _urgent = urgent; + } + + public String getOperatingSystem() + { + return _operatingSystem; + } + + public void setOperatingSystem(String os) + { + _operatingSystem = os; } } Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleForm.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleForm.java?view=diff&rev=493880&r1=493879&r2=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleForm.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleForm.java Sun Jan 7 15:47:29 2007 @@ -45,6 +45,10 @@ void onPrepare() { if (_incident == null) + { _incident = new IncidentData(); + _incident.setUrgent(true); + _incident.setOperatingSystem("osx"); + } } } Added: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/OptionGroupModelImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/OptionGroupModelImplTest.java?view=auto&rev=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/OptionGroupModelImplTest.java (added) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/OptionGroupModelImplTest.java Sun Jan 7 15:47:29 2007 @@ -0,0 +1,66 @@ +// Copyright 2007 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.tapestry.internal; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import org.apache.tapestry.OptionGroupModel; +import org.apache.tapestry.OptionModel; +import org.testng.Assert; +import org.testng.annotations.Test; + +public class OptionGroupModelImplTest extends Assert +{ + @Test + public void basics() + { + List<OptionModel> options = Collections.emptyList(); + + OptionGroupModel group = new OptionGroupModelImpl("Label", true, options); + + assertEquals(group.toString(), "OptionGroupModel[Label]"); + assertTrue(group.isDisabled()); + assertNull(group.getAttributes()); + assertSame(group.getOptions(), options); + } + + @Test + public void map_contructor_retains_map() + { + List<OptionModel> options = Collections.emptyList(); + Map<String, String> attributes = Collections.emptyMap(); + + OptionGroupModel group = new OptionGroupModelImpl("Label", true, options, attributes); + + assertSame(group.getAttributes(), attributes); + } + + @Test + public void strings_contructor_builds_map() + { + List<OptionModel> options = Collections.emptyList(); + + OptionGroupModel group = new OptionGroupModelImpl("Label", true, options, "fred", + "flintstone", "barney", "rubble"); + + Map<String, String> attributes = group.getAttributes(); + + assertEquals(attributes.size(), 2); + assertEquals(attributes.get("fred"), "flintstone"); + assertEquals(attributes.get("barney"), "rubble"); + } +} Added: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/OptionModelImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/OptionModelImplTest.java?view=auto&rev=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/OptionModelImplTest.java (added) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/OptionModelImplTest.java Sun Jan 7 15:47:29 2007 @@ -0,0 +1,66 @@ +// Copyright 2007 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.tapestry.internal; + +import java.util.Collections; +import java.util.Map; + +import org.apache.tapestry.OptionModel; +import org.testng.Assert; +import org.testng.annotations.Test; + +public class OptionModelImplTest extends Assert +{ + @Test + public void basics() + { + OptionModel model = new OptionModelImpl("Label", false, this); + + assertEquals(model.getLabel(), "Label"); + assertFalse(model.isDisabled()); + assertSame(model.getValue(), this); + assertNull(model.getAttributes()); + + model = new OptionModelImpl("Fred", true, "fred"); + + assertEquals(model.getLabel(), "Fred"); + assertTrue(model.isDisabled()); + + assertEquals(model.toString(), "OptionModel[Fred fred]"); + } + + @Test + public void attributes_as_extra_parameters() + { + OptionModel model = new OptionModelImpl("Label", false, this, "fred", "flintstone", + "barney", "rubble"); + + Map<String, String> attributes = model.getAttributes(); + + assertEquals(attributes.size(), 2); + assertEquals(attributes.get("fred"), "flintstone"); + assertEquals(attributes.get("barney"), "rubble"); + } + + @Test + public void attributes_as_map_are_retained() + { + Map<String, String> attributes = Collections.emptyMap(); + + OptionModel model = new OptionModelImpl("Label", false, this, attributes); + + assertSame(model.getAttributes(), attributes); + } +} Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/TapestryUtilsTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/TapestryUtilsTest.java?view=diff&rev=493880&r1=493879&r2=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/TapestryUtilsTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/TapestryUtilsTest.java Sun Jan 7 15:47:29 2007 @@ -16,12 +16,17 @@ import java.io.Closeable; import java.io.IOException; +import java.util.List; +import java.util.Map; -import org.apache.tapestry.ioc.test.TestBase; +import org.apache.tapestry.OptionModel; +import org.apache.tapestry.SelectModel; +import org.apache.tapestry.internal.test.InternalBaseTestCase; +import org.apache.tapestry.ioc.services.TypeCoercer; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -public class TapestryUtilsTest extends TestBase +public class TapestryUtilsTest extends InternalBaseTestCase { @Test public void close_null_is_noop() @@ -90,5 +95,84 @@ { "hello", "Hello" }, { "userId", "User Id" }, { "useHTML", "Use HTML" }, }; + } + + @Test + public void map_from_keys_and_values() + { + Map<String, String> map = TapestryUtils.mapFromKeysAndValues( + "fred", + "flintstone", + "barney", + "rubble"); + + assertEquals(map.size(), 2); + assertEquals(map.get("fred"), "flintstone"); + assertEquals(map.get("barney"), "rubble"); + } + + @Test + public void string_to_option_model_just_label() + { + OptionModel model = TapestryUtils.toOptionModel("Just A Label"); + + assertEquals(model.getLabel(), "Just A Label"); + assertEquals(model.getValue(), "Just A Label"); + } + + @Test + public void string_to_option_model() + { + OptionModel model = TapestryUtils.toOptionModel("my-value=Some Label"); + + assertEquals(model.getLabel(), "Some Label"); + assertEquals(model.getValue(), "my-value"); + } + + @Test + public void to_option_models() + { + List<OptionModel> options = TapestryUtils.toOptionModels("UK,USA,DE=Germany"); + + assertEquals(options.size(), 3); + + assertEquals(options.get(0).getLabel(), "UK"); + assertEquals(options.get(0).getValue(), "UK"); + + assertEquals(options.get(1).getLabel(), "USA"); + assertEquals(options.get(1).getValue(), "USA"); + + assertEquals(options.get(2).getLabel(), "Germany"); + assertEquals(options.get(2).getValue(), "DE"); + } + + @Test + public void whitespace_around_terms_is_trimmed() + { + List<OptionModel> options = TapestryUtils.toOptionModels(" UK , USA , DE=Germany "); + + assertEquals(options.size(), 3); + + assertEquals(options.get(0).getLabel(), "UK"); + assertEquals(options.get(0).getValue(), "UK"); + + assertEquals(options.get(1).getLabel(), "USA"); + assertEquals(options.get(1).getValue(), "USA"); + + assertEquals(options.get(2).getLabel(), "Germany"); + assertEquals(options.get(2).getValue(), "DE"); + } + + @Test + public void string_to_select_model_type_coercion_integration() + { + TypeCoercer coercer = getService(TypeCoercer.class); + + SelectModel selectModel = coercer.coerce(" UK , USA , DE=Germany ", SelectModel.class); + + assertNull(selectModel.getOptionGroups()); + assertEquals(selectModel.getOptions().size(), 3); + + // Waste of effort to re-test each individual option model. } } Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/BindingFactoryTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/BindingFactoryTest.java?view=diff&rev=493880&r1=493879&r2=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/BindingFactoryTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/BindingFactoryTest.java Sun Jan 7 15:47:29 2007 @@ -14,13 +14,13 @@ package org.apache.tapestry.internal.bindings; +import org.apache.tapestry.Binding; import org.apache.tapestry.ComponentResources; import org.apache.tapestry.Translator; import org.apache.tapestry.internal.test.InternalBaseTestCase; import org.apache.tapestry.ioc.Location; import org.apache.tapestry.ioc.internal.util.InternalUtils; import org.apache.tapestry.ioc.internal.util.TapestryException; -import org.apache.tapestry.services.Binding; import org.apache.tapestry.services.BindingFactory; import org.apache.tapestry.services.TranslatorSource; import org.testng.annotations.Test; Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java?view=diff&rev=493880&r1=493879&r2=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java Sun Jan 7 15:47:29 2007 @@ -14,6 +14,7 @@ package org.apache.tapestry.internal.bindings; +import org.apache.tapestry.Binding; import org.apache.tapestry.ComponentResources; import org.apache.tapestry.internal.test.InternalBaseTestCase; import org.apache.tapestry.internal.util.IntegerRange; @@ -23,7 +24,6 @@ import org.apache.tapestry.ioc.services.ClassFactory; import org.apache.tapestry.ioc.services.PropertyAccess; import org.apache.tapestry.runtime.Component; -import org.apache.tapestry.services.Binding; import org.apache.tapestry.services.BindingFactory; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/ValidateBindingFactoryTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/ValidateBindingFactoryTest.java?view=diff&rev=493880&r1=493879&r2=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/ValidateBindingFactoryTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/ValidateBindingFactoryTest.java Sun Jan 7 15:47:29 2007 @@ -14,13 +14,13 @@ package org.apache.tapestry.internal.bindings; +import org.apache.tapestry.Binding; import org.apache.tapestry.ComponentResources; import org.apache.tapestry.Field; import org.apache.tapestry.FieldValidator; import org.apache.tapestry.ioc.Location; import org.apache.tapestry.ioc.internal.util.TapestryException; import org.apache.tapestry.runtime.Component; -import org.apache.tapestry.services.Binding; import org.apache.tapestry.services.BindingFactory; import org.apache.tapestry.services.FieldValidatorSource; import org.apache.tapestry.test.TapestryTestCase; Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/BindingSourceImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/BindingSourceImplTest.java?view=diff&rev=493880&r1=493879&r2=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/BindingSourceImplTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/BindingSourceImplTest.java Sun Jan 7 15:47:29 2007 @@ -18,11 +18,11 @@ import java.util.Map; +import org.apache.tapestry.Binding; import org.apache.tapestry.ComponentResources; import org.apache.tapestry.internal.test.InternalBaseTestCase; import org.apache.tapestry.ioc.Location; import org.apache.tapestry.ioc.internal.util.TapestryException; -import org.apache.tapestry.services.Binding; import org.apache.tapestry.services.BindingFactory; import org.apache.tapestry.services.BindingSource; import org.testng.annotations.Test; Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/DefaultParameterBindingMethodComponent.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/DefaultParameterBindingMethodComponent.java?view=diff&rev=493880&r1=493879&r2=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/DefaultParameterBindingMethodComponent.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/DefaultParameterBindingMethodComponent.java Sun Jan 7 15:47:29 2007 @@ -14,9 +14,9 @@ package org.apache.tapestry.internal.services; +import org.apache.tapestry.Binding; import org.apache.tapestry.annotations.ComponentClass; import org.apache.tapestry.annotations.Parameter; -import org.apache.tapestry.services.Binding; @ComponentClass public class DefaultParameterBindingMethodComponent Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParameterWorkerTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParameterWorkerTest.java?view=diff&rev=493880&r1=493879&r2=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParameterWorkerTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParameterWorkerTest.java Sun Jan 7 15:47:29 2007 @@ -20,13 +20,13 @@ import javassist.LoaderClassPath; import org.apache.commons.logging.Log; +import org.apache.tapestry.Binding; import org.apache.tapestry.internal.InternalComponentResources; import org.apache.tapestry.internal.test.InternalBaseTestCase; import org.apache.tapestry.ioc.internal.services.PropertyAccessImpl; import org.apache.tapestry.ioc.services.PropertyAccess; import org.apache.tapestry.model.MutableComponentModel; import org.apache.tapestry.runtime.Component; -import org.apache.tapestry.services.Binding; import org.apache.tapestry.services.BindingSource; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ComponentPageElementImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ComponentPageElementImplTest.java?view=diff&rev=493880&r1=493879&r2=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ComponentPageElementImplTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ComponentPageElementImplTest.java Sun Jan 7 15:47:29 2007 @@ -15,6 +15,7 @@ package org.apache.tapestry.internal.structure; import org.apache.commons.logging.Log; +import org.apache.tapestry.Binding; import org.apache.tapestry.ComponentResources; import org.apache.tapestry.internal.InternalComponentResources; import org.apache.tapestry.internal.services.Instantiator; @@ -25,7 +26,6 @@ import org.apache.tapestry.model.ComponentModel; import org.apache.tapestry.model.ParameterModel; import org.apache.tapestry.runtime.Component; -import org.apache.tapestry.services.Binding; import org.easymock.EasyMock; import org.testng.annotations.Test; Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ExpansionPageElementImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ExpansionPageElementImplTest.java?view=diff&rev=493880&r1=493879&r2=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ExpansionPageElementImplTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ExpansionPageElementImplTest.java Sun Jan 7 15:47:29 2007 @@ -14,11 +14,11 @@ package org.apache.tapestry.internal.structure; +import org.apache.tapestry.Binding; import org.apache.tapestry.MarkupWriter; import org.apache.tapestry.internal.test.InternalBaseTestCase; import org.apache.tapestry.ioc.services.TypeCoercer; import org.apache.tapestry.runtime.RenderQueue; -import org.apache.tapestry.services.Binding; import org.testng.annotations.Test; /** Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImplTest.java?view=diff&rev=493880&r1=493879&r2=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImplTest.java (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImplTest.java Sun Jan 7 15:47:29 2007 @@ -14,6 +14,7 @@ package org.apache.tapestry.internal.structure; +import org.apache.tapestry.Binding; import org.apache.tapestry.MarkupWriter; import org.apache.tapestry.internal.InternalComponentResources; import org.apache.tapestry.internal.services.Instantiator; @@ -22,7 +23,6 @@ import org.apache.tapestry.model.ComponentModel; import org.apache.tapestry.model.ParameterModel; import org.apache.tapestry.runtime.Component; -import org.apache.tapestry.services.Binding; import org.testng.annotations.Test; public class InternalComponentResourcesImplTest extends InternalBaseTestCase Added: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/disabled_option.html URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/disabled_option.html?view=auto&rev=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/disabled_option.html (added) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/disabled_option.html Sun Jan 7 15:47:29 2007 @@ -0,0 +1 @@ +<select><option class="pixie" disabled="disabled" value="fred">Fred</option></select> \ No newline at end of file Added: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/just_options.html URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/just_options.html?view=auto&rev=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/just_options.html (added) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/just_options.html Sun Jan 7 15:47:29 2007 @@ -0,0 +1 @@ +<select><option value="fred">Fred Flintstone</option><option selected="selected" value="barney">Barney Rubble</option></select> \ No newline at end of file Added: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/option_attributes.html URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/option_attributes.html?view=auto&rev=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/option_attributes.html (added) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/option_attributes.html Sun Jan 7 15:47:29 2007 @@ -0,0 +1 @@ +<select><option class="pixie" value="fred">Fred</option></select> \ No newline at end of file Added: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/option_group_attributes.html URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/option_group_attributes.html?view=auto&rev=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/option_group_attributes.html (added) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/option_group_attributes.html Sun Jan 7 15:47:29 2007 @@ -0,0 +1 @@ +<select><optgroup class="pixie" label="Husbands"><option selected="selected" value="Fred">Fred</option><option value="Barney">Barney</option></optgroup></select> \ No newline at end of file Added: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/option_groups.html URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/option_groups.html?view=auto&rev=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/option_groups.html (added) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/option_groups.html Sun Jan 7 15:47:29 2007 @@ -0,0 +1 @@ +<select><optgroup label="Husbands"><option selected="selected" value="Fred">Fred</option><option value="Barney">Barney</option></optgroup><optgroup disabled="disabled" label="Wives"><option value="Wilma">Wilma</option><option value="Betty">Betty</option></optgroup></select> \ No newline at end of file Added: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/option_groups_precede_ungroup_options.html URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/option_groups_precede_ungroup_options.html?view=auto&rev=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/option_groups_precede_ungroup_options.html (added) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/corelib/components/option_groups_precede_ungroup_options.html Sun Jan 7 15:47:29 2007 @@ -0,0 +1 @@ +<select><optgroup label="Husbands"><option selected="selected" value="Fred">Fred</option><option value="Barney">Barney</option></optgroup><option value="Wilma">Wilma</option><option value="Betty">Betty</option></select> \ No newline at end of file Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/SimpleForm.properties URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/SimpleForm.properties?view=diff&rev=493880&r1=493879&r2=493880 ============================================================================== --- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/SimpleForm.properties (original) +++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/SimpleForm.properties Sun Jan 7 15:47:29 2007 @@ -12,4 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -urgent-label=Urgent Processing Requested \ No newline at end of file +urgent-label=Urgent Processing Requested +os-values=\ + winnt=Windows NT, \ + winxp=Windows XP, \ + vista=Windows Vista, \ + os9=Mac OS 9, \ + osx=Mac OS X, \ + linux=Linux \ No newline at end of file
