Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 54185 invoked from network); 26 May 2010 09:31:50 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 26 May 2010 09:31:50 -0000 Received: (qmail 43985 invoked by uid 500); 26 May 2010 09:31:50 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 43899 invoked by uid 500); 26 May 2010 09:31:49 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 43890 invoked by uid 99); 26 May 2010 09:31:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 May 2010 09:31:48 +0000 X-ASF-Spam-Status: No, hits=-1742.8 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 May 2010 09:31:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B34182388C02; Wed, 26 May 2010 09:31:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r948377 [19/21] - in /harmony/enhanced/java/branches/mrh: classlib/make/ classlib/modules/accessibility/make/ classlib/modules/annotation/make/ classlib/modules/applet/make/ classlib/modules/archive/make/ classlib/modules/archive/src/test/j... Date: Wed, 26 May 2010 09:31:15 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100526093123.B34182388C02@eris.apache.org> Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocument_ReaderTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocument_ReaderTest.java?rev=948377&r1=948376&r2=948377&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocument_ReaderTest.java (original) +++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocument_ReaderTest.java Wed May 26 09:31:07 2010 @@ -38,6 +38,7 @@ import javax.swing.text.html.HTMLDocumen import javax.swing.text.html.HTMLDocument.HTMLReader.TagAction; import javax.swing.text.html.HTMLEditorKit.ParserCallback; import javax.swing.text.html.parser.ParserDelegator; +import tests.support.Support_Excludes; public class HTMLDocument_ReaderTest extends HTMLDocumentTestCase { @@ -60,6 +61,10 @@ public class HTMLDocument_ReaderTest ext } public void testFlush_Create() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final String text = "tag"; SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute(StyleConstants.NameAttribute, Tag.B.toString()); @@ -75,6 +80,10 @@ public class HTMLDocument_ReaderTest ext } public void testFlush_NoCreate_IfEmptyBuffer() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final String text = "tag"; SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute(StyleConstants.NameAttribute, Tag.B.toString()); @@ -86,6 +95,10 @@ public class HTMLDocument_ReaderTest ext } public void testFlush_Create_PushPopNull() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final String text = "tag"; SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute(StyleConstants.NameAttribute, Tag.B); @@ -102,6 +115,10 @@ public class HTMLDocument_ReaderTest ext } public void testFlush_Insert_Tag() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final String text = "tag"; SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute(StyleConstants.NameAttribute, Tag.B); @@ -119,6 +136,10 @@ public class HTMLDocument_ReaderTest ext } public void testFlush_Insert_PushPopTag() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final String text = "tag"; editable = false; SimpleAttributeSet attr = new SimpleAttributeSet(); @@ -136,6 +157,10 @@ public class HTMLDocument_ReaderTest ext } public void testFlush_Insert_PushPopTag_Wierd() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final String text = "tag"; editable = false; SimpleAttributeSet attr = new SimpleAttributeSet(); @@ -156,6 +181,10 @@ public class HTMLDocument_ReaderTest ext } public void testFlush_Insert_PushPopTag_ApplicationMoment1() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); reader = (HTMLReader)doc.getReader(1, 10, 100, Tag.I); reader.handleStartTag(Tag.I, new SimpleAttributeSet(), 0); @@ -163,6 +192,10 @@ public class HTMLDocument_ReaderTest ext } public void testFlush_Insert_PushPopTag_ApplicationMoment2() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); reader = (HTMLReader)doc.getReader(-100, 10, 100, Tag.I); reader.registerTag(Tag.I, reader.new TagAction()); @@ -173,6 +206,10 @@ public class HTMLDocument_ReaderTest ext } public void testFlush_Insert_PushPopTag_ApplicationMoment3() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); reader = (HTMLReader)doc.getReader(-100, 10, 100, Tag.I); reader.registerTag(Tag.I, reader.new BlockAction()); @@ -181,6 +218,10 @@ public class HTMLDocument_ReaderTest ext } public void testFlush_Insert_PushPopTag_ApplicationMoment4() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); reader = (HTMLReader)doc.getReader(-100, 10, 100, Tag.I); reader.new BlockAction().start(Tag.I, new SimpleAttributeSet()); @@ -188,6 +229,10 @@ public class HTMLDocument_ReaderTest ext } public void testFlush_Insert_PushPopTag_ApplicationMoment5() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); reader = (HTMLReader)doc.getReader(-100, 0, 0, Tag.I); reader.registerTag(Tag.I, reader.new CharacterAction()); @@ -198,6 +243,10 @@ public class HTMLDocument_ReaderTest ext } public void testFlush_Insert_PushPopTag_SpecsOrder() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); reader = (HTMLReader)doc.getReader(-100, 2, 3, Tag.I); reader.handleStartTag(Tag.I, new SimpleAttributeSet(), 1000); @@ -208,6 +257,10 @@ public class HTMLDocument_ReaderTest ext } public void testFlush_Insert() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final String text = "tag"; final String initialText = "text"; doc.insertString(0, initialText, SimpleAttributeSet.EMPTY); @@ -226,6 +279,10 @@ public class HTMLDocument_ReaderTest ext } public void testFlush_NoInsert_IfEmptyBuffer() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final String text = "tag"; final String initialText = "text"; doc.insertString(0, initialText, SimpleAttributeSet.EMPTY); @@ -244,6 +301,10 @@ public class HTMLDocument_ReaderTest ext } public void testFlush_Insert_Offset() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final String text = "tag"; final String initialText = "text"; reader = (HTMLReader)doc.getReader(initialText.length()); @@ -263,6 +324,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleComment() { + if (Support_Excludes.isExcluded()) { + return; + } + String text1 = "data"; String text2 = "datadata"; reader.handleComment(text1.toCharArray(), 0); @@ -295,6 +360,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleEndOfLineString() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + String text1 = "text1"; String text2 = "text2"; @@ -306,6 +375,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleSimpleTag() { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute(StyleConstants.NameAttribute, Tag.B.toString()); final Marker endMarker = new Marker(); @@ -334,6 +407,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleEndTag() { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute(StyleConstants.NameAttribute, Tag.B.toString()); final Marker endMarker = new Marker(); @@ -360,6 +437,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleStartTag() { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute(StyleConstants.NameAttribute, Tag.B.toString()); final Marker endMarker = new Marker(); @@ -386,6 +467,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleStartTag_StyleAttr() { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute(HTML.Attribute.STYLE, "color: red"); reader.handleStartTag(Tag.P, attr, 0); @@ -399,6 +484,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleSimpleTag_StyleAttr() { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute(HTML.Attribute.STYLE, "color: red"); reader.handleSimpleTag(Tag.HR, attr, 0); @@ -412,6 +501,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleText() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + String text = "data"; reader.handleText(text.toCharArray(), 0); assertEquals(0, reader.charAttr.getAttributeCount()); @@ -436,6 +529,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleText_ContentMethodsCalls_Body() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final Marker addContentMarker = new Marker(); final Marker preContentMarker = new Marker(); final Marker textAreaMarker = new Marker(); @@ -463,6 +560,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleText_ContentMethodsCalls_P() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final Marker addContentMarker = new Marker(); final Marker preContentMarker = new Marker(); final Marker textAreaMarker = new Marker(); @@ -490,6 +591,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleText_ContentMethodsCalls_Implied() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final Marker addContentMarker = new Marker(); final Marker preContentMarker = new Marker(); final Marker textAreaMarker = new Marker(); @@ -518,6 +623,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleText_ContentMethodsCalls_Pre() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final Marker addContentMarker = new Marker(); final Marker preContentMarker = new Marker(); final Marker textAreaMarker = new Marker(); @@ -546,6 +655,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleText_ContentMethodsCalls_Title() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final Marker addContentMarker = new Marker(); final Marker preContentMarker = new Marker(); final Marker textAreaMarker = new Marker(); @@ -571,6 +684,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleText_ContentMethodsCalls_Option() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final Marker addContentMarker = new Marker(); final Marker preContentMarker = new Marker(); final Marker textAreaMarker = new Marker(); @@ -620,6 +737,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleText_ContentMethodsCalls_TextArea() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final Marker addContentMarker = new Marker(); final Marker preContentMarker = new Marker(); final Marker textAreaMarker = new Marker(); @@ -680,6 +801,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleText_Implied() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + String text = "data"; final SimpleAttributeSet attr = new SimpleAttributeSet(); reader.handleStartTag(Tag.BODY, attr, 0); @@ -708,12 +833,20 @@ public class HTMLDocument_ReaderTest ext } public void testHandleText_BlockOpenClose_P1() { + if (Support_Excludes.isExcluded()) { + return; + } + reader.blockOpen(Tag.H1, new SimpleAttributeSet()); reader.blockClose(Tag.H1); checkTextInNotInserted(); } public void testHandleText_BlockOpenClose_P2() { + if (Support_Excludes.isExcluded()) { + return; + } + reader.blockOpen(Tag.H1, new SimpleAttributeSet()); reader.blockOpen(Tag.H1, new SimpleAttributeSet()); reader.blockOpen(Tag.H1, new SimpleAttributeSet()); @@ -722,6 +855,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleText_BlockOpenClose_P3() { + if (Support_Excludes.isExcluded()) { + return; + } + reader.blockOpen(Tag.H1, new SimpleAttributeSet()); reader.blockOpen(Tag.H2, new SimpleAttributeSet()); reader.blockOpen(Tag.H3, new SimpleAttributeSet()); @@ -732,12 +869,20 @@ public class HTMLDocument_ReaderTest ext } public void testHandleText_BlockOpenClose_Implied1() { + if (Support_Excludes.isExcluded()) { + return; + } + reader.blockOpen(Tag.IMPLIED, new SimpleAttributeSet()); reader.blockClose(Tag.IMPLIED); checkTextIsInserted(); } public void testHandleText_BlockOpenClose_Implied2() { + if (Support_Excludes.isExcluded()) { + return; + } + reader.blockOpen(Tag.IMPLIED, new SimpleAttributeSet()); reader.blockOpen(Tag.IMPLIED, new SimpleAttributeSet()); reader.blockOpen(Tag.IMPLIED, new SimpleAttributeSet()); @@ -749,6 +894,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleText_BlockOpenClose_Implied3() { + if (Support_Excludes.isExcluded()) { + return; + } + reader.blockOpen(Tag.IMPLIED, new SimpleAttributeSet()); reader.blockOpen(Tag.IMPLIED, new SimpleAttributeSet()); reader.blockOpen(Tag.IMPLIED, new SimpleAttributeSet()); @@ -759,6 +908,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleText_BlockOpenClose_P_Implied1() { + if (Support_Excludes.isExcluded()) { + return; + } + reader.blockOpen(Tag.P, new SimpleAttributeSet()); reader.blockOpen(Tag.P, new SimpleAttributeSet()); reader.blockOpen(Tag.P, new SimpleAttributeSet()); @@ -769,6 +922,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleText_BlockOpenClose_P_Implied2() { + if (Support_Excludes.isExcluded()) { + return; + } + reader.blockOpen(Tag.P, new SimpleAttributeSet()); reader.blockOpen(Tag.P, new SimpleAttributeSet()); reader.blockOpen(Tag.P, new SimpleAttributeSet()); @@ -780,6 +937,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleText_BlockOpenClose_P_Implied3() { + if (Support_Excludes.isExcluded()) { + return; + } + reader.blockOpen(Tag.IMPLIED, new SimpleAttributeSet()); reader.blockOpen(Tag.IMPLIED, new SimpleAttributeSet()); reader.blockOpen(Tag.IMPLIED, new SimpleAttributeSet()); @@ -790,6 +951,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleText_BlockOpenClose_P_Implied4() { + if (Support_Excludes.isExcluded()) { + return; + } + reader.blockOpen(Tag.IMPLIED, new SimpleAttributeSet()); reader.blockOpen(Tag.IMPLIED, new SimpleAttributeSet()); reader.blockOpen(Tag.IMPLIED, new SimpleAttributeSet()); @@ -799,6 +964,10 @@ public class HTMLDocument_ReaderTest ext } public void testAddContent_BlockOpenClose_P1() { + if (Support_Excludes.isExcluded()) { + return; + } + reader.blockOpen(Tag.H1, new SimpleAttributeSet()); reader.blockClose(Tag.H1); int numSpecs = reader.parseBuffer.size(); @@ -807,6 +976,10 @@ public class HTMLDocument_ReaderTest ext } public void testAddContent_BlockOpenClose_P2() { + if (Support_Excludes.isExcluded()) { + return; + } + reader.blockOpen(Tag.H1, new SimpleAttributeSet()); reader.blockClose(Tag.H1); int numSpecs = reader.parseBuffer.size(); @@ -815,6 +988,10 @@ public class HTMLDocument_ReaderTest ext } public void testAddContent_BlockOpenClose_P_Implied5() { + if (Support_Excludes.isExcluded()) { + return; + } + TagAction action = reader.new ParagraphAction(); reader.handleStartTag(Tag.BODY, new SimpleAttributeSet(), 0); assertEquals(1, reader.parseBuffer.size()); @@ -829,6 +1006,10 @@ public class HTMLDocument_ReaderTest ext } public void testHTMLReaderIntIntIntTag() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + reader = (HTMLReader)doc.getReader(10, 10, 20, Tag.B); assertNotNull(reader.parseBuffer); assertEquals(0, reader.parseBuffer.size()); @@ -838,6 +1019,10 @@ public class HTMLDocument_ReaderTest ext } public void testHTMLReaderIntIntIntTag_TagParameter() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + checkConstructorTagParameter(Tag.BR, "linkasdasd", 0); checkConstructorTagParameter(Tag.BR, "linkasdasd
", 1); checkConstructorTagParameter(Tag.BR, "link
asdasd", 2); @@ -849,6 +1034,10 @@ public class HTMLDocument_ReaderTest ext } public void testHTMLReaderIntIntIntTag_TagParameter_Closed() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final String text = "tag"; editable = false; reader = (HTMLReader)doc.getReader(0, 0, 0, Tag.FORM); @@ -870,6 +1059,10 @@ public class HTMLDocument_ReaderTest ext public void testHTMLReaderIntIntIntTag_OffsetParameter() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final String str = "00001111"; checkConstructorOffsetParameter(Tag.A, str, 0); checkConstructorOffsetParameter(Tag.A, str, 1); @@ -880,6 +1073,10 @@ public class HTMLDocument_ReaderTest ext } public void testHTMLReaderIntIntIntTag_PopParameter() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final String str = "linkasdasd"; checkConstructorPopParameter(Tag.A, str, 0, "coco"); if (isHarmony()) { @@ -893,6 +1090,10 @@ public class HTMLDocument_ReaderTest ext } public void testHTMLReaderIntIntIntTag_PushParameter() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final String str = "linkasdasd"; checkConstructorPushParameter(Tag.A, str, 0, "coco"); checkConstructorPushParameter(Tag.A, str, 1, "cpsncoco"); @@ -904,6 +1105,10 @@ public class HTMLDocument_ReaderTest ext } public void testHTMLReaderIntIntIntTag_PushPopParameter() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final String str = "linkasdasd"; checkConstructorPopPushParameter(Tag.A, str, 0, 0, "coco"); checkConstructorPopPushParameter(Tag.A, str, 1, 1, "cpeosncoco"); @@ -918,6 +1123,10 @@ public class HTMLDocument_ReaderTest ext } public void testHTMLReaderIntIntIntTag_PushPopParameter_JoinPrevSpec1() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + editable = false; HTMLReader reader = (HTMLReader)doc.getReader(0, 0, 1, Tag.A); reader.new CharacterAction().start(Tag.A, new SimpleAttributeSet()); @@ -926,6 +1135,10 @@ public class HTMLDocument_ReaderTest ext } public void testHTMLReaderIntIntIntTag_PushPopParameter_JoinPrevSpec2() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + editable = false; HTMLReader reader = (HTMLReader)doc.getReader(1, 1, 0, Tag.A); reader.new CharacterAction().start(Tag.A, new SimpleAttributeSet()); @@ -934,6 +1147,10 @@ public class HTMLDocument_ReaderTest ext } public void testHTMLReaderIntIntIntTag_PushPopParameter_JoinPrevSpec3() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + editable = false; HTMLReader reader = (HTMLReader)doc.getReader(0, 1, 0, Tag.A); reader.new CharacterAction().start(Tag.A, new SimpleAttributeSet()); @@ -942,6 +1159,10 @@ public class HTMLDocument_ReaderTest ext } public void testHTMLReaderIntIntIntTag_PushPopParameter_JoinPrevSpec4() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + editable = false; HTMLReader reader = (HTMLReader)doc.getReader(0, 1, 0, Tag.P); reader.new ParagraphAction().start(Tag.P, new SimpleAttributeSet()); @@ -950,6 +1171,10 @@ public class HTMLDocument_ReaderTest ext } public void testHTMLReaderIntIntIntTag_PushPopParameter_JoinPrevSpec5() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final Tag[] tags = HTML.getAllTags(); Tag[] oddTags; if (!isHarmony()) { @@ -976,6 +1201,10 @@ public class HTMLDocument_ReaderTest ext } public void testHTMLReaderIntIntIntTag_PushPopParameter_BlockParagraph() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + // trailing specs cutting for block and paragraph tags if (!isHarmony()) { return; @@ -1001,6 +1230,10 @@ public class HTMLDocument_ReaderTest ext } public void testHTMLReaderIntIntIntTag_OffsetPushPopParameter() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final String str = "linkasdasd"; checkConstructorOffsetPopPushParameter(Tag.A, str, 0, 0, 0, "coco"); checkConstructorOffsetPopPushParameter(Tag.A, str, 20, 1, 1, "eosncoco"); @@ -1015,6 +1248,10 @@ public class HTMLDocument_ReaderTest ext } public void testHTMLReaderInt() { + if (Support_Excludes.isExcluded()) { + return; + } + assertNotNull(reader.parseBuffer); assertEquals(0, reader.parseBuffer.size()); @@ -1023,6 +1260,10 @@ public class HTMLDocument_ReaderTest ext } public void testPushPopCharacterStyle() { + if (Support_Excludes.isExcluded()) { + return; + } + reader.charAttr.addAttribute("initial", "true"); final MutableAttributeSet attr1 = reader.charAttr; final SimpleAttributeSet attr2 = new SimpleAttributeSet(); @@ -1069,6 +1310,10 @@ public class HTMLDocument_ReaderTest ext } public void testAddContentCharArrayIntIntBoolean_Implying_Necess() { + if (Support_Excludes.isExcluded()) { + return; + } + String text = "data"; assertEquals(0, reader.parseBuffer.size()); reader.addContent(text.toCharArray(), 1, 3, true); @@ -1087,6 +1332,10 @@ public class HTMLDocument_ReaderTest ext } public void testAddContentCharArrayIntIntBoolean_Implying_Unnecess() { + if (Support_Excludes.isExcluded()) { + return; + } + String text = "data"; reader.handleStartTag(Tag.H1, new SimpleAttributeSet(), 0); assertEquals(0, reader.charAttr.getAttributeCount()); @@ -1108,6 +1357,10 @@ public class HTMLDocument_ReaderTest ext } public void testAddContentCharArrayIntIntBoolean_NotImplying() { + if (Support_Excludes.isExcluded()) { + return; + } + String text = "data"; assertEquals(0, reader.parseBuffer.size()); reader.addContent(text.toCharArray(), 1, 3, false); @@ -1123,6 +1376,10 @@ public class HTMLDocument_ReaderTest ext } public void testAddContentCharArrayIntInt_FullLength() { + if (Support_Excludes.isExcluded()) { + return; + } + assertEquals(0, reader.parseBuffer.size()); String text = "da\na"; reader.charAttr.addAttribute("aaaa", "bbbb"); @@ -1140,6 +1397,10 @@ public class HTMLDocument_ReaderTest ext } public void testAddContentCharArrayIntInt_PartLength() { + if (Support_Excludes.isExcluded()) { + return; + } + assertEquals(0, reader.parseBuffer.size()); final SimpleAttributeSet initialSet = new SimpleAttributeSet(); reader.charAttr = initialSet; @@ -1157,6 +1418,10 @@ public class HTMLDocument_ReaderTest ext } public void testAddContent_CharAttr() { + if (Support_Excludes.isExcluded()) { + return; + } + String text = "data"; assertEquals(0, reader.parseBuffer.size()); final SimpleAttributeSet initialSet = new SimpleAttributeSet(); @@ -1179,6 +1444,10 @@ public class HTMLDocument_ReaderTest ext } public void testAddSpecialElement() { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute("aaaa", "bbbb"); reader.handleStartTag(Tag.P, attr, 0); @@ -1205,18 +1474,34 @@ public class HTMLDocument_ReaderTest ext } public void testAddSpecialElement_AfterBlockOpen1() { + if (Support_Excludes.isExcluded()) { + return; + } + checkAddSpecialAfterBlockOpen(Tag.HTML, Tag.IMPLIED); } public void testAddSpecialElement_AfterBlockOpen2() { + if (Support_Excludes.isExcluded()) { + return; + } + checkAddSpecialAfterBlockOpen(Tag.HTML, Tag.I); } public void testAddSpecialElement_AfterBlockOpen3() { + if (Support_Excludes.isExcluded()) { + return; + } + checkAddSpecialAfterBlockOpen(Tag.IMG, Tag.P); } public void testAddSpecialElement_AllTagsImpliedBlockOpenCheck() { + if (Support_Excludes.isExcluded()) { + return; + } + final Tag[] allTags = HTML.getAllTags(); for (int i = 0; i < allTags.length; i++) { final Tag tag = allTags[i]; @@ -1234,6 +1519,10 @@ public class HTMLDocument_ReaderTest ext } public void testAddSpecialElement_FrameImpliedBlockOpenCheck() { + if (Support_Excludes.isExcluded()) { + return; + } + Tag specialTag = Tag.FRAME; SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute("aaaa", "bbbb"); @@ -1252,6 +1541,10 @@ public class HTMLDocument_ReaderTest ext } public void testAddSpecialElement_FrameImpliedBlockCloseCheck() { + if (Support_Excludes.isExcluded()) { + return; + } + Tag specialTag = Tag.FRAME; SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute("aaaa", "bbbb"); @@ -1300,6 +1593,10 @@ public class HTMLDocument_ReaderTest ext } public void testBlockOpen() { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute("aaaa", "bbbb"); reader.blockOpen(Tag.B, attr); @@ -1318,6 +1615,10 @@ public class HTMLDocument_ReaderTest ext } public void testBlockOpen_ImpliedAttribute() { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute("aaaa", "bbbb"); attr.addAttribute(HTMLEditorKit.ParserCallback.IMPLIED, Boolean.TRUE); @@ -1338,6 +1639,10 @@ public class HTMLDocument_ReaderTest ext } public void testBlockClose() { + if (Support_Excludes.isExcluded()) { + return; + } + reader.blockClose(Tag.B); assertEquals(0, reader.charAttr.getAttributeCount()); assertEquals(1, reader.parseBuffer.size()); @@ -1346,6 +1651,10 @@ public class HTMLDocument_ReaderTest ext } public void testBlockOpenClose() { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute("aaaa", "bbbb"); @@ -1379,6 +1688,10 @@ public class HTMLDocument_ReaderTest ext } public void testBlockOpenOpenCloseClose() { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute("aaaa", "bbbb"); @@ -1433,6 +1746,10 @@ public class HTMLDocument_ReaderTest ext } public void testBlockOpenOpenCloseClose_Implied() { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute("aaaa", "bbbb"); @@ -1483,6 +1800,10 @@ public class HTMLDocument_ReaderTest ext } public void testBlockOpenOpenCloseClose_ImpliedImplied() { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute("aaaa", "bbbb"); @@ -1533,6 +1854,10 @@ public class HTMLDocument_ReaderTest ext } public void testBlockOpenContentClose_B() { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute("aaaa", "bbbb"); @@ -1579,6 +1904,10 @@ public class HTMLDocument_ReaderTest ext } public void testBlockOpenContentClose_Implied() { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute("aaaa", "bbbb"); @@ -1623,6 +1952,10 @@ public class HTMLDocument_ReaderTest ext } public void testRegisterTag() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute(StyleConstants.NameAttribute, Tag.B.toString()); final Marker endMarker = new Marker(); @@ -1650,6 +1983,10 @@ public class HTMLDocument_ReaderTest ext } public void testPreContent() { + if (Support_Excludes.isExcluded()) { + return; + } + String text = "data"; assertEquals(0, reader.parseBuffer.size()); reader.charAttr.addAttribute("aaaa", "bbbb"); @@ -1671,6 +2008,10 @@ public class HTMLDocument_ReaderTest ext } public void testPreContent_Calls() { + if (Support_Excludes.isExcluded()) { + return; + } + final Marker contentMarker = new Marker(); doc = new HTMLDocument() { public ParserCallback getReader(int pos) { @@ -1697,6 +2038,10 @@ public class HTMLDocument_ReaderTest ext } public void testTextAreaContent() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); String text1 = "data"; String text2 = "atada"; @@ -1732,6 +2077,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleSimpleTag_Unknown() { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute("aaaa", "bbbb"); @@ -1754,6 +2103,10 @@ public class HTMLDocument_ReaderTest ext } public void testHandleStartEndTag_Unknown() { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attr = new SimpleAttributeSet(); attr.addAttribute("aaaa", "bbbb"); Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLEditorKitTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLEditorKitTest.java?rev=948377&r1=948376&r2=948377&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLEditorKitTest.java (original) +++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLEditorKitTest.java Wed May 26 09:31:07 2010 @@ -41,6 +41,7 @@ import javax.swing.text.StyleConstants; import javax.swing.text.StyledEditorKit; import javax.swing.text.ViewFactory; import javax.swing.text.html.HTMLEditorKit.InsertHTMLTextAction; +import tests.support.Support_Excludes; public class HTMLEditorKitTest extends SwingTestCase { private static final String HTML_TEXT = "thtml text"; @@ -66,16 +67,28 @@ public class HTMLEditorKitTest extends S } public void testHTMLEditorKit() { + if (Support_Excludes.isExcluded()) { + return; + } + editorKit = new HTMLEditorKit(); assertNotNull(editorKit.getActions()); } public void testClone() { + if (Support_Excludes.isExcluded()) { + return; + } + // TODO: implement } public void testCreateDefaultDocument() { + if (Support_Excludes.isExcluded()) { + return; + } + Document doc = editorKit.createDefaultDocument(); assertTrue(doc instanceof HTMLDocument); @@ -90,6 +103,10 @@ public class HTMLEditorKitTest extends S } public void testDeinstallJEditorPane() { + if (Support_Excludes.isExcluded()) { + return; + } + JEditorPane pane = new JEditorPane(); int mouseListenersCount = pane.getMouseListeners().length; int mouseMotionListenersCount = pane.getMouseMotionListeners().length; @@ -104,10 +121,18 @@ public class HTMLEditorKitTest extends S } public void testGetAccessibleContext() { + if (Support_Excludes.isExcluded()) { + return; + } + // TODO: implement } public void testGetActions() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + Action[] ancestorActions = new StyledEditorKit().getActions(); Action[] actions = editorKit.getActions(); assertEquals(12, actions.length - ancestorActions.length); @@ -127,6 +152,10 @@ public class HTMLEditorKitTest extends S } public void testNextLinkAction() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + Action action = findActionWithName( editorKit.getActions(), "next-link-action"); assertNotNull(action); @@ -148,6 +177,10 @@ public class HTMLEditorKitTest extends S } public void testPreviousLinkAction() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + Action action = findActionWithName( editorKit.getActions(), "previous-link-action"); assertNotNull(action); @@ -169,6 +202,10 @@ public class HTMLEditorKitTest extends S } public void testActivateLinkAction() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + Action action = findActionWithName( editorKit.getActions(), "activate-link-action"); assertNotNull(action); @@ -197,6 +234,10 @@ public class HTMLEditorKitTest extends S } public void testInsertHRAction() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + InsertHTMLTextAction action = (InsertHTMLTextAction)findActionWithName( editorKit.getActions(), "InsertHR"); assertNotNull(action); @@ -218,10 +259,18 @@ public class HTMLEditorKitTest extends S } public void testGetContentType() { + if (Support_Excludes.isExcluded()) { + return; + } + assertEquals("text/html", editorKit.getContentType()); } public void testGetInputAttributes() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + JEditorPane pane = new JEditorPane(); editorKit.install(pane); editorKit.read(new StringReader("normalitalic"), @@ -232,6 +281,10 @@ public class HTMLEditorKitTest extends S } public void testGetViewFactory() { + if (Support_Excludes.isExcluded()) { + return; + } + ViewFactory factory = editorKit.getViewFactory(); assertTrue(factory instanceof HTMLEditorKit.HTMLFactory); assertSame(factory, editorKit.getViewFactory()); @@ -239,6 +292,10 @@ public class HTMLEditorKitTest extends S } public void testInsertHTML() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final String HTML_TEXT2 = "_another text_"; final String HTML_TEXT3 = (""); final String INSERTION_RESULT = " \nhtml_another text_ text"; @@ -276,6 +333,10 @@ public class HTMLEditorKitTest extends S } public void testInstallJEditorPane() { + if (Support_Excludes.isExcluded()) { + return; + } + JEditorPane pane = new JEditorPane(); int mouseListenersCount = pane.getMouseListeners().length; int mouseMotionListenersCount = pane.getMouseMotionListeners().length; @@ -289,6 +350,10 @@ public class HTMLEditorKitTest extends S } public void testRead() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final StringReader in1 = new StringReader(HTML_TEXT); final StringReader in2 = new StringReader("another text"); final StringReader in3 = new StringReader(""); @@ -343,6 +408,10 @@ public class HTMLEditorKitTest extends S } public void testSetIsAutoFormSubmission() { + if (Support_Excludes.isExcluded()) { + return; + } + assertTrue(editorKit.isAutoFormSubmission()); editorKit.setAutoFormSubmission(false); @@ -350,6 +419,10 @@ public class HTMLEditorKitTest extends S } public void testSetGetDefaultCursor() { + if (Support_Excludes.isExcluded()) { + return; + } + assertSame(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR), editorKit.getDefaultCursor()); @@ -359,6 +432,10 @@ public class HTMLEditorKitTest extends S } public void testSetGetLinkCursor() { + if (Support_Excludes.isExcluded()) { + return; + } + assertSame(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR), editorKit.getLinkCursor()); @@ -368,6 +445,10 @@ public class HTMLEditorKitTest extends S } public void testSetStyleSheet() { + if (Support_Excludes.isExcluded()) { + return; + } + StyleSheet ss = new StyleSheet(); editorKit.setStyleSheet(ss); assertSame(ss, editorKit.getStyleSheet()); @@ -377,6 +458,10 @@ public class HTMLEditorKitTest extends S } public void testGetStyleSheet() { + if (Support_Excludes.isExcluded()) { + return; + } + StyleSheet ss = editorKit.getStyleSheet(); assertNotNull(ss); assertSame(ss, editorKit.getStyleSheet()); @@ -386,6 +471,10 @@ public class HTMLEditorKitTest extends S } public void testWrite() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + StringWriter writer = new StringWriter(); final String content = "Hello, World!"; final int start = 1; @@ -412,6 +501,10 @@ public class HTMLEditorKitTest extends S } public void testGetParser() { + if (Support_Excludes.isExcluded()) { + return; + } + HTMLEditorKit.Parser parser = editorKit.getParser(); assertNotNull(parser); assertSame(parser, editorKit.getParser()); @@ -419,6 +512,10 @@ public class HTMLEditorKitTest extends S } public void testCreateInputAttributes() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + document.insertAfterStart(document.getDefaultRootElement(), "bold"); Element e = document.getDefaultRootElement().getElement(0); SimpleAttributeSet attrSet = new SimpleAttributeSet(); @@ -429,6 +526,10 @@ public class HTMLEditorKitTest extends S } public void testParserCallback() { + if (Support_Excludes.isExcluded()) { + return; + } + Object implied = HTMLEditorKit.ParserCallback.IMPLIED; assertTrue(implied instanceof String); assertFalse("".equals(implied)); Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLEditorKit_HTMLTextActionTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLEditorKit_HTMLTextActionTest.java?rev=948377&r1=948376&r2=948377&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLEditorKit_HTMLTextActionTest.java (original) +++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLEditorKit_HTMLTextActionTest.java Wed May 26 09:31:07 2010 @@ -31,6 +31,7 @@ import javax.swing.text.BadLocationExcep import javax.swing.text.Element; import javax.swing.text.StyleConstants; import javax.swing.text.StyledEditorKit; +import tests.support.Support_Excludes; public class HTMLEditorKit_HTMLTextActionTest extends SwingTestCase { private static final String HTML_TEXT = "Italic text"; @@ -69,11 +70,19 @@ public class HTMLEditorKit_HTMLTextActio } public void testHTMLTextAction() { + if (Support_Excludes.isExcluded()) { + return; + } + action = new TestHTMLTextAction("actionName"); assertEquals("actionName", action.getValue(AbstractAction.NAME)); } public void testElementCountToTag() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + loadHTML(); final int offset = editorPane.getDocument().getLength(); @@ -88,6 +97,10 @@ public class HTMLEditorKit_HTMLTextActio } public void testFindElementMatchingTag() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + loadHTML(); final int offset = editorPane.getDocument().getLength(); Element[] elems = action.getElementsAt(document, offset); @@ -106,6 +119,10 @@ public class HTMLEditorKit_HTMLTextActio } public void testGetElementsAt() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + loadHTML(); final int offset = editorPane.getDocument().getLength(); @@ -127,11 +144,19 @@ public class HTMLEditorKit_HTMLTextActio } public void testGetHTMLDocument() { + if (Support_Excludes.isExcluded()) { + return; + } + assertSame(editorPane.getDocument(), action.getHTMLDocument(editorPane)); } public void testGetHTMLEditorKit() { + if (Support_Excludes.isExcluded()) { + return; + } + assertSame(editorPane.getEditorKit(), action.getHTMLEditorKit(editorPane)); Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLEditorKit_InsertHTMLTextActionTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLEditorKit_InsertHTMLTextActionTest.java?rev=948377&r1=948376&r2=948377&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLEditorKit_InsertHTMLTextActionTest.java (original) +++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLEditorKit_InsertHTMLTextActionTest.java Wed May 26 09:31:07 2010 @@ -23,6 +23,7 @@ import javax.swing.AbstractAction; import javax.swing.JEditorPane; import javax.swing.SwingTestCase; import javax.swing.text.BadLocationException; +import tests.support.Support_Excludes; public class HTMLEditorKit_InsertHTMLTextActionTest extends SwingTestCase { private final String name = "name"; @@ -59,6 +60,10 @@ public class HTMLEditorKit_InsertHTMLTex } public void testInsertHTMLTextActionStringStringTagTagTagTag() { + if (Support_Excludes.isExcluded()) { + return; + } + action = new HTMLEditorKit.InsertHTMLTextAction(name, html, parentTag, addTag, alternateParentTag, @@ -72,6 +77,10 @@ public class HTMLEditorKit_InsertHTMLTex } public void testInsertHTMLTextActionStringStringTagTag() { + if (Support_Excludes.isExcluded()) { + return; + } + action = new HTMLEditorKit.InsertHTMLTextAction(name, html, parentTag, addTag); assertSame(name, action.getValue(AbstractAction.NAME)); @@ -83,11 +92,19 @@ public class HTMLEditorKit_InsertHTMLTex } public void testActionPerformed() { + if (Support_Excludes.isExcluded()) { + return; + } + action.actionPerformed(null); // TODO: implement } public void testInsertHTML() throws BadLocationException { + if (Support_Excludes.isExcluded()) { + return; + } + action.insertHTML(pane, document, 0, html, 0, 0, addTag); assertEquals("html text", document.getText(0, document.getLength())); @@ -103,6 +120,10 @@ public class HTMLEditorKit_InsertHTMLTex } public void testInsertAtBoundary() { + if (Support_Excludes.isExcluded()) { + return; + } + // TODO: implement } } Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLWriterTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLWriterTest.java?rev=948377&r1=948376&r2=948377&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLWriterTest.java (original) +++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLWriterTest.java Wed May 26 09:31:07 2010 @@ -31,6 +31,7 @@ import javax.swing.text.Element; import javax.swing.text.SimpleAttributeSet; import javax.swing.text.StyleConstants; import javax.swing.text.StyledEditorKit; +import tests.support.Support_Excludes; public class HTMLWriterTest extends SwingTestCase { private static final String HTML_TEXT = "normal bold"; @@ -97,6 +98,10 @@ public class HTMLWriterTest extends Swin } public void testWrite() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + final String content = "\n" + " \n" + " \n" @@ -117,6 +122,10 @@ public class HTMLWriterTest extends Swin } public void testWriteLineSeparator() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + doc.putProperty(StyledEditorKit.EndOfLineStringProperty, "`"); writer = new TestHTMLWriter(out, doc); writer.writeLineSeparator(); @@ -128,6 +137,10 @@ public class HTMLWriterTest extends Swin } public void testOutput() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + String content = "abcComponent2\n"; createDocument(content); @@ -333,6 +390,10 @@ public class HTMLWriterTest extends Swin } public void testTextAreaContent() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + String content = ""; createDocument(content); @@ -346,6 +407,10 @@ public class HTMLWriterTest extends Swin } public void testWriteAttributes() throws IOException { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attrs = new SimpleAttributeSet(); attrs.addAttribute(HTML.Tag.H1, HTML.Tag.H2); attrs.addAttribute(StyleConstants.Bold, StyleConstants.Bold); @@ -358,6 +423,10 @@ public class HTMLWriterTest extends Swin } public void testWriteEmbeddedTags() throws IOException { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attrs = new SimpleAttributeSet(); attrs.addAttribute(HTML.Tag.I, HTML.Tag.B); attrs.addAttribute(HTML.Tag.H1, HTML.Tag.H2); @@ -369,6 +438,10 @@ public class HTMLWriterTest extends Swin } public void testCloseOutUnwantedEmbeddedTags() throws IOException { + if (Support_Excludes.isExcluded()) { + return; + } + SimpleAttributeSet attrs = new SimpleAttributeSet(); attrs.addAttribute(HTML.Tag.I, HTML.Tag.B); attrs.addAttribute(HTML.Tag.H1, HTML.Tag.H2); @@ -390,6 +463,10 @@ public class HTMLWriterTest extends Swin } public void testWriteOption() throws IOException { + if (Support_Excludes.isExcluded()) { + return; + } + writer.incrIndent(); SimpleAttributeSet attrs = new SimpleAttributeSet(); Option option = new Option(attrs); @@ -424,6 +501,10 @@ public class HTMLWriterTest extends Swin } public void testWriteDocumentBase() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + if (!isHarmony()) { return; } Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/InlineViewTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/InlineViewTest.java?rev=948377&r1=948376&r2=948377&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/InlineViewTest.java (original) +++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/InlineViewTest.java Wed May 26 09:31:07 2010 @@ -38,6 +38,7 @@ import javax.swing.text.TabExpander; import javax.swing.text.View; import javax.swing.text.GlyphView.GlyphPainter; import javax.swing.text.Position.Bias; +import tests.support.Support_Excludes; public class InlineViewTest extends BasicSwingTestCase { public static class FixedPainter extends GlyphPainter { @@ -132,11 +133,19 @@ public class InlineViewTest extends Basi } public void testInlineView() { + if (Support_Excludes.isExcluded()) { + return; + } + assertSame(inline, view.getElement()); assertNotSame(inline.getAttributes(), view.getAttributes()); } public void testInlineViewUponParagraph() throws BadLocationException { + if (Support_Excludes.isExcluded()) { + return; + } + final Element paragraph = doc.getParagraphElement(20); view = new InlineView(paragraph); assertSame(paragraph, view.getElement()); @@ -144,6 +153,10 @@ public class InlineViewTest extends Basi } public void testInlineViewUponStyledDocument() throws BadLocationException { + if (Support_Excludes.isExcluded()) { + return; + } + final StyledDocument styledDoc = new DefaultStyledDocument(); styledDoc.insertString(0, "a simple paragraph", null); inline = styledDoc.getCharacterElement(1); @@ -159,6 +172,10 @@ public class InlineViewTest extends Basi } public void testGetAttributes() { + if (Support_Excludes.isExcluded()) { + return; + } + assertEquals(2, attrs.getAttributeCount()); assertEquals("italic", attrs.getAttribute(CSS.Attribute.FONT_STYLE).toString()); @@ -169,6 +186,10 @@ public class InlineViewTest extends Basi } public void testGetAttributesUpdate() { + if (Support_Excludes.isExcluded()) { + return; + } + assertEquals(2, attrs.getAttributeCount()); assertEquals("italic", attrs.getAttribute(CSS.Attribute.FONT_STYLE).toString()); @@ -183,6 +204,10 @@ public class InlineViewTest extends Basi } public void testGetAttributesStyleSheet() { + if (Support_Excludes.isExcluded()) { + return; + } + final Marker ssMarker = new Marker(); view = new InlineView(inline) { protected StyleSheet getStyleSheet() { @@ -197,10 +222,18 @@ public class InlineViewTest extends Basi } public void testGetAttributesSame() { + if (Support_Excludes.isExcluded()) { + return; + } + assertSame(attrs, view.getAttributes()); } public void testGetBreakWeight() throws BadLocationException { + if (Support_Excludes.isExcluded()) { + return; + } + view.setGlyphPainter(new FixedPainter()); assertNull(attrs.getAttribute(CSS.Attribute.WHITE_SPACE)); @@ -222,6 +255,10 @@ public class InlineViewTest extends Basi } public void testGetBreakWeightNowrap() throws BadLocationException { + if (Support_Excludes.isExcluded()) { + return; + } + view.setGlyphPainter(new FixedPainter()); assertNull(attrs.getAttribute(CSS.Attribute.WHITE_SPACE)); @@ -247,6 +284,10 @@ public class InlineViewTest extends Basi } public void testBreakView() throws BadLocationException { + if (Support_Excludes.isExcluded()) { + return; + } + view.setGlyphPainter(new FixedPainter()); assertNull(attrs.getAttribute(CSS.Attribute.WHITE_SPACE)); @@ -270,6 +311,10 @@ public class InlineViewTest extends Basi } public void testBreakViewNowrap() { + if (Support_Excludes.isExcluded()) { + return; + } + view.setGlyphPainter(new FixedPainter()); doc.getStyleSheet().addRule("em { white-space: nowrap }"); view.setPropertiesFromAttributes(); @@ -301,6 +346,10 @@ public class InlineViewTest extends Basi } public void testChangedUpdate() { + if (Support_Excludes.isExcluded()) { + return; + } + final Marker prefChanged = new Marker(); final Marker setProps = new Marker(); view = new InlineView(inline) { @@ -327,6 +376,10 @@ public class InlineViewTest extends Basi } public void testChangedUpdateAttributes() { + if (Support_Excludes.isExcluded()) { + return; + } + final Marker viewAttrMarker = new Marker(true); final StyleSheet ss = new StyleSheet() { public AttributeSet getViewAttributes(final View v) { @@ -348,6 +401,10 @@ public class InlineViewTest extends Basi } public void testInsertUpdate() { + if (Support_Excludes.isExcluded()) { + return; + } + final Marker prefChanged = new Marker(); final Marker setProps = new Marker(); view = new InlineView(inline) { @@ -374,6 +431,10 @@ public class InlineViewTest extends Basi } public void testRemoveUpdate() { + if (Support_Excludes.isExcluded()) { + return; + } + final Marker prefChanged = new Marker(); final Marker setProps = new Marker(); view = new InlineView(inline) { @@ -400,6 +461,10 @@ public class InlineViewTest extends Basi } public void testSetPropertiesFromAttributes() { + if (Support_Excludes.isExcluded()) { + return; + } + assertTrue(view.getFont().isItalic()); assertFalse(view.isUnderline()); doc.getStyleSheet().addRule("em { text-decoration: underline }"); @@ -409,6 +474,10 @@ public class InlineViewTest extends Basi } public void testSetPropertiesFromAttributesBoxPainter() { + if (Support_Excludes.isExcluded()) { + return; + } + final Marker boxMarker = new Marker(); final Marker listMarker = new Marker(); final StyleSheet ss = new StyleSheet() { @@ -434,6 +503,10 @@ public class InlineViewTest extends Basi } public void testSetPropertiesFromAttributesAttributes() { + if (Support_Excludes.isExcluded()) { + return; + } + final Marker verticalAlign = new Marker(); final Marker textDecoration = new Marker(); final Marker whiteSpace = new Marker(); @@ -469,6 +542,10 @@ public class InlineViewTest extends Basi } public void testGetStyleSheet() { + if (Support_Excludes.isExcluded()) { + return; + } + assertSame(doc.getStyleSheet(), view.getStyleSheet()); } Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/ParagraphView_RequirementsTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/ParagraphView_RequirementsTest.java?rev=948377&r1=948376&r2=948377&view=diff ============================================================================== --- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/ParagraphView_RequirementsTest.java (original) +++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/ParagraphView_RequirementsTest.java Wed May 26 09:31:07 2010 @@ -30,6 +30,7 @@ import javax.swing.text.PlainView; import javax.swing.text.View; import javax.swing.text.ViewFactory; import javax.swing.text.html.ParagraphViewTest.ParagraphViewImpl; +import tests.support.Support_Excludes; /** * Tests calculateMinorAxisRequirements method. @@ -71,6 +72,10 @@ public class ParagraphView_RequirementsT } public void testCalculateMinorAxisRequirements01() { + if (Support_Excludes.isExcluded()) { + return; + } + view = new ParagraphViewImpl(doc.getParagraphElement(10), factory); SizeRequirements sr = view.calculateMinorAxisRequirements(View.X_AXIS, null); @@ -80,6 +85,10 @@ public class ParagraphView_RequirementsT } public void testCalculateMinorAxisRequirements02() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + view = new ParagraphViewImpl(doc.getParagraphElement(20), factory); SizeRequirements sr = view.calculateMinorAxisRequirements(View.X_AXIS, null); @@ -89,6 +98,10 @@ public class ParagraphView_RequirementsT } public void testCalculateMinorAxisRequirements03() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + factory = new ViewFactory() { public View create(Element element) { LabelView result = new LabelView(element); @@ -118,6 +131,10 @@ public class ParagraphView_RequirementsT } public void testCalculateMinorAxisRequirements04() throws Exception { + if (Support_Excludes.isExcluded()) { + return; + } + factory = new ViewFactory() { public View create(Element element) { PlainView result = new PlainView(element) {