Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/components/TestRenderBlock.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/components/TestRenderBlock.java?rev=265748&r1=265747&r2=265748&view=diff ============================================================================== --- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/components/TestRenderBlock.java (original) +++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/components/TestRenderBlock.java Thu Sep 1 09:04:32 2005 @@ -14,6 +14,7 @@ package org.apache.tapestry.components; +import org.apache.tapestry.BaseComponentTestCase; import org.apache.tapestry.IMarkupWriter; import org.apache.tapestry.IRequestCycle; import org.easymock.MockControl;
Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTest.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTest.java?rev=265748&r1=265747&r2=265748&view=diff ============================================================================== --- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTest.java (original) +++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/BaseFormComponentTest.java Thu Sep 1 09:04:32 2005 @@ -14,6 +14,7 @@ package org.apache.tapestry.form; +import org.apache.tapestry.BaseComponentTestCase; import org.apache.tapestry.IActionListener; import org.apache.tapestry.IBinding; import org.apache.tapestry.IComponent; @@ -21,7 +22,6 @@ import org.apache.tapestry.IMarkupWriter; import org.apache.tapestry.IRequestCycle; import org.apache.tapestry.TapestryUtils; -import org.apache.tapestry.components.BaseComponentTestCase; import org.apache.tapestry.valid.IValidationDelegate; import org.easymock.MockControl; Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/MockForm.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/MockForm.java?rev=265748&r1=265747&r2=265748&view=diff ============================================================================== --- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/MockForm.java (original) +++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/MockForm.java Thu Sep 1 09:04:32 2005 @@ -35,6 +35,7 @@ import org.apache.tapestry.engine.IPageLoader; import org.apache.tapestry.listener.ListenerMap; import org.apache.tapestry.spec.IComponentSpecification; +import org.apache.tapestry.spec.IContainedComponent; import org.apache.tapestry.valid.IValidationDelegate; /** @@ -342,5 +343,14 @@ public IComponent getComponent() { return this; + } + + public IContainedComponent getContainedComponent() + { + return null; + } + + public void setContainedComponent(IContainedComponent containedComponent) + { } } Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestButton.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestButton.java?rev=265748&r1=265747&r2=265748&view=diff ============================================================================== --- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestButton.java (original) +++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestButton.java Thu Sep 1 09:04:32 2005 @@ -14,10 +14,10 @@ package org.apache.tapestry.form; +import org.apache.tapestry.BaseComponentTestCase; import org.apache.tapestry.IBinding; import org.apache.tapestry.IMarkupWriter; import org.apache.tapestry.IRequestCycle; -import org.apache.tapestry.components.BaseComponentTestCase; import org.apache.tapestry.spec.ComponentSpecification; public class TestButton extends BaseComponentTestCase Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestForm.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestForm.java?rev=265748&r1=265747&r2=265748&view=diff ============================================================================== --- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestForm.java (original) +++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestForm.java Thu Sep 1 09:04:32 2005 @@ -14,8 +14,8 @@ package org.apache.tapestry.form; +import org.apache.tapestry.BaseComponentTestCase; import org.apache.tapestry.IActionListener; -import org.apache.tapestry.components.BaseComponentTestCase; import org.apache.tapestry.valid.IValidationDelegate; import org.easymock.MockControl; Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestFormComponentContributorContext.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestFormComponentContributorContext.java?rev=265748&r1=265747&r2=265748&view=diff ============================================================================== --- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestFormComponentContributorContext.java (original) +++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestFormComponentContributorContext.java Thu Sep 1 09:04:32 2005 @@ -19,11 +19,11 @@ import org.apache.hivemind.ClassResolver; import org.apache.hivemind.Resource; import org.apache.hivemind.util.ClasspathResource; +import org.apache.tapestry.BaseComponentTestCase; import org.apache.tapestry.IForm; import org.apache.tapestry.IRequestCycle; import org.apache.tapestry.PageRenderSupport; import org.apache.tapestry.TapestryUtils; -import org.apache.tapestry.components.BaseComponentTestCase; import org.apache.tapestry.services.Infrastructure; import org.easymock.MockControl; Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestLinkSubmit.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestLinkSubmit.java?rev=265748&r1=265747&r2=265748&view=diff ============================================================================== --- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestLinkSubmit.java (original) +++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestLinkSubmit.java Thu Sep 1 09:04:32 2005 @@ -19,6 +19,7 @@ import org.apache.hivemind.ApplicationRuntimeException; import org.apache.hivemind.Location; import org.apache.hivemind.Resource; +import org.apache.tapestry.BaseComponentTestCase; import org.apache.tapestry.IComponent; import org.apache.tapestry.IForm; import org.apache.tapestry.IMarkupWriter; @@ -27,7 +28,6 @@ import org.apache.tapestry.IScript; import org.apache.tapestry.IScriptProcessor; import org.apache.tapestry.PageRenderSupport; -import org.apache.tapestry.components.BaseComponentTestCase; /** * Tests for [EMAIL PROTECTED] org.apache.tapestry.form.LinkSubmit} Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestTranslatedFieldSupportImpl.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestTranslatedFieldSupportImpl.java?rev=265748&r1=265747&r2=265748&view=diff ============================================================================== --- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestTranslatedFieldSupportImpl.java (original) +++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestTranslatedFieldSupportImpl.java Thu Sep 1 09:04:32 2005 @@ -22,13 +22,13 @@ import org.apache.hivemind.test.ArgumentMatcher; import org.apache.hivemind.test.EqualsMatcher; import org.apache.hivemind.test.TypeMatcher; +import org.apache.tapestry.BaseComponentTestCase; import org.apache.tapestry.IComponent; import org.apache.tapestry.IForm; import org.apache.tapestry.IMarkupWriter; import org.apache.tapestry.IRequestCycle; import org.apache.tapestry.PageRenderSupport; import org.apache.tapestry.TapestryUtils; -import org.apache.tapestry.components.BaseComponentTestCase; import org.apache.tapestry.form.translator.Translator; import org.apache.tapestry.services.Infrastructure; import org.apache.tapestry.valid.IValidationDelegate; Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestValidatableFieldSupportImpl.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestValidatableFieldSupportImpl.java?rev=265748&r1=265747&r2=265748&view=diff ============================================================================== --- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestValidatableFieldSupportImpl.java (original) +++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/TestValidatableFieldSupportImpl.java Thu Sep 1 09:04:32 2005 @@ -25,6 +25,7 @@ import org.apache.hivemind.test.ArgumentMatcher; import org.apache.hivemind.test.EqualsMatcher; import org.apache.hivemind.test.TypeMatcher; +import org.apache.tapestry.BaseComponentTestCase; import org.apache.tapestry.IComponent; import org.apache.tapestry.IForm; import org.apache.tapestry.IMarkupWriter; @@ -32,7 +33,6 @@ import org.apache.tapestry.PageRenderSupport; import org.apache.tapestry.TapestryUtils; import org.apache.tapestry.coerce.ValueConverter; -import org.apache.tapestry.components.BaseComponentTestCase; import org.apache.tapestry.form.validator.Validator; import org.apache.tapestry.services.Infrastructure; import org.apache.tapestry.valid.ValidatorException; Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/validator/BaseValidatorTestCase.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/validator/BaseValidatorTestCase.java?rev=265748&r1=265747&r2=265748&view=diff ============================================================================== --- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/validator/BaseValidatorTestCase.java (original) +++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/form/validator/BaseValidatorTestCase.java Thu Sep 1 09:04:32 2005 @@ -14,7 +14,7 @@ package org.apache.tapestry.form.validator; -import org.apache.tapestry.components.BaseComponentTestCase; +import org.apache.tapestry.BaseComponentTestCase; import org.apache.tapestry.form.FormComponentContributorContext; import org.apache.tapestry.form.IFormComponent; import org.apache.tapestry.form.ValidationMessages; Modified: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/html/TestInsertText.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/html/TestInsertText.java?rev=265748&r1=265747&r2=265748&view=diff ============================================================================== --- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/html/TestInsertText.java (original) +++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/html/TestInsertText.java Thu Sep 1 09:04:32 2005 @@ -14,9 +14,9 @@ package org.apache.tapestry.html; +import org.apache.tapestry.BaseComponentTestCase; import org.apache.tapestry.IMarkupWriter; import org.apache.tapestry.IRequestCycle; -import org.apache.tapestry.components.BaseComponentTestCase; /** * Tests for [EMAIL PROTECTED] org.apache.tapestry.html.InsertText}. Added: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/Basic.txt URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/Basic.txt?rev=265748&view=auto ============================================================================== --- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/Basic.txt (added) +++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/Basic.txt Thu Sep 1 09:04:32 2005 @@ -0,0 +1,8 @@ +0000: aced0005 73720011 6a617661 2e757469 |....sr..java.uti| +0010: 6c2e4861 73684d61 700507da c1c31660 |l.HashMap......`| +0020: d1030002 46000a6c 6f616446 6163746f |....F..loadFacto| +0030: 72490009 74687265 73686f6c 6478703f |rI..thresholdxp?| +0040: 40000000 00000c77 08000000 10000000 |@......w........| +0050: 0274000b 67616262 61206761 62626174 |.t..gabba gabbat| +0060: 000d7765 20616363 65707420 796f7574 |..we accept yout| +0070: 0005616c 70686174 00046265 746178 |..alphat..betax | Added: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/NoAscii.txt URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/NoAscii.txt?rev=265748&view=auto ============================================================================== --- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/NoAscii.txt (added) +++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/NoAscii.txt Thu Sep 1 09:04:32 2005 @@ -0,0 +1,8 @@ +0000: aced0005 73720011 6a617661 2e757469 +0010: 6c2e4861 73684d61 700507da c1c31660 +0020: d1030002 46000a6c 6f616446 6163746f +0030: 72490009 74687265 73686f6c 6478703f +0040: 40000000 00000c77 08000000 10000000 +0050: 0274000b 67616262 61206761 62626174 +0060: 000d7765 20616363 65707420 796f7574 +0070: 0005616c 70686174 00046265 746178 Added: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/NoOffset.txt URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/NoOffset.txt?rev=265748&view=auto ============================================================================== --- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/NoOffset.txt (added) +++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/NoOffset.txt Thu Sep 1 09:04:32 2005 @@ -0,0 +1,8 @@ +aced0005 73720011 6a617661 2e757469 |....sr..java.uti| +6c2e4861 73684d61 700507da c1c31660 |l.HashMap......`| +d1030002 46000a6c 6f616446 6163746f |....F..loadFacto| +72490009 74687265 73686f6c 6478703f |rI..thresholdxp?| +40000000 00000c77 08000000 10000000 |@......w........| +0274000b 67616262 61206761 62626174 |.t..gabba gabbat| +000d7765 20616363 65707420 796f7574 |..we accept yout| +0005616c 70686174 00046265 746178 |..alphat..betax | Added: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/Options.txt URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/Options.txt?rev=265748&view=auto ============================================================================== --- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/Options.txt (added) +++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/Options.txt Thu Sep 1 09:04:32 2005 @@ -0,0 +1,3 @@ +0000 = aced000573720011 6a6176612e757469 6c2e486173684d61 700507dac1c31660 d103000246000a6c 6f6164466163746f { ????sr??java.util.HashMap??????`????F??loadFacto } +0030 = 7249000974687265 73686f6c6478703f 4000000000000c77 0800000010000000 0274000b67616262 6120676162626174 { [EMAIL PROTECTED] gabbat } +0060 = 000d776520616363 65707420796f7574 0005616c70686174 00046265746178 { ??we accept yout??alphat??betax } Added: jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/TestBinaryDumpOutputStream.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/TestBinaryDumpOutputStream.java?rev=265748&view=auto ============================================================================== --- jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/TestBinaryDumpOutputStream.java (added) +++ jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/util/io/TestBinaryDumpOutputStream.java Thu Sep 1 09:04:32 2005 @@ -0,0 +1,157 @@ +// Copyright 2005 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.util.io; + +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.CharArrayWriter; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.LineNumberReader; +import java.io.ObjectOutputStream; +import java.io.Reader; +import java.util.HashMap; +import java.util.Map; + +import junit.framework.TestCase; + +/** + * Tests for [EMAIL PROTECTED] org.apache.tapestry.util.io.BinaryDumpOutputStream}. + * + * @author Howard Lewis Ship + * @since 4.0 + */ +public class TestBinaryDumpOutputStream extends TestCase +{ + /** + * Reads the content of a file, and forms a string. Converts line-number endings in the file + * into the correct platform value (this should help the test run properly on both Windows and + * *nix). + */ + private String contentsOf(String path) throws Exception + { + String sep = System.getProperty("line.separator"); + + InputStream is = getClass().getResourceAsStream(path); + + is = new BufferedInputStream(is); + + Reader ir = new InputStreamReader(is); + + ir = new BufferedReader(ir); + + LineNumberReader lnr = new LineNumberReader(ir); + + StringBuffer buffer = new StringBuffer(); + + while (true) + { + String line = lnr.readLine(); + + if (line == null) + break; + + buffer.append(line); + buffer.append(sep); + } + + ir.close(); + + return buffer.toString(); + } + + public void testBasic() throws Exception + { + CharArrayWriter writer = new CharArrayWriter(); + + BinaryDumpOutputStream bdos = new BinaryDumpOutputStream(writer); + + ObjectOutputStream oos = new ObjectOutputStream(bdos); + + oos.writeObject(createOutputObject()); + + oos.close(); + + assertEquals(contentsOf("Basic.txt"), writer.toString()); + } + + /** + * Creates and returns the object to be written out to the stream. The tests are dependenent on + * the serialization of HashMap and String not changing between JDKs. If such a change does + * occur, we'll need to devise an Externalizable object to write to the stream. + */ + private Map createOutputObject() + { + Map map = new HashMap(); + map.put("alpha", "beta"); + map.put("gabba gabba", "we accept you"); + return map; + } + + public void testOptions() throws Exception + { + + CharArrayWriter writer = new CharArrayWriter(); + + BinaryDumpOutputStream bdos = new BinaryDumpOutputStream(writer); + + bdos.setAsciiBegin(" { "); + bdos.setAsciiEnd(" }"); + bdos.setOffsetSeperator(" = "); + bdos.setSubstituteChar('?'); + bdos.setBytesPerLine(48); + bdos.setSpacingInterval(8); + + ObjectOutputStream oos = new ObjectOutputStream(bdos); + + oos.writeObject(createOutputObject()); + + oos.close(); + + assertEquals(contentsOf("Options.txt"), writer.toString()); + } + + public void testNoOffset() throws Exception + { + CharArrayWriter writer = new CharArrayWriter(); + + BinaryDumpOutputStream bdos = new BinaryDumpOutputStream(writer); + bdos.setShowOffset(false); + + ObjectOutputStream oos = new ObjectOutputStream(bdos); + + oos.writeObject(createOutputObject()); + + oos.close(); + + assertEquals(contentsOf("NoOffset.txt"), writer.toString()); + } + + public void testNoAscii() throws Exception + { + CharArrayWriter writer = new CharArrayWriter(); + + BinaryDumpOutputStream bdos = new BinaryDumpOutputStream(writer); + bdos.setShowAscii(false); + + ObjectOutputStream oos = new ObjectOutputStream(bdos); + + oos.writeObject(createOutputObject()); + + oos.close(); + + assertEquals(contentsOf("NoAscii.txt"), writer.toString()); + } +} Modified: jakarta/tapestry/trunk/status.xml URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/status.xml?rev=265748&r1=265747&r2=265748&view=diff ============================================================================== --- jakarta/tapestry/trunk/status.xml (original) +++ jakarta/tapestry/trunk/status.xml Thu Sep 1 09:04:32 2005 @@ -57,6 +57,7 @@ <action type="fix" dev="HLS" fixes-bug="TAPESTRY-609">Tapestry.set_focus() seems to be passed the form components elementId (i.e. name attribute) not clientId (i.e. id attribute), which keeps focus from being set</action> <action type="fix" dev="HLS" fixes-bug="TAPESTRY-478, TAPESTRY-477, TAPESTRY-463" due-to="Pierre-Yves Nicolas">Document RadioGroup, Radio and ExternalLink components</action> <action type="fix" dev="HLS" fixes-bug="TAPESTRY-613">Javascript problem with @LinkSubmit</action> + <action type="fix" dev="HLS" fixes-bug="TAPESTRY-386">Big overhaul of the Tapestry Inspector</action> </release> <release version="4.0-beta-5" date="Aug 26 2005"> <action type="fix" dev="MB,HLS" fixes-bug="TAPESTRY-552">Improperly configured SerializableAdaptor (for DataSqueezer) prevents serialized objects from being de-serialized</action> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
