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/05/26 11:31:15 UTC
svn commit: r948377 [1/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/ja...
Author: hindessm
Date: Wed May 26 09:31:07 2010
New Revision: 948377
URL: http://svn.apache.org/viewvc?rev=948377&view=rev
Log:
Modify the tests to use the Support_Excludes class. I automated the
adding of the:
if (Support_Excludes.isExcluded()) {
return;
}
checks so it may not be exactly equivalent to the current setup but it
should be close enough.
Modified:
harmony/enhanced/java/branches/mrh/classlib/make/properties.xml
harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/annotation/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/applet/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/auth/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/JndiLoginModuleTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/Krb5LoginModuleTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTCanvasTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTComponentTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTListChildTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTWindowTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/BasicStrokeTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ButtonRTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/CardLayoutTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ChoiceTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ComponentTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ContainerOrderFocusTraversalPolicyTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/GridLayoutTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/KeyboardFocusManagerRTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ListTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/RobotTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ScrollPaneAdjustableTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ToolkitRTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/WindowTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/datatransfer/ClipboardTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/event/ContainerEventTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/font/LineBreakMeasurerTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/font/TextLayoutTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/font/TextMeasurerTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/AffineTransformTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Arc2DTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/AreaTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/CubicCurve2DDoubleTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/CubicCurve2DFloatTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/CubicCurve2DTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Ellipse2DTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/GeneralPathTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Line2DTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/Rectangle2DTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/geom/RoundRectangle2DTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/image/BufferedImageFilterTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/image/MultiPixelPackedSampleModelTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/image/SinglePixelPackedSampleModelTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/org/apache/harmony/awt/ListenerListTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/org/apache/harmony/awt/gl/MultiRectAreaLineCashTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/org/apache/harmony/awt/gl/render/JavaBlitterTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/org/apache/harmony/awt/tests/nativebridge/PointerPointerTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/org/apache/harmony/awt/wtk/ShutdownWatchdogTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/unix/org/apache/harmony/awt/gl/linux/XGraphics2DRTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/windows/java/awt/WinWindowRTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/beans/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/EventHandlerTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PersistenceDelegateTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/src/test/java/AbstractQueuedSynchronizerTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/src/test/java/ExecutorsTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/src/test/java/ReentrantLockTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/src/test/java/ReentrantReadWriteLockTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/src/test/java/ScheduledExecutorTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/src/test/java/ThreadLocalTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/crypto/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/test/java/javax/imageio/ImageIOTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/instrument/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/test/java/org/apache/harmony/tests/java/lang/instrument/InstrumentTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/jndi/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/dns/TestMgr.java
harmony/enhanced/java/branches/mrh/classlib/modules/jndi/src/test/java/org/apache/harmony/jndi/provider/ldap/LdapContextFactoryTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/ClassLoadingMXBeanTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/CompilationMXBeanTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/GarbageCollectorMXBeanTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/LoggingMXBeanTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/ManagementFactoryTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/MemoryMXBeanTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/MemoryManagerMXBeanTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/MemoryPoolMXBeanTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/RuntimeMXBeanTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/ThreadMXBeanTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/ClassLoadingMXBeanImplTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/CompilationMXBeanImplTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/GarbageCollectorMXBeanImplTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/LoggingMXBeanImplTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/MemoryMXBeanImplTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/MemoryManagerImplTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/MemoryPoolMXBeanImplTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/RuntimeMXBeanImplTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/ThreadInfoTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/ThreadMXBeanImplTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/logging/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/PackageTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java
harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/ThreadTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ExcludedProxyTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/InetAddressTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/MulticastSocketTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArrayListTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertiesTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/impl/common/org/apache/harmony/luni/tests/internal/net/www/protocol/http/PersistenceTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/math/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/misc/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/nio/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/pack200/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/prefs/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/print/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetAttributeTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetAttributesTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetDefaultAttributeValueTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetSupportedAttributeCategoriesTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetSupportedAttributeValuesTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetSupportedDocFlavorsTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetUnsupportedAttributesTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/IsAttributeCategorySupportedTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/IsAttributeValueSupportedTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/LookupDefaultPrintServiceTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/LookupPrintServicesTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/PrintAutosenseTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/PrintJpegTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/PrintTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/ValueTests.java
harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/attribute/ExtendEnumSyntax.java
harmony/enhanced/java/branches/mrh/classlib/modules/regex/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/rmi/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/DGCTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/tests/java/rmi/activation/DefaultParamTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/tests/java/rmi/activation/StartupShutdownTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/security/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStore2Test.java
harmony/enhanced/java/branches/mrh/classlib/modules/sound/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/sql/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/swing/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/AccessibleJComponent_MultithreadedTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/DefaultCellEditorTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/DefaultComboBoxModelTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/InputMapTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JCheckBoxMenuItemTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JDesktopPaneTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JDialogTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JEditorPaneTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JEditorPane_AccessibleJEditorPaneHTMLTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFileChooserRTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFileChooserTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFormattedTextFieldTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFormattedTextField_CommitActionRTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFrameRTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFrameTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JInternalFrameTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JInternalFrame_MultithreadedTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JListTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JMenuTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JOptionPaneRTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JOptionPaneTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JRootPaneRTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JRootPaneTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JSpinnerTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JSplitPaneTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTableTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTextArea_MultithreadedTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTextFieldTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTextField_NotifyActionRTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JViewportTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JWindowTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/LayoutFocusTraversalPolicyTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/OverlayLayoutTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupFactoryRTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupFactoryTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/ProgressMonitorInputStreamTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/ProgressMonitorTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/RepaintManagerTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SortingFocusTraversalPolicyRTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SortingFocusTraversalPolicyTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SpinnerDateModelTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SpringLayoutTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingUtilitiesRTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingUtilitiesTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/Timer_MultithreadedTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/CompoundBorderTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/EtchedBorderTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/LineBorderTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/TitledBorderTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/colorchooser/ColorChooserComponentFactoryTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/event/AncestorEventTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicCheckBoxMenuItemUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicColorChooserUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicComboBoxUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicComboPopupTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicDesktopPaneUIActionsTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicEditorPaneUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicFileChooserUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicGraphicsUtilsTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicInternalFrameTitlePaneTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicInternalFrameUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicListUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuItemUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuUI_MultithreadedTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicOptionPaneUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicProgressBarUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicRadioButtonMenuItemUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicRootPaneUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicSplitPaneDividerTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicSplitPaneUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTabbedPaneUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextAreaUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextFieldUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextPaneUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicToolBarUI$DragWindowTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicToolBarUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTreeUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalComboBoxIconTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalComboBoxUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalFileChooserUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalIconFactoryTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalRootPaneUI$MetalRootLayoutTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalRootPaneUIRTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalRootPaneUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalToolBarUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalTreeUITest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/AbstractDocument_AbstractElement_MASNoLockTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/CompositeView_VisualPositionTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultCaretTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultCaret_BidiTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultCaret_MultithreadedTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultEditorKitRTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultEditorKit_Actions_MultithreadedTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultHighlighterTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultHighlighter_DefaultHighlightPainterTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/FieldViewTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/FlowViewTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/GapContentTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/GapContent_InternalTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/GlyphView_AttributesTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/InternationalFormatterTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponentTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_AccessibleJTextComponentTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_AccessibleJTextComponent_variousTextTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_IMLocationTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_IMTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_MultithreadedTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_byAuxiliaryComponentTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PasswordViewTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewI18N_LayoutTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewI18N_LineView_UpdateTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewI18N_ModelViewTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainView_ChangesTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StringContentTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StringContentTest_CommonTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StyleContextTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StyledEditorKitTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/TextAction_MultithreadedTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/UtilitiesTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_ForwardUpdateRTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_NextVisualPositionFromTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_VisualPositionTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_VisualPosition_PartTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainViewRTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainViewTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainView_SimpleTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormViewTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormView_FormInputElementTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormView_FormSelectElementTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocumentTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocument_InsertsTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocument_ReaderTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLEditorKitTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLEditorKit_HTMLTextActionTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLEditorKit_InsertHTMLTextActionTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLWriterTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/InlineViewTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/ParagraphView_RequirementsTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/StyleSheetTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/StyleSheet_ResolvedRulesClassTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/StyleSheet_ResolvedRulesTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/StyleSheet_ViewAttributesTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/ContentModelTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/DTD401Test.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/DTDTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/DocumentParserTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/TagElementTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/org/apache/harmony/x/swing/plaf/resources/basic/BasicResourceBundleTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/text/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatSymbolsTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/RuleBasedCollatorTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/x-net/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/support/src/test/java/tests/support/Support_Excludes.java
harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml
harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/make/run-test.xml
harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/run-test.xml
harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ClassUnloadTest.java
harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ClassObjectIDTest.java
harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/EnableCollectionTest.java
harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/RefTypeIDTest.java
harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionTest.java
harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/CapabilitiesNewTest.java
harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/make/run-test.xml
harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/make/run-test.xml
Modified: harmony/enhanced/java/branches/mrh/classlib/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/make/properties.xml?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/make/properties.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/make/properties.xml Wed May 26 09:31:07 2010
@@ -620,39 +620,6 @@ properties in preference to these:
</macrodef>
<convert-test from="test.case" to="converted.tc" />
- <!-- Concatenate several exclude lists into single list -->
- <macrodef name="prepare-exclude-list">
- <attribute name="moduleName"/>
- <!-- directory with exclude lists for the module -->
- <attribute name="dir"/>
- <!-- name of concatenated list, should be an absolute pathname -->
- <attribute name="result"/>
- <sequential>
- <!-- names of exclude lists, used by prepare-exclude-list macro -->
- <property name="common.exclude.file" value="exclude.common" />
- <property name="common.exclude.interm" value="exclude.interm" />
- <property name="platform.exclude.file"
- value="exclude.${hy.platform}.${hy.test.vm.name}" />
- <property name="platform.exclude.interm"
- value="exclude.${hy.platform}.${hy.test.vm.name}.interm"
- />
-
- <dirname file="@{result}" property="@{result}.dir" />
- <mkdir dir="${@{result}.dir}" />
-
- <echo message="" file="@{result}"/>
- <concat destfile="@{result}" force="yes" fixlastline="yes" append="true">
- <fileset dir="@{dir}">
- <include name="${common.exclude.file}"/>
- <include name="${platform.exclude.file}"/>
- <include name="${common.exclude.interm}" if="exclude.interm" />
- <include name="${platform.exclude.interm}" if="exclude.interm" />
- <size value="0" when="more"/>
- </fileset>
- </concat>
- </sequential>
- </macrodef>
-
<macrodef name="ensure-javac">
<sequential>
<fail>
@@ -797,10 +764,8 @@ Alternatively, you can switch to another
<echo message="Running @{module} Unit Test from @{jar}" />
<echo message="Tested jre: ${test.jre.home}/bin/java" />
<property name="test.module.dir" value="${target.dir}/@{module}" />
- <property name="test.excludes.dir" value="${test.module.dir}/excludes" />
<property name="test.resources.dir" value="${test.module.dir}/resources" />
<property name="module.work.dir" location="${work.dir}/@{module}" />
- <property name="test.exclude.file" value="${module.work.dir}/test.exclude" />
<property name="module.temp.dir"
location="${work.dir}/@{module}/temp" />
@@ -816,7 +781,6 @@ Alternatively, you can switch to another
<mkdir dir="${junit.java.io.tmpdir}" />
<mkdir dir="${junit.user.home}" />
- <prepare-exclude-list moduleName="@{module}" dir="${test.excludes.dir}" result="${test.exclude.file}" />
<junit fork="yes"
forkmode="${hy.test.forkmode}"
timeout="${hy.test.timeout}"
@@ -851,7 +815,6 @@ Alternatively, you can switch to another
<include name="${converted.tc.class}" if="test.case" />
<!-- unless ${test.case} -->
<include name="**/*Test.class" unless="test.case" />
- <excludesfile name="${test.exclude.file}" unless="test.case"/>
<excludeorinclude/>
</zipfileset>
</batchtest>
@@ -892,10 +855,8 @@ Alternatively, you can switch to another
<echo message="Running @{module} Unit Test from @{jar}" />
<echo message="Tested jre: ${test.jre.home}/bin/java" />
<property name="test.module.dir" value="${target.dir}/@{module}" />
- <property name="test.excludes.dir" value="${test.module.dir}/excludes" />
<property name="test.resources.dir" value="${test.module.dir}/resources" />
<property name="module.work.dir" location="${work.dir}/@{module}" />
- <property name="test.exclude.file" value="${module.work.dir}/test.exclude" />
<property name="module.temp.dir"
location="${work.dir}/@{module}/temp" />
@@ -911,7 +872,6 @@ Alternatively, you can switch to another
<mkdir dir="${junit.java.io.tmpdir}" />
<mkdir dir="${junit.user.home}" />
- <prepare-exclude-list moduleName="@{module}" dir="${test.excludes.dir}" result="${test.exclude.file}" />
<junit fork="yes"
forkmode="${hy.test.forkmode}"
timeout="${hy.test.timeout}"
@@ -945,7 +905,6 @@ Alternatively, you can switch to another
<!-- if ${test.case} -->
<include name="${converted.tc.class}" if="test.case" />
<!-- unless ${test.case} -->
- <excludesfile name="${test.exclude.file}" unless="test.case"/>
<excludeorinclude/>
</zipfileset>
</batchtest>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/make/run-test.xml?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/make/run-test.xml Wed May 26 09:31:07 2010
@@ -31,7 +31,7 @@
<target name="test" depends="test-module" />
- <target name="test-module" depends="test-jre-vm-info">
+ <target name="test-module">
<convert-test-as-class from="test.case" to="converted.tc.class" />
<run-hdk-tests module="accessibility" jar="accessibility_tests.jar">
<junit-elements>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/annotation/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/annotation/make/run-test.xml?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/annotation/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/annotation/make/run-test.xml Wed May 26 09:31:07 2010
@@ -31,7 +31,7 @@
<target name="test" depends="test-module" />
- <target name="test-module" depends="test-jre-vm-info">
+ <target name="test-module">
<convert-test-as-class from="test.case" to="converted.tc.class" />
<run-hdk-tests module="annotation" jar="annotation_tests.jar" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/applet/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/applet/make/run-test.xml?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/applet/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/applet/make/run-test.xml Wed May 26 09:31:07 2010
@@ -31,7 +31,7 @@
<target name="test" depends="test-module" />
- <target name="test-module" depends="test-jre-vm-info">
+ <target name="test-module">
<convert-test-as-class from="test.case" to="converted.tc.class" />
<run-hdk-tests module="applet" jar="applet_tests.jar" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/run-test.xml?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/run-test.xml Wed May 26 09:31:07 2010
@@ -31,7 +31,7 @@
<target name="test" depends="test-module" />
- <target name="test-module" depends="test-jre-vm-info">
+ <target name="test-module">
<convert-test-as-class from="test.case" to="converted.tc.class" />
<run-hdk-tests module="archive" jar="archive_internal_tests.jar">
<junit-elements>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java Wed May 26 09:31:07 2010
@@ -30,6 +30,7 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import tests.support.resource.Support_Resources;
+import tests.support.Support_Excludes;
public class JarInputStreamTest extends junit.framework.TestCase {
// a 'normal' jar file
@@ -56,6 +57,10 @@ public class JarInputStreamTest extends
* @tests java.util.jar.JarInputStream#JarInputStream(java.io.InputStream)
*/
public void test_ConstructorLjava_io_InputStream() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// Test for method java.util.jar.JarInputStream(java.io.InputStream)
InputStream is = new URL(jarName).openConnection().getInputStream();
boolean hasCorrectEntry = false;
@@ -72,6 +77,10 @@ public class JarInputStreamTest extends
}
public void test_closeAfterException() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
File resources = Support_Resources.createTempFolder();
Support_Resources.copyFile(resources, null, "Broken_entry.jar");
InputStream is = Support_Resources.getStream("Broken_entry.jar");
@@ -93,6 +102,10 @@ public class JarInputStreamTest extends
}
public void test_getNextJarEntry_Ex() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
final Set<String> desired = new HashSet<String>(Arrays
.asList("foo/", "foo/bar/", "foo/bar/A.class", "Blah.txt"));
Set<String> actual = new HashSet<String>();
@@ -130,6 +143,10 @@ public class JarInputStreamTest extends
* @tests java.util.jar.JarInputStream#getManifest()
*/
public void test_getManifest() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// Test for method java.util.jar.Manifest
// java.util.jar.JarInputStream.getManifest()
Manifest m;
@@ -148,6 +165,10 @@ public class JarInputStreamTest extends
* @tests java.util.jar.JarInputStream#getNextJarEntry()
*/
public void test_getNextJarEntry() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
final Set<String> desired = new HashSet<String>(Arrays.asList(new String[] { "foo/",
"foo/bar/", "foo/bar/A.class", "Blah.txt" }));
Set<String> actual = new HashSet<String>();
@@ -163,6 +184,10 @@ public class JarInputStreamTest extends
public void test_JarInputStream_Integrate_Jar_getNextEntry()
throws IOException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
String intJarName = Support_Resources.getURL("Integrate.jar");
InputStream is = new URL(intJarName).openConnection()
.getInputStream();
@@ -179,6 +204,10 @@ public class JarInputStreamTest extends
public void test_JarInputStream_Modified_Class_getNextEntry()
throws IOException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
String modJarName = Support_Resources.getURL("Modified_Class.jar");
InputStream is = new URL(modJarName).openConnection()
.getInputStream();
@@ -206,6 +235,10 @@ public class JarInputStreamTest extends
public void test_JarInputStream_Modified_Manifest_MainAttributes_getNextEntry()
throws IOException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
String modJarName = Support_Resources.getURL("Modified_Manifest_MainAttributes.jar");
InputStream is = new URL(modJarName).openConnection()
.getInputStream();
@@ -226,6 +259,10 @@ public class JarInputStreamTest extends
public void test_JarInputStream_Modified_Manifest_EntryAttributes_getNextEntry()
throws IOException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
String modJarName = Support_Resources
.getURL("Modified_Manifest_EntryAttributes.jar");
InputStream is = new URL(modJarName).openConnection()
@@ -253,6 +290,10 @@ public class JarInputStreamTest extends
public void test_JarInputStream_Modified_SF_EntryAttributes_getNextEntry()
throws IOException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
String modJarName = Support_Resources
.getURL("Modified_SF_EntryAttributes.jar");
InputStream is = new URL(modJarName).openConnection()
@@ -279,6 +320,10 @@ public class JarInputStreamTest extends
}
public void test_JarInputStream_Modified_Class_read() throws IOException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
String modJarName = Support_Resources.getURL("Modified_Class.jar");
InputStream is = new URL(modJarName).openConnection()
.getInputStream();
@@ -308,6 +353,10 @@ public class JarInputStreamTest extends
}
public void test_Integrate_Jar_read() throws IOException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
String intJarName = Support_Resources.getURL("Integrate.jar");
InputStream is = new URL(intJarName).openConnection()
.getInputStream();
@@ -330,6 +379,10 @@ public class JarInputStreamTest extends
public void test_JarInputStream_Modified_Manifest_MainAttributes_read()
throws IOException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
String modJarName = Support_Resources
.getURL("Modified_Manifest_MainAttributes.jar");
InputStream is = new URL(modJarName).openConnection()
@@ -361,6 +414,10 @@ public class JarInputStreamTest extends
public void test_JarInputStream_Modified_SF_EntryAttributes_read()
throws IOException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
String modJarName = Support_Resources
.getURL("Modified_SF_EntryAttributes.jar");
InputStream is = new URL(modJarName).openConnection()
@@ -391,6 +448,10 @@ public class JarInputStreamTest extends
}
public void test_getNextEntry() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
File resources = Support_Resources.createTempFolder();
Support_Resources.copyFile(resources, null, "Broken_entry.jar");
InputStream is = Support_Resources.getStream("Broken_entry.jar");
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java Wed May 26 09:31:07 2010
@@ -29,6 +29,7 @@ import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
import tests.support.resource.Support_Resources;
+import tests.support.Support_Excludes;
public class GZIPInputStreamTest extends junit.framework.TestCase {
File resources;
@@ -55,6 +56,10 @@ public class GZIPInputStreamTest extends
* @tests java.util.zip.GZIPInputStream#GZIPInputStream(java.io.InputStream)
*/
public void test_ConstructorLjava_io_InputStream() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// test method java.util.zip.GZIPInputStream.constructor
try {
Support_Resources.copyFile(resources, "GZIPInputStream",
@@ -79,6 +84,10 @@ public class GZIPInputStreamTest extends
* int)
*/
public void test_ConstructorLjava_io_InputStreamI() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// test method java.util.zip.GZIPInputStream.constructorI
try {
Support_Resources.copyFile(resources, "GZIPInputStream",
@@ -102,6 +111,10 @@ public class GZIPInputStreamTest extends
* @tests java.util.zip.GZIPInputStream#read(byte[], int, int)
*/
public void test_read$BII() throws IOException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// test method java.util.zip.GZIPInputStream.readBII
byte orgBuf[] = { '3', '5', '2', 'r', 'g', 'e', 'f', 'd', 'e', 'w' };
byte outBuf[] = new byte[100];
@@ -221,6 +234,10 @@ public class GZIPInputStreamTest extends
* @tests java.util.zip.GZIPInputStream#close()
*/
public void test_close() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// test method java.util.zip.GZIPInputStream.close
byte outBuf[] = new byte[100];
try {
@@ -260,6 +277,10 @@ public class GZIPInputStreamTest extends
* @tests java.util.zip.GZIPInputStream#read()
*/
public void test_read() throws IOException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
GZIPInputStream gis = null;
int result = 0;
byte[] buffer = new byte[] {1,2,3,4,5,6,7,8,9,10};
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/auth/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/auth/make/run-test.xml?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/auth/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/auth/make/run-test.xml Wed May 26 09:31:07 2010
@@ -31,7 +31,7 @@
<target name="test" depends="test-module" />
- <target name="test-module" depends="test-jre-vm-info">
+ <target name="test-module">
<convert-test-as-class from="test.case" to="converted.tc.class" />
<run-hdk-tests module="auth" jar="auth_tests.jar">
<junit-elements>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/JndiLoginModuleTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/JndiLoginModuleTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/JndiLoginModuleTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/JndiLoginModuleTest.java Wed May 26 09:31:07 2010
@@ -33,6 +33,7 @@ import javax.security.auth.login.LoginEx
import junit.framework.TestCase;
import org.apache.harmony.auth.module.JndiLoginModule;
+import tests.support.Support_Excludes;
public class JndiLoginModuleTest extends TestCase {
@@ -62,6 +63,10 @@ public class JndiLoginModuleTest extends
* {@link org.apache.harmony.auth.module.JndiLoginModule#abort()}.
*/
public void test_abort() throws LoginException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JndiLoginModule jlm = new JndiLoginModule();
try {
assertFalse("Should return false if login failed or no login", jlm
@@ -95,6 +100,10 @@ public class JndiLoginModuleTest extends
* {@link org.apache.harmony.auth.module.JndiLoginModule#commit()}.
*/
public void test_commit() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JndiLoginModule module = new JndiLoginModule();
Subject subject = new Subject();
module.initialize(subject, new MockCallbackHandler(), null, options);
@@ -122,6 +131,10 @@ public class JndiLoginModuleTest extends
* {@link org.apache.harmony.auth.module.JndiLoginModule#initialize(javax.security.auth.Subject, javax.security.auth.callback.CallbackHandler, java.util.Map, java.util.Map)}.
*/
public void test_initialize() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JndiLoginModule module = new JndiLoginModule();
try {
module.initialize(null, null, null, null);
@@ -136,6 +149,10 @@ public class JndiLoginModuleTest extends
* {@link org.apache.harmony.auth.module.JndiLoginModule#login()}.
*/
public void test_login() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JndiLoginModule module = new JndiLoginModule();
HashMap<String, String> emptyOptions = new HashMap<String, String>();
module.initialize(null, new MockCallbackHandler(), null, emptyOptions);
@@ -167,6 +184,10 @@ public class JndiLoginModuleTest extends
* {@link org.apache.harmony.auth.module.JndiLoginModule#logout()}.
*/
public void test_logout() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JndiLoginModule module = new JndiLoginModule();
Subject subject = new Subject();
module.initialize(subject, new MockCallbackHandler(), null, options);
@@ -188,6 +209,10 @@ public class JndiLoginModuleTest extends
}
public void test_optionsAndSharedStatus() throws LoginException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
options.put("debug", "true");
options.put("useFirstPass", "true");
HashMap<String, Object> status = new HashMap<String, Object>();
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/Krb5LoginModuleTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/Krb5LoginModuleTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/Krb5LoginModuleTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/module/Krb5LoginModuleTest.java Wed May 26 09:31:07 2010
@@ -31,6 +31,7 @@ import junit.framework.TestCase;
import org.apache.harmony.auth.module.Krb5LoginModule;
import org.apache.harmony.auth.tests.internal.kerberos.v5.KerberosErrorMessageTest;
import org.apache.harmony.auth.tests.support.TestUtils;
+import tests.support.Support_Excludes;
public class Krb5LoginModuleTest extends TestCase {
@@ -97,6 +98,10 @@ public class Krb5LoginModuleTest extends
*/
public void test_Config() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// create login module for testing
Krb5LoginModule module = new Krb5LoginModule();
module.initialize(null, new MockCallbackHandler(), null, options);
@@ -127,6 +132,10 @@ public class Krb5LoginModuleTest extends
*/
public void test_login() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
if (server != null) {
server.respond = KerberosErrorMessageTest.err_resp;
}
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/run-test.xml?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/run-test.xml Wed May 26 09:31:07 2010
@@ -31,7 +31,7 @@
<target name="test" depends="test-module" />
- <target name="test-module" depends="test-jre-vm-info">
+ <target name="test-module">
<convert-test-as-class from="test.case" to="converted.tc.class" />
<!-- bootclasspath tests -->
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTCanvasTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTCanvasTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTCanvasTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTCanvasTest.java Wed May 26 09:31:07 2010
@@ -27,6 +27,7 @@ import javax.accessibility.AccessibleRol
import javax.accessibility.AccessibleState;
import junit.framework.TestCase;
+import tests.support.Support_Excludes;
/**
* AccessibleAWTCanvas
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTComponentTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTComponentTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTComponentTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTComponentTest.java Wed May 26 09:31:07 2010
@@ -33,6 +33,7 @@ import javax.accessibility.AccessibleSta
import javax.accessibility.AccessibleStateSet;
import junit.framework.TestCase;
+import tests.support.Support_Excludes;
/**
* AccessibleAWTComponentTest
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTListChildTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTListChildTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTListChildTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTListChildTest.java Wed May 26 09:31:07 2010
@@ -28,6 +28,7 @@ import javax.accessibility.AccessibleCon
import javax.accessibility.AccessibleRole;
import javax.accessibility.AccessibleState;
import junit.framework.TestCase;
+import tests.support.Support_Excludes;
/**
* AccessibleAWTListChildTest
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTWindowTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTWindowTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTWindowTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/AccessibleAWTWindowTest.java Wed May 26 09:31:07 2010
@@ -27,6 +27,7 @@ import javax.accessibility.AccessibleSta
import javax.accessibility.AccessibleStateSet;
import junit.framework.TestCase;
+import tests.support.Support_Excludes;
/**
* AccessibleAWTWindowTest
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/BasicStrokeTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/BasicStrokeTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/BasicStrokeTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/BasicStrokeTest.java Wed May 26 09:31:07 2010
@@ -31,6 +31,7 @@ import java.io.StreamTokenizer;
import java.io.StringReader;
import java.util.Arrays;
import java.net.URL;
+import tests.support.Support_Excludes;
public class BasicStrokeTest extends TestCase {
@@ -53,6 +54,10 @@ public class BasicStrokeTest extends Tes
}
public void testCreate() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
BasicStroke bs = new BasicStroke();
assertNotNull(bs);
assertEquals(bs, new BasicStroke(1.0f));
@@ -142,6 +147,10 @@ public class BasicStrokeTest extends Tes
}
public void testCreateStrokedShape() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
File path = new File(shapePath);
String test[] = path.list();
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ButtonRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ButtonRTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ButtonRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ButtonRTest.java Wed May 26 09:31:07 2010
@@ -25,10 +25,15 @@ import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import junit.framework.TestCase;
+import tests.support.Support_Excludes;
public class ButtonRTest extends TestCase {
public void testShowAndPack() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Frame frm = new Frame("Test");
Button btnClose = new Button("MyClose");
btnClose.setBounds(10, 10, 80, 22);
@@ -47,6 +52,10 @@ public class ButtonRTest extends TestCas
// Regression test for HARMONY-2305
// Currently fails on Linux version of RI
public void testHarmony2305() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
final Frame f = new Frame();
final Button b1 = new Button("B1"); //$NON-NLS-1$
final Button b2 = new Button("B2"); //$NON-NLS-1$
@@ -83,12 +92,20 @@ public class ButtonRTest extends TestCas
// Regression test for HARMONY-3701
public void testHarmony3701() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
setName("testHarmony3701"); //$NON-NLS-1$
testHarmony2305();
testHarmony2305();
}
public void testDeadLoop4887() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
final int count[] = new int[1];
Button b = new Button() {
public void paint(Graphics g) {
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/CardLayoutTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/CardLayoutTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/CardLayoutTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/CardLayoutTest.java Wed May 26 09:31:07 2010
@@ -19,6 +19,9 @@
*/
package java.awt;
+import tests.support.Support_Excludes;
+
+
@SuppressWarnings("serial")
public class CardLayoutTest extends AWTTestCase {
@@ -72,17 +75,29 @@ public class CardLayoutTest extends AWTT
}
public void testCardLayoutintint() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
layout = new CardLayout(10, 5);
assertEquals(layout.getHgap(), 10);
assertEquals(layout.getVgap(), 5);
}
public void testCardLayout() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(layout.getHgap(), 0);
assertEquals(layout.getVgap(), 0);
}
public void testToString() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertTrue(new String("java.awt.CardLayout[hgap=10,vgap=20]").equals(new CardLayout(10,20).toString()));
}
@@ -110,6 +125,10 @@ public class CardLayoutTest extends AWTT
@SuppressWarnings("deprecation")
public void testAddLayoutComponentComponentObject() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Container c = new Container();
c.setSize(1, 2);
c.add(b1);
@@ -133,6 +152,10 @@ public class CardLayoutTest extends AWTT
@SuppressWarnings("deprecation")
public void testRemoveLayoutComponent() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Container c = new Container();
c.setSize(13, 13);
c.add(b1);
@@ -156,6 +179,10 @@ public class CardLayoutTest extends AWTT
public void testFirstLast() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame.add(b1, "");
frame.add(b2, "");
frame.add(b3, "");
@@ -173,6 +200,10 @@ public class CardLayoutTest extends AWTT
}
public void testNextPrev() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame.add(b1, "");
frame.add(b2, "");
frame.add(b3, "");
@@ -194,6 +225,10 @@ public class CardLayoutTest extends AWTT
public void testShow() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame.add(b1, "1");
frame.add(b2, "2");
frame.add(b3, "3");
@@ -210,10 +245,18 @@ public class CardLayoutTest extends AWTT
}
public void testMaximumLayoutSize() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(layout.maximumLayoutSize(frame), new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE));
}
public void testMinimumLayoutSize() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame.add(b1, "1");
frame.add(b2, "2");
frame.add(b3, "3");
@@ -234,6 +277,10 @@ public class CardLayoutTest extends AWTT
}
public void testPreferredLayoutSize() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame.add(b1, "1");
frame.add(b2, "2");
frame.add(b3, "3");
@@ -255,6 +302,10 @@ public class CardLayoutTest extends AWTT
public void testLayoutContainer() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame.add(b1, "1");
frame.add(b2, "2");
frame.add(b3, "3");
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ChoiceTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ChoiceTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ChoiceTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ChoiceTest.java Wed May 26 09:31:07 2010
@@ -26,6 +26,7 @@ import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import junit.framework.TestCase;
+import tests.support.Support_Excludes;
/**
* ChoiceTest
@@ -365,6 +366,10 @@ public class ChoiceTest extends TestCase
}
public void testDeadLoop4887() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
final int count[] = new int[1];
Component c = new Choice() {
public void paint(Graphics g) {
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ComponentTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ComponentTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ComponentTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ComponentTest.java Wed May 26 09:31:07 2010
@@ -35,6 +35,7 @@ import java.util.Map;
import java.util.Set;
import junit.framework.TestCase;
+import tests.support.Support_Excludes;
@SuppressWarnings("serial")
public class ComponentTest extends TestCase {
@@ -196,6 +197,10 @@ public class ComponentTest extends TestC
methodCalled = setBoundsCalled = reshapeCalled = false;
}
public void testCreate(){
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertNotNull(tc);
assertNotNull(myTestComp);
}
@@ -339,6 +344,10 @@ public class ComponentTest extends TestC
}
public void testGetFont() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// Regression for HARMONY-1605
final Font defaultFont = new Font("Dialog", Font.PLAIN, 12); //$NON-NLS-1$
final Window w = new Window(new Frame());
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ContainerOrderFocusTraversalPolicyTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ContainerOrderFocusTraversalPolicyTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ContainerOrderFocusTraversalPolicyTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ContainerOrderFocusTraversalPolicyTest.java Wed May 26 09:31:07 2010
@@ -20,6 +20,7 @@
package java.awt;
import junit.framework.TestCase;
+import tests.support.Support_Excludes;
@SuppressWarnings("serial")
public class ContainerOrderFocusTraversalPolicyTest extends TestCase {
Frame frame;
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/GridLayoutTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/GridLayoutTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/GridLayoutTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/GridLayoutTest.java Wed May 26 09:31:07 2010
@@ -19,6 +19,8 @@
*/
package java.awt;
+import tests.support.Support_Excludes;
+
public class GridLayoutTest extends AWTTestCase {
@SuppressWarnings("serial")
@@ -72,6 +74,10 @@ public class GridLayoutTest extends AWTT
}
public void testGridLayout() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(layout.getColumns(), 0);
assertEquals(layout.getRows(), 1);
assertEquals(layout.getHgap(), 0);
@@ -79,6 +85,10 @@ public class GridLayoutTest extends AWTT
}
public void testGridLayoutintint() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
layout = new GridLayout(2, 3);
assertEquals(layout.getColumns(), 3);
assertEquals(layout.getRows(), 2);
@@ -95,6 +105,10 @@ public class GridLayoutTest extends AWTT
}
public void testGridLayoutintintintint() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
layout = new GridLayout(2, 3, 10, 20);
assertEquals(layout.getColumns(), 3);
assertEquals(layout.getRows(), 2);
@@ -111,6 +125,10 @@ public class GridLayoutTest extends AWTT
}
public void testToString() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
layout = new GridLayout(1,2,3,4);
assertTrue(new String("java.awt.GridLayout[hgap=3,vgap=4,rows=1,cols=2]").equals(layout.toString()));
}
@@ -130,6 +148,10 @@ public class GridLayoutTest extends AWTT
}
public void testGetSetColumns() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
layout = new GridLayout(2, 3);
layout.setColumns(10);
assertEquals(layout.getColumns(), 10);
@@ -145,6 +167,10 @@ public class GridLayoutTest extends AWTT
}
public void testGetSetRows() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
layout = new GridLayout(2, 3);
layout.setRows(10);
assertEquals(layout.getRows(), 10);
@@ -160,6 +186,10 @@ public class GridLayoutTest extends AWTT
}
public void testAddLayoutComponent() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Container c = new Container();
c.setSize(200, 20);
c.add(b1);
@@ -178,6 +208,10 @@ public class GridLayoutTest extends AWTT
}
public void testRemoveLayoutComponent() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Container c = new Container();
c.setSize(200, 20);
c.add(b1);
@@ -194,6 +228,10 @@ public class GridLayoutTest extends AWTT
}
public void testMinimumLayoutSize() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Dimension expected = new Dimension();
Insets insets = frame.getInsets();
@@ -220,6 +258,10 @@ public class GridLayoutTest extends AWTT
}
public void testPreferredLayoutSize() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Dimension expected = new Dimension();
Insets insets = frame.getInsets();
@@ -247,6 +289,10 @@ public class GridLayoutTest extends AWTT
public void testLayoutContainer() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Insets insets = frame.getInsets();
frame.add(b1);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/KeyboardFocusManagerRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/KeyboardFocusManagerRTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/KeyboardFocusManagerRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/KeyboardFocusManagerRTest.java Wed May 26 09:31:07 2010
@@ -20,6 +20,7 @@ import java.awt.event.KeyEvent;
import java.util.Set;
import junit.framework.TestCase;
+import tests.support.Support_Excludes;
@SuppressWarnings("serial")
public class KeyboardFocusManagerRTest extends TestCase {
Robot robot;
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ListTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ListTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ListTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ListTest.java Wed May 26 09:31:07 2010
@@ -21,6 +21,7 @@ package java.awt;
import java.awt.event.*;
import junit.framework.TestCase;
+import tests.support.Support_Excludes;
/**
* ListTest
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/RobotTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/RobotTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/RobotTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/RobotTest.java Wed May 26 09:31:07 2010
@@ -29,6 +29,7 @@ import java.math.BigInteger;
import java.security.Permission;
import junit.framework.TestCase;
+import tests.support.Support_Excludes;
/**
* RobotTest
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ScrollPaneAdjustableTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ScrollPaneAdjustableTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ScrollPaneAdjustableTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/test/impl/boot/java/awt/ScrollPaneAdjustableTest.java Wed May 26 09:31:07 2010
@@ -23,6 +23,7 @@ import java.awt.event.AdjustmentEvent;
import java.awt.event.AdjustmentListener;
import junit.framework.TestCase;
+import tests.support.Support_Excludes;
/**
* ScrollPaneAdjustableTest
@@ -220,6 +221,10 @@ public class ScrollPaneAdjustableTest ex
}
public void testAddGetRemoveAdjustmentListener() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(0, vAdjustable.getAdjustmentListeners().length);
AdjustmentListener listener = new AdjustmentListener() {