You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/06/05 10:35:05 UTC
svn commit: r951676 [17/20] - 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/auth/make/ classli...
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StringContentTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StringContentTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StringContentTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StringContentTest.java Sat Jun 5 08:34:57 2010
@@ -24,7 +24,6 @@ import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
import java.util.Vector;
import javax.swing.undo.UndoableEdit;
-import tests.support.Support_Excludes;
/**
* Tests StringContent class.
@@ -44,10 +43,6 @@ public class StringContentTest extends A
@Override
public void testGetCharsNegativeLength() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
if (isHarmony()) {
testExceptionalCase(new BadLocationCase() {
@Override
@@ -70,10 +65,6 @@ public class StringContentTest extends A
@Override
public void testGetCharsPartial() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
obj.insertString(10, "big ");
text.setPartialReturn(true);
obj.getChars(8, 10, text);
@@ -82,10 +73,6 @@ public class StringContentTest extends A
@Override
public void testGetStringNegativeLength() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
if (isHarmony()) {
testExceptionalCase(new BadLocationCase() {
@Override
@@ -109,10 +96,6 @@ public class StringContentTest extends A
}
public void testStringContent() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
content = new StringContent();
assertEquals(1, content.length());
content.getChars(0, content.length(), text);
@@ -121,10 +104,6 @@ public class StringContentTest extends A
}
public void testStringContent_WithValidValues() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
content = new StringContent(20);
assertEquals(1, content.length());
content.getChars(0, content.length(), text);
@@ -133,10 +112,6 @@ public class StringContentTest extends A
}
public void testStringContent_WithInvalidValues() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
content = new StringContent(0);
assertEquals(1, content.length());
content.getChars(0, content.length(), text);
@@ -145,10 +120,6 @@ public class StringContentTest extends A
}
public void testCreatePositionBeforeUndo() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
UndoableEdit undoable;
content = new StringContent(10);
content.insertString(0, "0123456789");
@@ -168,10 +139,6 @@ public class StringContentTest extends A
}
public void testCreatePositionAfterUndone() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
UndoableEdit undoable;
content = new StringContent(10);
content.insertString(0, "0123456789");
@@ -186,10 +153,6 @@ public class StringContentTest extends A
}
public void testCreatePositionAfterInsert() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
UndoableEdit undoable;
content = new StringContent(10);
content.insertString(0, "0123456789");
@@ -203,10 +166,6 @@ public class StringContentTest extends A
}
public void testCreatePosition_WithInvalidValues() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
content = new StringContent(10);
content.insertString(0, "012345");
if (isHarmony()) {
@@ -228,10 +187,6 @@ public class StringContentTest extends A
}
public void testGetChars_WithValidValues() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
content = new StringContent();
content.getChars(0, 1, text);
content.getChars(0, 0, text);
@@ -241,10 +196,6 @@ public class StringContentTest extends A
}
public void testGetChars_WithInvalidValues() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
content = new StringContent();
if (isHarmony()) {
testExceptionalCase(new BadLocationCase() {
@@ -285,10 +236,6 @@ public class StringContentTest extends A
}
public void testGetPositionsInRangeVector() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Vector<Object> v = new Vector<Object>();
v.add(new Object());
v.add(new Object());
@@ -306,29 +253,17 @@ public class StringContentTest extends A
}
public void testGetPositionsInRange() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
content.createPosition(10);
Vector<?> v = content.getPositionsInRange(null, 0, 10);
assertEquals(1, v.size());
}
public void testGetString_WithValidValues() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
content.getString(0, 0);
content.getString(0, content.length());
}
public void testGetString_WithInValidValues() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
testExceptionalCase(new BadLocationCase() {
@Override
public void exceptionalAction() throws Exception {
@@ -374,10 +309,6 @@ public class StringContentTest extends A
}
public void testInsertString_WithValidValues() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
UndoableEdit ue = content.insertString(2, "^^^");
assertNotNull(ue);
content.getChars(0, content.length(), text);
@@ -390,10 +321,6 @@ public class StringContentTest extends A
}
public void testInsertString_WithInvalidValues() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
content = new StringContent();
testExceptionalCase(new BadLocationCase() {
@Override
@@ -416,10 +343,6 @@ public class StringContentTest extends A
}
public void testInsertString_UndoableEdit() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
UndoableEdit undoable;
final String redoName = isHarmony() ? "Redo addition" : "Redo";
final String undoName = isHarmony() ? "Undo addition" : "Undo";
@@ -440,10 +363,6 @@ public class StringContentTest extends A
}
public void testRemove_WithValidValues() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
content = new StringContent();
content.insertString(0, "012345^11111");
content.getChars(0, content.length(), text);
@@ -468,10 +387,6 @@ public class StringContentTest extends A
}
public void testRemove_UndoableEdit() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
UndoableEdit undoable = content.remove(2, 3);
final String redoName = isHarmony() ? "Redo deletion" : "Redo";
final String undoName = isHarmony() ? "Undo deletion" : "Undo";
@@ -496,10 +411,6 @@ public class StringContentTest extends A
}
public void testRemove_WithInvalidValues() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
content = new StringContent();
content.insertString(0, "012345^11111");
content.getChars(0, content.length(), text);
@@ -518,10 +429,6 @@ public class StringContentTest extends A
}
public void testPositionGC() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Vector<WeakReference<Position>> pos = new Vector<WeakReference<Position>>(10);
ReferenceQueue<Position> rq = new ReferenceQueue<Position>();
for (int i = 0; i < content.length(); i += 2) {
@@ -544,10 +451,6 @@ public class StringContentTest extends A
}
public void testLength_ForStringContent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
content = new StringContent();
assertEquals(1, content.length());
content.insertString(0, " Hello word ");
@@ -579,10 +482,6 @@ public class StringContentTest extends A
}
public void testInnerContentSize() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
content = new StringContent(30);
insertStringManyTimes("a", 160, content);
content.getChars(0, content.length(), text);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StringContentTest_CommonTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StringContentTest_CommonTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StringContentTest_CommonTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StringContentTest_CommonTest.java Sat Jun 5 08:34:57 2010
@@ -22,7 +22,6 @@ package javax.swing.text;
import java.util.Vector;
import javax.swing.BasicSwingTestCase;
import javax.swing.undo.UndoableEdit;
-import tests.support.Support_Excludes;
public class StringContentTest_CommonTest extends GapContentTest {
@Override
@@ -34,10 +33,6 @@ public class StringContentTest_CommonTes
@Override
public void testGetCharsImpliedCharPartial() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
obj = content = new StringContent();
assertEquals(1, content.length());
text.setPartialReturn(false);
@@ -50,10 +45,6 @@ public class StringContentTest_CommonTes
@Override
public void testGetPositionsInRangeVector() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Vector<Object> v = new Vector<Object>();
v.add(new Object());
v.add(new Object());
@@ -76,10 +67,6 @@ public class StringContentTest_CommonTes
*/
@Override
public void testGetPositionsInRangeEnd() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
content.createPosition(10);
Vector<?> v = ((StringContent) content).getPositionsInRange(null, 0, 10);
assertEquals(1, v.size());
@@ -87,10 +74,6 @@ public class StringContentTest_CommonTes
@Override
public void testGetPositionsInRange() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Vector<Position> pos = new Vector<Position>();
for (int i = 0; i < content.length(); i += 2) {
Position p = content.createPosition(i);
@@ -113,91 +96,51 @@ public class StringContentTest_CommonTes
@Override
public void testGetCharsNegativeLength() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
// Is Already tested in StringContentTest
}
@Override
public void testGetCharsAfterGapNoImplied() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
// N/A
}
@Override
public void testGetCharsAfterGap() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
// N/A
}
@Override
public void testGetCharsBeforeGap() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
// N/A
}
@Override
public void testGetCharsFullLength() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
// N/A
}
@Override
public void testGetCharsFullActualLength() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
// N/A
}
@Override
public void testGetCharsImpliedChar() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
// N/A
}
@Override
public void testGetCharsPartial() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
// N/A
}
@Override
public void testGetCharsWithGap() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
// N/A
}
@Override
public void testGetStringNegativeLength() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
// Is Already tested in StringContentTest
}
}
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StyleContextTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StyleContextTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StyleContextTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StyleContextTest.java Sat Jun 5 08:34:57 2010
@@ -29,7 +29,6 @@ import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.text.StyleContext.SmallAttributeSet;
import junit.framework.TestCase;
-import tests.support.Support_Excludes;
public class StyleContextTest extends TestCase implements ChangeListener {
/**
@@ -145,10 +144,6 @@ public class StyleContextTest extends Te
* contain exactly one style (default).
*/
public void testStyleContext() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
int count = 0;
Enumeration<?> names = sc.getStyleNames();
Object name = null;
@@ -161,10 +156,6 @@ public class StyleContextTest extends Te
}
public void testCollectGarbageInCache() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
if (!BasicSwingTestCase.isHarmony()) {
// This is internal test only
return;
@@ -191,10 +182,6 @@ public class StyleContextTest extends Te
}
public void testCollectGarbageInCacheFont() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
if (!BasicSwingTestCase.isHarmony()) {
// This is internal test only
return;
@@ -216,10 +203,6 @@ public class StyleContextTest extends Te
}
public void testAddStyle() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Style aStyle = sc.addStyle("aStyle", null);
Style anotherStyle = sc.addStyle("anotherStyle", aStyle);
int count = 0;
@@ -259,10 +242,6 @@ public class StyleContextTest extends Te
}
public void testAddStyleMisc() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
// Add styles with diff parameters
Object[] styles = { null, null, "one", null, null, sc.new NamedStyle(), "two",
sc.new NamedStyle() };
@@ -274,10 +253,6 @@ public class StyleContextTest extends Te
}
public void testAddStyleTwice() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
final String styleName = "styleName";
final Style style = sc.addStyle(styleName, null);
final Style another = sc.addStyle(styleName, null);
@@ -286,10 +261,6 @@ public class StyleContextTest extends Te
}
public void testCreateSmallAttributeSet() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
AttributeSet as = sc.createSmallAttributeSet(sc.getEmptySet());
assertTrue(as instanceof SmallAttributeSet);
assertEquals(0, as.getAttributeCount());
@@ -297,10 +268,6 @@ public class StyleContextTest extends Te
}
public void testGetStyle() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Style style = sc.getStyle("default");
assertEquals("default", style.getName());
sc.addStyle("aStyle", style);
@@ -310,29 +277,17 @@ public class StyleContextTest extends Te
}
public void testCreateLargeAttributeSet() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
AttributeSet as = sc.createLargeAttributeSet(new SimpleAttributeSet());
assertTrue(as instanceof SimpleAttributeSet);
}
public void testGetEmptySet() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertSame(sc.getEmptySet(), sc.getEmptySet());
assertEquals(0, sc.getEmptySet().getAttributeCount());
}
// test {add,remove}ChangeListener while adding styles
public void testChangeListenerAddStyle() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
bStateChanged = false;
sc.addStyle("one", null);
assertFalse(bStateChanged);
@@ -348,10 +303,6 @@ public class StyleContextTest extends Te
// test if a listener gets called when adding style with null name
public void testChangeListenerAddStyleNull() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
sc.addChangeListener(this);
bStateChanged = false;
sc.addStyle(null, StyleContext.getDefaultStyleContext().new NamedStyle());
@@ -370,10 +321,6 @@ public class StyleContextTest extends Te
// test {add,remove}ChangeListener while removing styles
public void testChangeListenerRemoveStyle() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
sc.addStyle("one", null);
sc.addStyle("two", null);
sc.addStyle("three", null);
@@ -391,10 +338,6 @@ public class StyleContextTest extends Te
}
public void testGetChangeListeners() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
ChangeListener[] listeners = sc.getChangeListeners();
assertEquals(0, listeners.length);
sc.addChangeListener(this);
@@ -406,10 +349,6 @@ public class StyleContextTest extends Te
}
public void testGetStyleNamesDef() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
boolean wasDefault = false;
int count = 0;
Enumeration<?> names = sc.getStyleNames();
@@ -423,10 +362,6 @@ public class StyleContextTest extends Te
}
public void testGetStyleNames() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
sc.addStyle("style", null);
boolean wasDefault = false;
boolean wasStyle = false;
@@ -444,10 +379,6 @@ public class StyleContextTest extends Te
}
public void testRemoveStyle() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
sc.addStyle("style", null);
sc.removeStyle("style");
boolean wasDefault = false;
@@ -466,10 +397,6 @@ public class StyleContextTest extends Te
}
public void testToString() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Style style = sc.getStyle(StyleContext.DEFAULT_STYLE);
style.addAttribute(StyleConstants.Bold, Boolean.TRUE);
style.addAttribute(StyleConstants.Italic, Boolean.FALSE);
@@ -529,18 +456,10 @@ public class StyleContextTest extends Te
}
public void testGetCompressionThreshold() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertEquals(9, sc.getCompressionThreshold());
}
public void testGetDefaultStyleContext() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
StyleContext def;
assertSame(def = StyleContext.getDefaultStyleContext(), StyleContext
.getDefaultStyleContext());
@@ -589,10 +508,6 @@ public class StyleContextTest extends Te
}
public void testCaching() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
StyleContextX sc = new StyleContextX();
int addStyle = sc.count;
sc.addStyle("aStyle", null);
@@ -605,10 +520,6 @@ public class StyleContextTest extends Te
/*
public void testReclaim() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
}
*/
public void stateChanged(final ChangeEvent event) {
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StyledEditorKitTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StyledEditorKitTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StyledEditorKitTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StyledEditorKitTest.java Sat Jun 5 08:34:57 2010
@@ -25,7 +25,6 @@ import javax.swing.Action;
import javax.swing.JEditorPane;
import javax.swing.SwingTestCase;
import javax.swing.event.ChangeListener;
-import tests.support.Support_Excludes;
public class StyledEditorKitTest extends SwingTestCase {
StyledEditorKit kit;
@@ -97,27 +96,15 @@ public class StyledEditorKitTest extends
}
public void testStyledEditorKit() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
}
public void testClone() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Object kit1 = kit.clone();
assertNotSame(kit1, kit);
assertTrue(kit1 instanceof StyledEditorKit);
}
public void testGetActions() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Action[] actions = kit.getActions();
Action[] superActions = new DefaultEditorKit().getActions();
Action[] newActions = new Action[] {
@@ -176,10 +163,6 @@ public class StyledEditorKitTest extends
}
public void testCreateDefaultDocument() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Document doc1 = kit.createDefaultDocument();
Document doc2 = kit.createDefaultDocument();
String className = "javax.swing.text.DefaultStyledDocument";
@@ -209,10 +192,6 @@ public class StyledEditorKitTest extends
}
public void testCreateInputAttributes() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
SimpleAttributeSet sas = createAttributeSet();
SimpleElement element = new SimpleElement("");
element.setAttributeSet(sas);
@@ -226,17 +205,9 @@ public class StyledEditorKitTest extends
}
public void testDeinstallJEditorPane() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
}
public void testGetCharacterAttributeRun() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
SimpleAttributeSet set = createAttributeSet();
JEditorPane jep = new JEditorPane();
DefaultStyledDocument doc = new DefaultStyledDocument();
@@ -253,10 +224,6 @@ public class StyledEditorKitTest extends
}
public void testGetInputAttributes() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
SimpleAttributeSet set = createAttributeSet();
JEditorPane jep = new JEditorPane();
DefaultStyledDocument doc = new DefaultStyledDocument();
@@ -277,10 +244,6 @@ public class StyledEditorKitTest extends
}
public void testGetInputAttributesNoComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
final AttributeSet as = kit.getInputAttributes();
assertNotNull(as);
assertEquals(0, as.getAttributeCount());
@@ -296,10 +259,6 @@ public class StyledEditorKitTest extends
}
public void testGetViewFactory() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
ViewFactory factory = kit.getViewFactory();
Element element = new SimpleElement(AbstractDocument.ContentElementName);
assertEquals("javax.swing.text.LabelView", factory.create(element).getClass().getName());
@@ -322,10 +281,6 @@ public class StyledEditorKitTest extends
}
public void testInstallJEditorPane() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
}
@@ -334,10 +289,6 @@ public class StyledEditorKitTest extends
* Regression test for HARMONY-2594
* */
public void testcreateInputAttributes() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
MyStyledEditorKit msek = new MyStyledEditorKit();
MutableAttributeSet set = new Style() {
public void removeChangeListener(ChangeListener p0) {
@@ -407,10 +358,6 @@ public class StyledEditorKitTest extends
* Regression test for HARMONY-2594
* */
public void testCreateInputAttributes2() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
MyStyledEditorKit msek = new MyStyledEditorKit();
try {
msek.createInputAttributes(new SimpleElement(""), null);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/TextAction_MultithreadedTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/TextAction_MultithreadedTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/TextAction_MultithreadedTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/TextAction_MultithreadedTest.java Sat Jun 5 08:34:57 2010
@@ -29,7 +29,6 @@ import javax.swing.JTextArea;
import javax.swing.JTextField;
import javax.swing.SwingWaitTestCase;
import junit.framework.TestCase;
-import tests.support.Support_Excludes;
public class TextAction_MultithreadedTest extends TestCase {
JDialog window1;
@@ -61,10 +60,6 @@ public class TextAction_MultithreadedTes
}
public void testGetFocusedComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
TextAction action = new TextAction("") {
private static final long serialVersionUID = 1L;
@@ -99,10 +94,6 @@ public class TextAction_MultithreadedTes
}
public void testGetTextComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
TextAction action = new TextAction("") {
private static final long serialVersionUID = 1L;
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/UtilitiesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/UtilitiesTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/UtilitiesTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/UtilitiesTest.java Sat Jun 5 08:34:57 2010
@@ -31,7 +31,6 @@ import javax.swing.JTextArea;
import javax.swing.JTextField;
import javax.swing.SwingTestCase;
import javax.swing.plaf.basic.BasicTextUI;
-import tests.support.Support_Excludes;
public class UtilitiesTest extends SwingTestCase {
JTextComponent textComponent;
@@ -226,10 +225,6 @@ public class UtilitiesTest extends Swing
}
public void testDrawTabbedText() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
drawTabbedTextTest(jta);
drawTabbedTextTest(jtf);
//drawTabbedTextTest(jtp);
@@ -265,10 +260,6 @@ public class UtilitiesTest extends Swing
}
public void testGetTabbedTextWidth() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
getTabbedTextWidthTest(jta);
getTabbedTextWidthTest(jtf);
//getTabbedTextWidthTest(jtp);
@@ -338,10 +329,6 @@ public class UtilitiesTest extends Swing
}
public void testGetTabbedTextOffsetRound_BoundaryCases() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
getTabbedTextOffsetRoundTest_BoundaryCases(jta);
getTabbedTextOffsetRoundTest_BoundaryCases(jtf);
//getTabbedTextOffsetRoundTest(jtp);
@@ -375,10 +362,6 @@ public class UtilitiesTest extends Swing
}
public void testGetTabbedTextOffsetRound() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
getTabbedTextOffsetRoundTest(jta);
getTabbedTextOffsetRoundTest(jtf);
//getTabbedTextOffsetRoundTest(jtp);
@@ -413,10 +396,6 @@ public class UtilitiesTest extends Swing
}
public void testGetTabbedTextOffsetRound_NoTabExpander() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
getTabbedTextOffsetRoundTest_NoTabExpander(jta);
getTabbedTextOffsetRoundTest_NoTabExpander(jtf);
//getTabbedTextOffsetRoundTest_NoTabExpander(jtp);
@@ -450,10 +429,6 @@ public class UtilitiesTest extends Swing
}
public void testGetTabbedTextOffset() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
getTabbedTextOffsetTest(jta);
getTabbedTextOffsetTest(jtf);
//getTabbedTextOffsetTest(jtp);
@@ -509,10 +484,6 @@ public class UtilitiesTest extends Swing
}
public void testGetBreakLocation() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
if (isHarmony()) {
getBreakLocationTest(jta);
}
@@ -540,10 +511,6 @@ public class UtilitiesTest extends Swing
}
public void testGetParagraphElement() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
getParagraphElementTest(jta);
//getParagraphElementTest(jtp);
getParagraphElementTest(jtf);
@@ -658,10 +625,6 @@ public class UtilitiesTest extends Swing
}
public void testGetPositionAboveBelow() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
getPositionAboveBelowTest(jta);
//getPositionAboveBelowTest(jtp);
getPositionAboveBelowTest(jtf);
@@ -669,20 +632,12 @@ public class UtilitiesTest extends Swing
// HARMONY-2745
public void testGetPositionAbove() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
jta = new JTextArea();
assertEquals(-1, Utilities.getPositionAbove(jta, 1, 0));
}
// HARMONY-2745
public void testGetPositionBelow() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
jta = new JTextArea();
assertEquals(-1, Utilities.getPositionBelow(jta, 1, 0));
}
@@ -730,10 +685,6 @@ public class UtilitiesTest extends Swing
}
public void testGetWordStart() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
getWordStartTest(jta);
//getWordStartTest(jtp);
getWordStartTest(jtf);
@@ -776,10 +727,6 @@ public class UtilitiesTest extends Swing
}
public void testGetWordEnd() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
getWordEndTest(jta);
//getWordEndTest(jtp);
getWordEndTest(jtf);
@@ -881,10 +828,6 @@ public class UtilitiesTest extends Swing
}
public void testGetRowStartEnd() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
getRowStartEndTest(jta);
//getRowStartEndTest(jtp);
getRowStartEndTest(jtf);
@@ -937,10 +880,6 @@ public class UtilitiesTest extends Swing
}
public void testGetPreviousWord() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
getPreviousWordTest(jta);
//getPreviousWordTest(jtp);
getPreviousWordTest(jtf);
@@ -995,10 +934,6 @@ public class UtilitiesTest extends Swing
}
public void testGetNextWord() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
getNextWordTest(jta);
getNextWordTest(jtf);
//getNextWordTest(jtp);
@@ -1006,10 +941,6 @@ public class UtilitiesTest extends Swing
// HARMONY-2744
public void testGetNextWord02() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
jta = new JTextArea("");
try {
Utilities.getNextWord(jta, 0);
@@ -1021,10 +952,6 @@ public class UtilitiesTest extends Swing
// HARMONY-2744
public void testGetNextWord03() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
jta = new JTextArea("a");
try {
Utilities.getNextWord(jta, 0);
@@ -1043,10 +970,6 @@ public class UtilitiesTest extends Swing
// HARMONY-2744
public void testGetNextWord04() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
jta = new JTextArea("a b");
assertEquals(2, Utilities.getNextWord(jta, 0));
assertEquals(2, Utilities.getNextWord(jta, 1));
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_ForwardUpdateRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_ForwardUpdateRTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_ForwardUpdateRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_ForwardUpdateRTest.java Sat Jun 5 08:34:57 2010
@@ -30,7 +30,6 @@ import javax.swing.text.CompositeView_Mo
import javax.swing.text.CompositeView_ModelViewTest.WithChildrenView;
import javax.swing.text.Position.Bias;
import junit.framework.TestCase;
-import tests.support.Support_Excludes;
public class View_ForwardUpdateRTest extends TestCase {
private class ParentView extends WithChildrenView {
@@ -168,10 +167,6 @@ public class View_ForwardUpdateRTest ext
private List<View> viewsForwardedTo = new ArrayList<View>();
public void testForwardUpdate01() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
doc = new PlainDocument();
doc.insertString(doc.getLength(), "line1", null);
doc.insertString(doc.getLength(), "\nline2", null);
@@ -207,10 +202,6 @@ public class View_ForwardUpdateRTest ext
}
public void testForwardUpdate02() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
initStyledDocument();
final MutableAttributeSet fontSize = new SimpleAttributeSet();
StyleConstants.setFontSize(fontSize, 36);
@@ -237,10 +228,6 @@ public class View_ForwardUpdateRTest ext
}
public void testForwardUpdate03() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
initStyledDocument();
final List<View> expected = new ArrayList<View>();
// We will use the view for the second paragraph
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_NextVisualPositionFromTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_NextVisualPositionFromTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_NextVisualPositionFromTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_NextVisualPositionFromTest.java Sat Jun 5 08:34:57 2010
@@ -26,7 +26,6 @@ import javax.swing.JTextArea;
import javax.swing.SwingConstants;
import javax.swing.SwingTestCase;
import javax.swing.text.Position.Bias;
-import tests.support.Support_Excludes;
/**
* Tests default implementation of View.getNextVisualPositionFrom method.
@@ -63,10 +62,6 @@ public class View_NextVisualPositionFrom
private Bias[] bias;
public void testGetNextVisualPositionFromEast() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertEquals(1, view.getNextVisualPositionFrom(0, Bias.Forward, shape,
SwingConstants.EAST, bias));
assertSame(Bias.Forward, bias[0]);
@@ -89,10 +84,6 @@ public class View_NextVisualPositionFrom
}
public void testGetNextVisualPositionFromWest() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertEquals(1, view.getNextVisualPositionFrom(2, Bias.Forward, shape,
SwingConstants.WEST, bias));
assertSame(Bias.Forward, bias[0]);
@@ -104,10 +95,6 @@ public class View_NextVisualPositionFrom
}
public void testGetNextVisualPositionFromNorth() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Shape posRect = view.modelToView(doc.getLength(), shape, Bias.Forward);
caret.magicPoint = posRect.getBounds().getLocation();
assertNotNull(caret.getMagicCaretPosition());
@@ -128,10 +115,6 @@ public class View_NextVisualPositionFrom
}
public void testGetNextVisualPositionFromSouth() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Shape posRect = view.modelToView(doc.getLength(), shape, Bias.Forward);
caret.magicPoint = posRect.getBounds().getLocation();
assertNotNull(area.getCaret().getMagicCaretPosition());
@@ -155,10 +138,6 @@ public class View_NextVisualPositionFrom
}
public void testGetNextVisualPositionFromInvalid() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
// BadLocation left
try {
int p = view.getNextVisualPositionFrom(-2, Bias.Forward, shape,
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_VisualPositionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_VisualPositionTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_VisualPositionTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_VisualPositionTest.java Sat Jun 5 08:34:57 2010
@@ -18,7 +18,6 @@ package javax.swing.text;
import static javax.swing.text.VisualPositionHelper.assertNextPosition;
import junit.framework.TestCase;
-import tests.support.Support_Excludes;
/**
* Tests <code>View.getNextVisualPositionFrom</code> method on
@@ -49,10 +48,6 @@ public class View_VisualPositionTest ext
}
public void testGetNextVisualPositionFrom_Right() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
for (int i = 0; i < length; i++) {
assertNextPosition(i + 1, i, View.EAST, view, null);
};
@@ -61,10 +56,6 @@ public class View_VisualPositionTest ext
public void testGetNextVisualPositionFrom_RightAtBeginning()
throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertNextPosition(0, -1, View.EAST, view, null);
assertNextPosition(-1, -2, View.EAST, view, null);
@@ -77,10 +68,6 @@ public class View_VisualPositionTest ext
public void testGetNextVisualPositionFrom_RightAtEnd()
throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertNextPosition(length, length - 1, View.EAST, view, null);
assertNextPosition(length, length, View.EAST, view, null);
@@ -92,10 +79,6 @@ public class View_VisualPositionTest ext
}
public void testGetNextVisualPositionFrom_Left() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
for (int i = 1; i <= length; i++) {
assertNextPosition(i - 1, i, View.WEST, view, null);
};
@@ -104,10 +87,6 @@ public class View_VisualPositionTest ext
public void testGetNextVisualPositionFrom_LeftAtBeginning()
throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertNextPosition(0, 1, View.WEST, view, null);
assertNextPosition(0, 0, View.WEST, view, null);
@@ -122,10 +101,6 @@ public class View_VisualPositionTest ext
public void testGetNextVisualPositionFrom_LeftAtEnd()
throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertNextPosition(length - 1, length, View.WEST, view, null);
assertNextPosition(length, length + 1, View.WEST, view, null);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_VisualPosition_PartTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_VisualPosition_PartTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_VisualPosition_PartTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_VisualPosition_PartTest.java Sat Jun 5 08:34:57 2010
@@ -22,7 +22,6 @@ import java.awt.Rectangle;
import java.awt.Shape;
import junit.framework.TestCase;
-import tests.support.Support_Excludes;
/**
* Tests <code>View.getNextVisualPositionFrom</code> method on
@@ -67,10 +66,6 @@ public class View_VisualPosition_PartTes
public void testGetNextVisualPositionFrom_Right()
throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
for (int i = 0; i < length; i++) {
assertNextPosition(i + 1, i, View.EAST, view, alloc);
};
@@ -79,10 +74,6 @@ public class View_VisualPosition_PartTes
public void testGetNextVisualPositionFrom_RightAtBeginning()
throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertNextPosition(startOffset, -1, View.EAST, view, alloc);
assertNextPosition(1, 0, View.EAST, view, alloc);
@@ -98,10 +89,6 @@ public class View_VisualPosition_PartTes
public void testGetNextVisualPositionFrom_RightAtEnd()
throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
for (int i = endOffset - 2; i <= endOffset + 2; i++) {
assertNextPosition(i + 1, i, View.EAST, view, alloc);
}
@@ -117,10 +104,6 @@ public class View_VisualPosition_PartTes
public void testGetNextVisualPositionFrom_Left()
throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
for (int i = 1; i <= length; i++) {
assertNextPosition(i - 1, i, View.WEST, view, alloc);
};
@@ -129,10 +112,6 @@ public class View_VisualPosition_PartTes
public void testGetNextVisualPositionFrom_LeftAtBeginning()
throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertNextPosition(endOffset - 1, -1, View.WEST, view, alloc);
assertNextPosition(0, 0, View.WEST, view, alloc);
@@ -148,10 +127,6 @@ public class View_VisualPosition_PartTes
public void testGetNextVisualPositionFrom_LeftAtEnd()
throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
for (int i = endOffset - 2; i <= endOffset + 2; i++) {
assertNextPosition(i - 1, i, View.WEST, view, alloc);
}
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainViewRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainViewRTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainViewRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainViewRTest.java Sat Jun 5 08:34:57 2010
@@ -25,7 +25,6 @@ import javax.swing.JFrame;
import javax.swing.JTextArea;
import javax.swing.SwingTestCase;
import javax.swing.text.Position.Bias;
-import tests.support.Support_Excludes;
public class WrappedPlainViewRTest extends SwingTestCase {
private Document doc;
@@ -72,10 +71,6 @@ public class WrappedPlainViewRTest exten
* Tests the value returned where the point lies below the last line.
*/
public void testViewToModel() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
final Bias[] bias = new Bias[1];
width = getTextWidth(root.getElementCount() - 1) * 3 / 4;
view.setSize(width, height);
@@ -88,10 +83,6 @@ public class WrappedPlainViewRTest exten
* breakes in it.
*/
public void testViewToModelNoBreaks() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
final Bias[] bias = new Bias[1];
textArea.setSize(500, height);
shape = new Rectangle(500, height);
@@ -108,10 +99,6 @@ public class WrappedPlainViewRTest exten
* This tests that no NPE is thrown when a line is removed.
*/
public void testInsertUpdate() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
textArea.setText("line1\n\n\n\n");
assertEquals(5, view.getViewCount());
assertSame(doc, textArea.getDocument());
@@ -122,10 +109,6 @@ public class WrappedPlainViewRTest exten
* This tests that no NPE is thrown when a line is removed.
*/
public void testRemoveUpdate() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
textArea.setText("line1\n\n\n\n");
assertEquals(5, view.getViewCount());
assertSame(doc, textArea.getDocument());
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainViewTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainViewTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainViewTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainViewTest.java Sat Jun 5 08:34:57 2010
@@ -25,7 +25,6 @@ import java.awt.Rectangle;
import javax.swing.JFrame;
import javax.swing.JTextArea;
import javax.swing.SwingTestCase;
-import tests.support.Support_Excludes;
/**
* Tests WrappedPlainView methods which require "real" initialization.
@@ -84,28 +83,16 @@ public class WrappedPlainViewTest extend
}
public void testGetMaximumSpan() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertEquals(Integer.MAX_VALUE, (int) view.getMaximumSpan(X_AXIS));
assertEquals(getSum(Y_AXIS), (int) view.getMaximumSpan(Y_AXIS));
}
public void testGetMinimumSpan() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertEquals(view.getWidth(), (int) view.getMinimumSpan(X_AXIS));
assertEquals(getSum(Y_AXIS), (int) view.getMinimumSpan(Y_AXIS));
}
public void testGetPreferredSpan() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertEquals(view.getWidth(), (int) view.getPreferredSpan(X_AXIS));
assertEquals(getSum(Y_AXIS), (int) view.getPreferredSpan(Y_AXIS));
assertEquals(shape.width, view.getWidth());
@@ -113,10 +100,6 @@ public class WrappedPlainViewTest extend
}
public void testDrawSelectedText() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
textArea.setText("line1\nline2");
Graphics g = textArea.getGraphics();
g.setFont(textArea.getFont());
@@ -143,10 +126,6 @@ public class WrappedPlainViewTest extend
}
public void testDrawUnselectedText() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
textArea.setText("line1\nline2");
Graphics g = textArea.getGraphics();
g.setFont(textArea.getFont());
@@ -173,10 +152,6 @@ public class WrappedPlainViewTest extend
}
/*
public void testPaint() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
}
*/
}
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainView_SimpleTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainView_SimpleTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainView_SimpleTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainView_SimpleTest.java Sat Jun 5 08:34:57 2010
@@ -28,7 +28,6 @@ import javax.swing.SwingTestCase;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.event.DocumentEvent.ElementChange;
-import tests.support.Support_Excludes;
/**
* Tests WrappedPlainView methods which can be tested with more simple
@@ -129,10 +128,6 @@ public class WrappedPlainView_SimpleTest
}
public void testLoadChildren() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertEquals(0, view.getViewCount());
view.loadChildren(null);
assertEquals(root.getElementCount(), view.getViewCount());
@@ -142,10 +137,6 @@ public class WrappedPlainView_SimpleTest
* Class under test for void WrappedPlainView(Element)
*/
public void testWrappedPlainViewElement() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
view = new WrappedPlainViewImpl(root);
assertSame(root, view.getElement());
assertEquals("Major axis expected to be Y", View.Y_AXIS, view.getAxis());
@@ -169,10 +160,6 @@ public class WrappedPlainView_SimpleTest
* Class under test for void WrappedPlainView(Element, boolean)
*/
public void testWrappedPlainViewElementboolean() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
view = new WrappedPlainViewImpl(root, true);
assertSame(root, view.getElement());
assertEquals("Major axis expected to be Y", View.Y_AXIS, view.getAxis());
@@ -185,10 +172,6 @@ public class WrappedPlainView_SimpleTest
}
public void testNextTabStop() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Container container = view.getContainer();
FontMetrics metrics = container.getFontMetrics(container.getFont());
view.setSize(300, 100);
@@ -206,20 +189,12 @@ public class WrappedPlainView_SimpleTest
}
public void testGetTabSize() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertEquals(8, view.getTabSize());
doc.putProperty(PlainDocument.tabSizeAttribute, new Integer(4));
assertEquals(4, view.getTabSize());
}
public void testGetLineBuffer() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Segment buffer = view.getLineBuffer();
assertNotNull(buffer);
assertSame(buffer, view.getLineBuffer());
@@ -230,10 +205,6 @@ public class WrappedPlainView_SimpleTest
* Tests calculateBreakPosition method with word wrapping turned off.
*/
public void testCalculateBreakPosition01() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Container container = view.getContainer();
FontMetrics metrics = container.getFontMetrics(container.getFont());
Element line = root.getElement(0);
@@ -267,10 +238,6 @@ public class WrappedPlainView_SimpleTest
* Tests calculateBreakPosition method with word wrapping turned on.
*/
public void testCalculateBreakPosition02() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
view = new WrappedPlainViewImpl(root, true);
Container container = view.getContainer();
FontMetrics metrics = container.getFontMetrics(container.getFont());
@@ -304,10 +271,6 @@ public class WrappedPlainView_SimpleTest
* very-very long string.
*/
public void testCalculateBreakPosition03() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
String veryLongString = "aVeryVeryVeryLongString";
doc.insertString(root.getElement(1).getStartOffset(), veryLongString, null);
Container container = view.getContainer();
@@ -326,10 +289,6 @@ public class WrappedPlainView_SimpleTest
}
public void testInsertUpdate() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
view.loadChildren(null);
view.insertUpdate(docEvent, shape, null);
if (BasicSwingTestCase.isHarmony()) {
@@ -341,10 +300,6 @@ public class WrappedPlainView_SimpleTest
}
public void testRemoveUpdate() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
view.loadChildren(null);
view.removeUpdate(docEvent, shape, null);
if (BasicSwingTestCase.isHarmony()) {
@@ -354,10 +309,6 @@ public class WrappedPlainView_SimpleTest
}
public void testChangedUpdate() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
view.loadChildren(null);
view.changedUpdate(docEvent, shape, null);
if (BasicSwingTestCase.isHarmony()) {
@@ -367,10 +318,6 @@ public class WrappedPlainView_SimpleTest
}
public void testSetSize() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertFalse(view.isLayoutValid(View.X_AXIS));
assertFalse(view.isLayoutValid(View.Y_AXIS));
view.setSize(width, height);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormViewTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormViewTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormViewTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormViewTest.java Sat Jun 5 08:34:57 2010
@@ -50,7 +50,6 @@ import javax.swing.text.StyleConstants;
import javax.swing.text.View;
import org.apache.harmony.x.swing.text.html.form.FormAttributes;
-import tests.support.Support_Excludes;
public class FormViewTest extends SwingTestCase {
@@ -149,10 +148,6 @@ public class FormViewTest extends SwingT
public void testFormView() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
// Wrong element
elem = createElement();
formView = new FormView(elem);
@@ -238,10 +233,6 @@ public class FormViewTest extends SwingT
}
public void testFormView_Models() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
createFormView(FormAttributes.INPUT_TYPE_BUTTON);
if (isHarmony()) {
//TODO uncomment when HTMLDocument would be implemented
@@ -275,10 +266,6 @@ public class FormViewTest extends SwingT
}
public void testCreateComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Component component;
createFormView(FormAttributes.INPUT_TYPE_BUTTON);
@@ -386,10 +373,6 @@ public class FormViewTest extends SwingT
}
public void testCreateComponent_Models() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Component component;
createFormView(FormAttributes.INPUT_TYPE_BUTTON);
@@ -516,10 +499,6 @@ public class FormViewTest extends SwingT
public void testGetMaximumSpan() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
elem = doc.getElement(FormAttributes.INPUT_TYPE_TEXT);
formView = new FormView(elem) {
protected Component createComponent() {
@@ -615,10 +594,6 @@ public class FormViewTest extends SwingT
}
public void testGetMaximumSpan_WithValidElements() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
createFormView(FormAttributes.INPUT_TYPE_BUTTON);
checkMaxSpan(formView);
@@ -703,26 +678,14 @@ public class FormViewTest extends SwingT
}
public void testImageSubmit() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
throw new UnsupportedOperationException("Not implemented");
}
public void testSubmitData() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
throw new UnsupportedOperationException("Not implemented");
}
public void testActionPerformed() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Component component;
elem = doc.getElement("submit2");
@@ -748,10 +711,6 @@ public class FormViewTest extends SwingT
}
public void testIsElementSuccessfull() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
StringBuffer src = new StringBuffer();
src.append("<HTML><HEAD></HEAD><BODY> Test");
src.append("<FORM ACTION = \"\">");
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormView_FormInputElementTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormView_FormInputElementTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormView_FormInputElementTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormView_FormInputElementTest.java Sat Jun 5 08:34:57 2010
@@ -42,7 +42,6 @@ import javax.swing.text.JTextComponent;
import javax.swing.text.StyleConstants;
import org.apache.harmony.x.swing.Utilities;
-import tests.support.Support_Excludes;
public class FormView_FormInputElementTest extends SwingTestCase {
@@ -72,10 +71,6 @@ public class FormView_FormInputElementTe
}
public void testCreateButtonComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
createHTMLSample("button");
JButton button;
@@ -108,10 +103,6 @@ public class FormView_FormInputElementTe
}
public void testCreateCheckBoxComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
createHTMLSample("checkbox");
JCheckBox checkBox;
@@ -146,10 +137,6 @@ public class FormView_FormInputElementTe
}
public void testCreateImageComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
createHTMLSample("image");
JButton image;
@@ -218,10 +205,6 @@ public class FormView_FormInputElementTe
}
public void testCreatePasswordComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JPasswordField passwordField;
createHTMLSample("password");
@@ -254,10 +237,6 @@ public class FormView_FormInputElementTe
}
public void testCreateRadioComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
createHTMLSample("radio");
JRadioButton radioButton;
@@ -287,10 +266,6 @@ public class FormView_FormInputElementTe
}
public void testRadioGroups() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
StringBuffer htmlSrc = new StringBuffer();
htmlSrc.append("<HTML> <HEAD></HEAD><BODY>");
htmlSrc.append(" Hello word!");
@@ -318,10 +293,6 @@ public class FormView_FormInputElementTe
}
public void testCreateResetComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
createHTMLSample("reset");
JButton resetButton;
@@ -353,10 +324,6 @@ public class FormView_FormInputElementTe
}
public void testCreateSubmitComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
createHTMLSample("submit");
JButton submitButton;
@@ -388,10 +355,6 @@ public class FormView_FormInputElementTe
}
public void testCreateTextComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
JTextField textField;
createHTMLSample("text");
@@ -421,10 +384,6 @@ public class FormView_FormInputElementTe
}
public void testCreateFileComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
createHTMLSample("file");
//Default VALUE
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormView_FormSelectElementTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormView_FormSelectElementTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormView_FormSelectElementTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormView_FormSelectElementTest.java Sat Jun 5 08:34:57 2010
@@ -28,7 +28,6 @@ import javax.swing.JList;
import javax.swing.JScrollPane;
import javax.swing.SwingTestCase;
import javax.swing.text.Element;
-import tests.support.Support_Excludes;
public class FormView_FormSelectElementTest extends SwingTestCase {
@@ -52,19 +51,11 @@ public class FormView_FormSelectElementT
}
public void testModelAttributes() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
createHTMLSample();
}
public void testCreateComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
createHTMLSample();
createFormViewWithParent("option_disabled_attribute");
JComboBox comboBox = (JComboBox)formView.getComponent();
@@ -83,10 +74,6 @@ public class FormView_FormSelectElementT
}
public void testCreateMultipleSelectionComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
createHTMLSample();
createFormViewWithParent("select_multiple_name_only");
@@ -117,10 +104,6 @@ public class FormView_FormSelectElementT
}
public void testCreateSimpleSelectionComponent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
createHTMLSample();
createFormViewWithParent("select");
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocumentTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocumentTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocumentTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocumentTest.java Sat Jun 5 08:34:57 2010
@@ -45,7 +45,6 @@ import javax.swing.text.html.HTMLDocumen
import javax.swing.text.html.HTMLDocumentTestCase.DocumentController;
import javax.swing.text.html.HTMLDocumentTestCase.PublicHTMLDocument;
import javax.swing.text.html.parser.ParserDelegator;
-import tests.support.Support_Excludes;
public class HTMLDocumentTest extends DefaultStyledDocumentTest {
@@ -67,10 +66,6 @@ public class HTMLDocumentTest extends De
}
public void testHTMLDocumentContentStyleSheet() throws MalformedURLException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
StyleSheet styles = new StyleSheet();
final GapContent gapContent = new GapContent(10);
htmlDoc = new PublicHTMLDocument(gapContent, styles);
@@ -84,10 +79,6 @@ public class HTMLDocumentTest extends De
}
public void testHTMLDocumentStyleSheet() throws BadLocationException, MalformedURLException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
StyleSheet styles = new StyleSheet();
htmlDoc = new PublicHTMLDocument(styles);
assertSame(styles, htmlDoc.getAttributeContextPublicly());
@@ -101,10 +92,6 @@ public class HTMLDocumentTest extends De
}
public void testHTMLDocument() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
htmlDoc = new PublicHTMLDocument();
assertTrue(htmlDoc.getContentPublicly() instanceof GapContent);
AttributeContext styleSheet = htmlDoc.getAttributeContextPublicly();
@@ -119,10 +106,6 @@ public class HTMLDocumentTest extends De
}
public void testCreateLeafElement() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Element leaf = htmlDoc.createLeafElement(null, null, 0, 1);
assertTrue(leaf instanceof HTMLDocument.RunElement);
assertNull(leaf.getParentElement());
@@ -145,10 +128,6 @@ public class HTMLDocumentTest extends De
}
public void testCreateBranchElement() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Element branch = htmlDoc.createBranchElement(null, null);
assertTrue(branch instanceof HTMLDocument.BlockElement);
assertNull(branch.getParentElement());
@@ -189,10 +168,6 @@ public class HTMLDocumentTest extends De
}
public void testCreateDefaultRoot() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
try {
htmlDoc.insertString(0, "123", null);
} catch (BadLocationException e) {}
@@ -254,10 +229,6 @@ public class HTMLDocumentTest extends De
}
public void testGetElementElementObjectObject() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
final Element root = htmlDoc.getDefaultRootElement();
final String value = "ASD";
assertNull(htmlDoc.getElement(root, HTML.Attribute.ID, value));
@@ -284,10 +255,6 @@ public class HTMLDocumentTest extends De
}
public void testGetElementString() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
final Element root = htmlDoc.getDefaultRootElement();
final String value = "B";
assertNull(htmlDoc.getElement(value));
@@ -303,10 +270,6 @@ public class HTMLDocumentTest extends De
}
public void testGetIterator() throws BadLocationException {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
final SimpleAttributeSet attr = new SimpleAttributeSet();
attr.addAttribute(StyleConstants.NameAttribute, Tag.B.toString());
htmlDoc.insertString(0, "0000", attr);
@@ -398,10 +361,6 @@ public class HTMLDocumentTest extends De
}
public void testGetReaderIntIntIntTag() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
HTMLEditorKit.ParserCallback reader1 = htmlDoc.getReader(0, 10, 100, null);
HTMLEditorKit.ParserCallback reader2 = htmlDoc.getReader(0, 10, 100, null);
HTMLEditorKit.ParserCallback reader3 = htmlDoc.getReader(10, 100, 10, Tag.P);
@@ -418,10 +377,6 @@ public class HTMLDocumentTest extends De
}
public void testGetReaderInt() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
HTMLEditorKit.ParserCallback reader1 = htmlDoc.getReader(0);
HTMLEditorKit.ParserCallback reader2 = htmlDoc.getReader(0);
HTMLEditorKit.ParserCallback reader3 = htmlDoc.getReader(1);
@@ -438,20 +393,12 @@ public class HTMLDocumentTest extends De
}
public void testGetStyleSheet() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
AttributeContext styleSheet = htmlDoc.getAttributeContextPublicly();
assertTrue(styleSheet instanceof StyleSheet);
assertSame(styleSheet, htmlDoc.getStyleSheet());
}
public void testProcessHTMLFrameHyperlinkEvent() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
final String frameSetHTML = "<FRAMESET><FRAME name=\"1\" src=\"1.html\"><FRAME name=\"2\" src=\"2.html\"><img name=\"3\" src=\"3.jpg\"></FRAMESET>";
HTMLDocumentTestCase.loadDocument(htmlDoc, frameSetHTML);
final Element body = htmlDoc.getDefaultRootElement().getElement(1);
@@ -524,10 +471,6 @@ public class HTMLDocumentTest extends De
}
public void testGetSetBase() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
URL u1 = new URL("http://www.apache.org");
URL u2 = new URL("http://www.harmony.incubator.apache.org");
String tail = "tail";
@@ -540,10 +483,6 @@ public class HTMLDocumentTest extends De
}
public void testGetSetParser() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertNull(htmlDoc.getParser());
ParserDelegator parser = new ParserDelegator();
htmlDoc.setParser(parser);
@@ -551,10 +490,6 @@ public class HTMLDocumentTest extends De
}
public void testGetSetPreservesUnknownTags() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertTrue(htmlDoc.getPreservesUnknownTags());
htmlDoc.setPreservesUnknownTags(false);
@@ -588,10 +523,6 @@ public class HTMLDocumentTest extends De
}
public void testGetSetTokenThreshold() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
assertEquals(Integer.MAX_VALUE, htmlDoc.getTokenThreshold());
htmlDoc.setTokenThreshold(100);
@@ -687,17 +618,9 @@ public class HTMLDocumentTest extends De
}
public void testGetDefaultRootElement() {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
}
public void testInsertUpdate() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
doc.insertString(0, "1111", null);
final AttributeSet attr = doc.getCharacterElement(2).getAttributes();
assertEquals(1, attr.getAttributeCount());
@@ -705,10 +628,6 @@ public class HTMLDocumentTest extends De
}
public void testSerializable() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
}
protected static void checkAttributes(final AttributeSet attr, final Object key, final Object value) {
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocument_InsertsTest.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_InsertsTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocument_InsertsTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocument_InsertsTest.java Sat Jun 5 08:34:57 2010
@@ -32,7 +32,6 @@ import javax.swing.text.StyleConstants;
import javax.swing.text.DefaultStyledDocument.ElementSpec;
import javax.swing.text.html.HTML.Tag;
import javax.swing.text.html.parser.ParserDelegator;
-import tests.support.Support_Excludes;
public class HTMLDocument_InsertsTest extends HTMLDocumentTestCase {
@@ -51,10 +50,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertAfterEnd_Specs() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
htmlDoc.setParser(new ParserDelegator());
loadDocument(htmlDoc, "<table><tr><td>table</td></td></tr></table>");
htmlDoc.setEditable(false);
@@ -104,10 +99,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertAfterEnd_Specs2() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
htmlDoc.setParser(new ParserDelegator());
htmlDoc.setEditable(false);
@@ -133,10 +124,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertAfterEnd_Events() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Element root = htmlDoc.getDefaultRootElement();
Element body = root.getElement(0);
Element p = body.getElement(0);
@@ -156,10 +143,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertAfterEnd_Structure() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Element root = htmlDoc.getDefaultRootElement();
Element body = root.getElement(0);
Element p = body.getElement(0);
@@ -195,10 +178,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertAfterEnd_Exceptions() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
addElements();
Element root = htmlDoc.getDefaultRootElement();
Element body = root.getElement(0);
@@ -216,10 +195,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertAfterStart_Specs() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
htmlDoc.setParser(new ParserDelegator());
loadDocument(htmlDoc, "<table><tr><td><div>cell</div></td></tr></table>");
htmlDoc.setEditable(true);
@@ -280,10 +255,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertAfterStart_Specs2() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
htmlDoc.setParser(new ParserDelegator());
htmlDoc.setEditable(false);
@@ -304,10 +275,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertAfterStart_Events() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Element root = htmlDoc.getDefaultRootElement();
Element body = root.getElement(0);
Element p = body.getElement(0);
@@ -331,10 +298,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertAfterStart_Strucutre() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Element root = htmlDoc.getDefaultRootElement();
Element body = root.getElement(0);
Element p = body.getElement(0);
@@ -367,10 +330,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertAfterStart_Exceptions() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
addElements();
Element root = htmlDoc.getDefaultRootElement();
Element branch1 = root.getElement(0);
@@ -399,10 +358,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertBeforeEnd_Specs() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
htmlDoc.setParser(new ParserDelegator());
loadDocument(htmlDoc, "<table><tr><td><div>table</div></td</td></tr></table>");
htmlDoc.setEditable(false);
@@ -456,10 +411,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertBeforeEnd_Specs2() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
htmlDoc.setParser(new ParserDelegator());
htmlDoc.setEditable(false);
@@ -480,10 +431,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertBeforeEnd_Events() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Element root = htmlDoc.getDefaultRootElement();
Element body = root.getElement(0);
Element p = body.getElement(0);
@@ -503,10 +450,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertBeforeEnd_Strucutre() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Element root = htmlDoc.getDefaultRootElement();
Element body = root.getElement(0);
Element p = body.getElement(0);
@@ -543,10 +486,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertBeforeEnd_Exceptions() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
addElements();
Element root = htmlDoc.getDefaultRootElement();
Element branch1 = root.getElement(0);
@@ -575,10 +514,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertBeforeStart_Specs() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
htmlDoc.setParser(new ParserDelegator());
loadDocument(htmlDoc, "<table><tr><td>table</td></tr></table>");
htmlDoc.setEditable(true);
@@ -634,10 +569,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertBeforeStart_Specs2() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
htmlDoc.setParser(new ParserDelegator());
htmlDoc.setEditable(false);
@@ -659,10 +590,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertBeforeStart_Events() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Element root = htmlDoc.getDefaultRootElement();
Element branch1 = root.getElement(0);
Element branch2 = branch1.getElement(0);
@@ -690,10 +617,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertBeforeStart_Structure() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
Element root = htmlDoc.getDefaultRootElement();
Element body = root.getElement(0);
Element p = body.getElement(0);
@@ -726,10 +649,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testInsertBeforeStart_Exceptions() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
addElements();
Element root = htmlDoc.getDefaultRootElement();
Element branch1 = root.getElement(0);
@@ -747,10 +666,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testSetInnerHTML_Specs() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
htmlDoc.setParser(new ParserDelegator());
loadDocument(htmlDoc, "<table><tr><td>table</td></tr></table>");
htmlDoc.setEditable(false);
@@ -818,10 +733,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testSetInnerHTML_Specs2() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
htmlDoc.setParser(new ParserDelegator());
htmlDoc.setEditable(false);
@@ -845,10 +756,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testSetInnerHTML_Events() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
addElements();
Element root = htmlDoc.getDefaultRootElement();
Element branch1 = root.getElement(0);
@@ -871,10 +778,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testSetInnerHTML_Structure() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
addElements();
Element root = htmlDoc.getDefaultRootElement();
Element branch1 = root.getElement(0);
@@ -897,10 +800,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testSetInnerHTML_Exceptions() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
addElements();
Element root = htmlDoc.getDefaultRootElement();
Element branch1 = root.getElement(0);
@@ -924,10 +823,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testSetOuterHTML_Specs() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
htmlDoc.setParser(new ParserDelegator());
loadDocument(htmlDoc, "<table><tr><td><br>table</td></tr></table>");
@@ -1008,10 +903,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testSetOuterHTML_Specs2() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
htmlDoc.setParser(new ParserDelegator());
Element root = htmlDoc.getDefaultRootElement();
@@ -1034,10 +925,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testSetOuterHTML_Events() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
addElements();
Element root = htmlDoc.getDefaultRootElement();
Element branch1 = root.getElement(0);
@@ -1066,10 +953,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testSetOuterHTML_Structure() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
addElements();
Element root = htmlDoc.getDefaultRootElement();
Element branch1 = root.getElement(0);
@@ -1091,10 +974,6 @@ public class HTMLDocument_InsertsTest ex
}
public void testSetOuterHTML_Exceptions() throws Exception {
- if (Support_Excludes.isExcluded()) {
- return;
- }
-
addElements();
Element root = htmlDoc.getDefaultRootElement();
Element branch1 = root.getElement(0);