harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mloe...@apache.org
Subject svn commit: r397499 - in /incubator/harmony/enhanced/classlib/trunk/modules: archive/make/common/ beans/make/common/ beans/src/test/java/org/apache/harmony/tests/java/beans/ jndi/make/common/ logging/make/common/ nio_char/make/common/ prefs/make/common...
Date Thu, 27 Apr 2006 10:01:08 GMT
Author: mloenko
Date: Thu Apr 27 03:01:05 2006
New Revision: 397499

URL: http://svn.apache.org/viewcvs?rev=397499&view=rev
Log:
fixes for HARMONY-404
Wild card exclusions are excluding working tests

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/BeansTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml?rev=397499&r1=397498&r2=397499&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml Thu Apr
27 03:01:05 2006
@@ -99,10 +99,9 @@
 
                 <fileset dir="${hy.archive.src.test.java}">
                     <include name="**/*Test.java"/>
-                    <exclude name="**/JarOutputStreamTest.java"/>
-                    <exclude name="**/GZIPInputStreamTest.java"/>
-                    <exclude name="**/InflaterInputStreamTest.java"/>
-                    <exclude name="**/InflaterTest.java"/>
+                    <exclude name="org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java"/>
+                    <exclude name="org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java"/>
+                    <exclude name="org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java"/>
 
                 </fileset>
             </batchtest>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml?rev=397499&r1=397498&r2=397499&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml Thu Apr
27 03:01:05 2006
@@ -101,16 +101,16 @@
                 <fileset dir="${hy.beans.src.test.java}">
                     <include name="**/*Test.java"/>
                     <!-- TOFIX: these fail -->
-                    <exclude name="**/BeansTest.java" />
-                    <exclude name="**/BeanContextServicesSupportTest.java" />
-                    <exclude name="**/BeanContextSupportTest.java" />
-                    <exclude name="**/EventHandlerTest.java" />
-                    <exclude name="**/SimpleBeanInfoTest.java" />
-
+                    <exclude name="java/beans/beancontext/BeanContextServicesSupportTest.java"
/>
+                    <exclude name="java/beans/beancontext/BeanContextSupportTest.java"
/>
+                    <exclude name="org/apache/harmony/tests/java/beans/EventHandlerTest.java"
/>
+                    <exclude name="org/apache/harmony/tests/java/beans/SimpleBeanInfoTest.java"
/>
                     <exclude name="tests/api/java/beans/BeanDescriptorTest.java" />
+                    <exclude name="tests/api/java/beans/BeansTest.java" />
                     <exclude name="tests/api/java/beans/CustomizedPersistenceDelegateTest.java"
/>
                     <exclude name="tests/api/java/beans/DefaultPersistenceDelegateTest.java"
/>
                     <exclude name="tests/api/java/beans/EncoderTest.java" />
+                    <exclude name="tests/api/java/beans/EventHandlerTest.java" />
                     <exclude name="tests/api/java/beans/EventSetDescriptorTest.java" />
                     <exclude name="tests/api/java/beans/ExpressionTest.java" />
                     <exclude name="tests/api/java/beans/FeatureDescriptorTest.java" />
@@ -134,6 +134,8 @@
                     <exclude name="tests/api/java/beans/beancontext/BeanContextMembershipEventTest.java"
/>
                     <exclude name="tests/api/java/beans/beancontext/BeanContextServiceAvailableEventTest.java"
/>
                     <exclude name="tests/api/java/beans/beancontext/BeanContextServiceRevokedEventTest.java"
/>
+                    <exclude name="tests/api/java/beans/beancontext/BeanContextServicesSupportTest.java"
/>
+                    <exclude name="tests/api/java/beans/beancontext/BeanContextSupportTest.java"
/>
                 </fileset>
             </batchtest>
         </junit>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/BeansTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/BeansTest.java?rev=397499&r1=397498&r2=397499&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/BeansTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/BeansTest.java
Thu Apr 27 03:01:05 2006
@@ -59,7 +59,7 @@
      * using specific classloader for class loading
      */
     public void testLoadBySpecificClassLoader() {
-        String beanName = "org.apache.harmony.tests.beans.auxiliary.SampleBean";
+        String beanName = "org.apache.harmony.tests.java.beans.auxiliary.SampleBean";
         
         try {
             ClassLoader cls = createSpecificClassLoader();
@@ -82,7 +82,7 @@
      * using default classloader for class loading
      */
     public void testLoadByDefaultClassLoader() {
-        String beanName = "org.apache.harmony.tests.beans.auxiliary.SampleBean";
+        String beanName = "org.apache.harmony.tests.java.beans.auxiliary.SampleBean";
         
         try {
             Object bean = Beans.instantiate(null, beanName);
@@ -152,4 +152,4 @@
         public void writeExternal(ObjectOutput out) {}; 
         public void readExternal(ObjectInput in){}; 
     } 
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml?rev=397499&r1=397498&r2=397499&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml Thu Apr 27
03:01:05 2006
@@ -101,14 +101,14 @@
                     <include name="**/*Test.java"/>
                 	
                 	<!-- Requires further investigation -->
-                	<exclude name="**/DirectoryManagerTest.java" />
+                	<exclude name="org/apache/harmony/jndi/tests/javax/naming/spi/DirectoryManagerTest.java"
/>
                 	
                     <!--
                     To make the following two test cases pass, 
                     set forkmode="perTest"
                     -->
-                	<exclude name="**/NamingManagerBuilderTest.java" />
-                    <exclude name="**/NamingManagerTest.java" />
+                	<exclude name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerBuilderTest.java"
/>
+                    <exclude name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerTest.java"
/>
                 </fileset>
             </batchtest>
         </junit>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml?rev=397499&r1=397498&r2=397499&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml Thu Apr
27 03:01:05 2006
@@ -120,17 +120,17 @@
                 unless="test.case">
 
                 <fileset dir="${hy.logging.src.test.java}">
-                    <include name="**/*Test.java"/>
-                    <exclude name="**/FileHandlerTest.java" />
-                    <exclude name="**/FormatterTest.java" />
-                    <exclude name="**/LevelTest.java" />
-                    <exclude name="**/LogManagerTest.java" />
-                    <exclude name="**/LogRecordTest.java" />
-                    <exclude name="**/LoggerTest.java" />
-                    <exclude name="**/LoggingPermissionTest.java" />
-                    <exclude name="**/SimpleFormatterTest.java" />
-                    <exclude name="**/SocketHandlerTest.java" />
-                    <exclude name="**/XMLFormatterTest.java" />
+                    <include name="tests/api/java/util/logging/*Test.java"/>
+                    <exclude name="tests/api/java/util/logging/FileHandlerTest.java" />
+                    <exclude name="tests/api/java/util/logging/FormatterTest.java" />
+                    <exclude name="tests/api/java/util/logging/LevelTest.java" />
+                    <exclude name="tests/api/java/util/logging/LogManagerTest.java" />
+                    <exclude name="tests/api/java/util/logging/LogRecordTest.java" />
+                    <exclude name="tests/api/java/util/logging/LoggerTest.java" />
+                    <exclude name="tests/api/java/util/logging/LoggingPermissionTest.java"
/>
+                    <exclude name="tests/api/java/util/logging/SimpleFormatterTest.java"
/>
+                    <exclude name="tests/api/java/util/logging/SocketHandlerTest.java"
/>
+                    <exclude name="tests/api/java/util/logging/XMLFormatterTest.java"
/>
                 </fileset>
             </batchtest>
         </junit>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml?rev=397499&r1=397498&r2=397499&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml Thu Apr
27 03:01:05 2006
@@ -99,21 +99,21 @@
 
                 <fileset dir="${hy.nio_char.src.test.java}">
                     <include name="**/*Test.java"/>
-                    <exclude name="**/ASCCharsetEncoderTest.java"/>
-                    <exclude name="**/CharsetEncoderTest.java"/>
-                    <exclude name="**/CharsetProviderTest.java"/>
-                    <exclude name="**/CharsetTest.java"/>
+                    <exclude name="tests/api/java/nio/charset/ASCCharsetEncoderTest.java"/>
+                    <exclude name="tests/api/java/nio/charset/CharsetEncoderTest.java"/>
+                    <exclude name="tests/api/java/nio/charset/CharsetProviderTest.java"/>
+                    <exclude name="tests/api/java/nio/charset/CharsetTest.java"/>
                     <!-- No public constructor? -->
-                    <exclude name="**/ConcreteCharsetTest.java"/>
-                    <exclude name="**/GBCharsetEncoderTest.java"/>
-                    <exclude name="**/ISOCharsetEncoderTest.java"/>
-                    <exclude name="**/IllegalCharsetNameExceptionTest.java"/>
-                    <exclude name="**/UTF16BECharsetEncoderTest.java"/>
-                    <exclude name="**/UTF16CharsetDecoderTest.java"/>
-                    <exclude name="**/UTF16CharsetEncoderTest.java"/>
-                    <exclude name="**/UTF16LECharsetEncoderTest.java"/>
-                    <exclude name="**/UTFCharsetEncoderTest.java"/>
-                    <exclude name="**/UnsupportedCharsetExceptionTest.java"/>
+                    <exclude name="tests/api/java/nio/charset/ConcreteCharsetTest.java"/>
+                    <exclude name="tests/api/java/nio/charset/GBCharsetEncoderTest.java"/>
+                    <exclude name="tests/api/java/nio/charset/ISOCharsetEncoderTest.java"/>
+                    <exclude name="tests/api/java/nio/charset/IllegalCharsetNameExceptionTest.java"/>
+                    <exclude name="tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java"/>
+                    <exclude name="tests/api/java/nio/charset/UTF16CharsetDecoderTest.java"/>
+                    <exclude name="tests/api/java/nio/charset/UTF16CharsetEncoderTest.java"/>
+                    <exclude name="tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java"/>
+                    <exclude name="tests/api/java/nio/charset/UTFCharsetEncoderTest.java"/>
+                    <exclude name="tests/api/java/nio/charset/UnsupportedCharsetExceptionTest.java"/>
                 </fileset>
             </batchtest>
         </junit>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml?rev=397499&r1=397498&r2=397499&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml Thu Apr
27 03:01:05 2006
@@ -99,9 +99,9 @@
 
                 <fileset dir="${hy.prefs.src.test.java}">
                     <include name="**/*Test.java"/>
-                    <exclude name="**/AbstractPreferencesTest.java"/>
-                    <exclude name="**/FilePreferencesImplTest.java"/>
-                    <exclude name="**/PreferencesTest.java"/>
+                    <exclude name="tests/api/java/util/prefs/AbstractPreferencesTest.java"/>
+                    <exclude name="tests/api/java/util/prefs/FilePreferencesImplTest.java"/>
+                    <exclude name="tests/api/java/util/prefs/PreferencesTest.java"/>
                 </fileset>
             </batchtest>
         </junit>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml?rev=397499&r1=397498&r2=397499&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml Thu Apr 27
03:01:05 2006
@@ -101,7 +101,7 @@
                     <include name="**/*Test.java"/>
 
                     <!-- This test is empty -->
-                    <exclude name="**/ArrayTest.java" />
+                    <exclude name="tests/api/java/sql/ArrayTest.java" />
                 </fileset>
             </batchtest>
         </junit>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml?rev=397499&r1=397498&r2=397499&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml Thu Apr 27
03:01:05 2006
@@ -99,13 +99,13 @@
 
                 <fileset dir="${hy.text.src.test.java}">
                     <include name="**/*Test.java"/>
-                    <exclude name="**/AttributedCharacterIteratorTest.java"/>
-                    <exclude name="**/ChoiceFormatTest.java"/>
-                    <exclude name="**/CollationKeyTest.java"/>
-                    <exclude name="**/CollatorTest.java"/>
-                    <exclude name="**/DecimalFormatTest.java"/>
-                    <exclude name="**/MessageFormatTest.java"/>
-                    <exclude name="**/NumberFormatTest.java"/>
+                    <exclude name="tests/api/java/text/AttributedCharacterIteratorTest.java"/>
+                    <exclude name="tests/api/java/text/ChoiceFormatTest.java"/>
+                    <exclude name="tests/api/java/text/CollationKeyTest.java"/>
+                    <exclude name="tests/api/java/text/CollatorTest.java"/>
+                    <exclude name="tests/api/java/text/DecimalFormatTest.java"/>
+                    <exclude name="tests/api/java/text/MessageFormatTest.java"/>
+                    <exclude name="tests/api/java/text/NumberFormatTest.java"/>
                 </fileset>
             </batchtest>
         </junit>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml?rev=397499&r1=397498&r2=397499&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml Thu Apr
27 03:01:05 2006
@@ -63,7 +63,6 @@
 
             <include name="javax/net/**/*Test*.java" />
             <include name="org/apache/harmony/security/test/**/*" />
-            <exclude name="**/SecurityTest.java"/>
 
             <bootclasspath>
                 <fileset dir="${hy.target}/jre/lib/boot">
@@ -118,13 +117,13 @@
                     <exclude name="javax/net/ssl/serialization/SSLSessionBindingEventTest.java"/>
 
                     <!-- FIXME: The following tests are excluded because they fail for
reasons to be determined -->
-                    <exclude name="**/DefaultSSLServerSocketFactoryTest.java"/>
-                    <exclude name="**/DefaultSSLSocketFactoryTest.java"/>
-                    <exclude name="**/HttpsURLConnectionTest.java"/>
-                    <exclude name="**/SSLServerSocketFactoryTest.java"/>
-                    <exclude name="**/SSLSocketFactoryTest.java"/>
-                    <exclude name="**/ServerSocketFactoryTest.java"/>
-                    <exclude name="**/SocketFactoryTest.java"/>
+                    <exclude name="javax/net/ServerSocketFactoryTest.java" />
+                    <exclude name="javax/net/SocketFactoryTest.java" />
+                    <exclude name="javax/net/ssl/DefaultSSLServerSocketFactoryTest.java"
/>
+                    <exclude name="javax/net/ssl/DefaultSSLSocketFactoryTest.java" />
+                    <exclude name="javax/net/ssl/HttpsURLConnectionTest.java" />
+                    <exclude name="javax/net/ssl/SSLServerSocketFactoryTest.java" />
+                    <exclude name="javax/net/ssl/SSLSocketFactoryTest.java" />
                 </fileset>
             </batchtest>
         </junit>



Mime
View raw message