harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r421485 - in /incubator/harmony/enhanced/classlib/trunk/modules/prefs: .classpath build.xml src/test/resources/prefs/java/util/prefs/userprefs.xml
Date Thu, 13 Jul 2006 03:34:37 GMT
Author: ndbeyer
Date: Wed Jul 12 20:34:36 2006
New Revision: 421485

URL: http://svn.apache.org/viewvc?rev=421485&view=rev
Log:
Apply patch for HARMONY-859: [classlib][util] invalid data file for unit test org.apache.harmony.prefs.tests.java.util.prefs.PreferencesTest

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/.classpath
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/src/test/resources/prefs/java/util/prefs/userprefs.xml

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/.classpath
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/prefs/.classpath?rev=421485&r1=421484&r2=421485&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/.classpath (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/.classpath Wed Jul 12 20:34:36
2006
@@ -2,7 +2,8 @@
 <classpath>
 	<classpathentry output="bin/main" kind="src" path="src/main/java"/>
 	<classpathentry output="bin/test" kind="src" path="src/test/java"/>
+	<classpathentry output="bin/test" kind="src" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry sourcepath="JUNIT_SRC_HOME/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="bin/main"/>
 </classpath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?rev=421485&r1=421484&r2=421485&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml Wed Jul 12 20:34:36
2006
@@ -152,7 +152,6 @@
                     <include name="**/*Test.java"/>
                     <exclude name="org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java"/>
                     <exclude name="org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java"/>
-                    <exclude name="org/apache/harmony/prefs/tests/java/util/prefs/PreferencesTest.java"/>
                 </fileset>
             </batchtest>
         </junit>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/src/test/resources/prefs/java/util/prefs/userprefs.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/prefs/src/test/resources/prefs/java/util/prefs/userprefs.xml?rev=421485&r1=421484&r2=421485&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/src/test/resources/prefs/java/util/prefs/userprefs.xml
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/src/test/resources/prefs/java/util/prefs/userprefs.xml
Wed Jul 12 20:34:36 2006
@@ -19,41 +19,53 @@
 <preferences EXTERNAL_XML_VERSION="1.0">
   <root type="user">
     <map />
-    <node name="tests">
+    <node name="org">
       <map />
-      <node name="api">
+      <node name="apache">
         <map />
-        <node name="java">
-          <map />
-          <node name="util">
+          <node name="harmony">
             <map />
             <node name="prefs">
-              <map>
-                <entry key="prefskey" value="newvalue" />
-                <entry key="prefskey3" value="newvalue3" />
-              </map>
-              <node name="mock">
+              <map />
+              <node name="tests">
                 <map />
-                <node name="child">
-                  <map>
-                    <entry key="key2" value="value2" />
-                  </map>
-                  <node name="grandson">
-                    <map>
-                      <entry key="key3" value="value3" />
-                    </map>
-                    <node name="grandgrandson">
+                <node name="java">
+                  <map />
+                  <node name="util">
+                    <map />
+                    
+                    <node name="prefs">
                       <map>
-                        <entry key="key4" value="value4" />
+                        <entry key="prefskey" value="newvalue" />
+                        <entry key="prefskey3" value="newvalue3" />
                       </map>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
+
+                      <node name="mock">
+                        <map />
+                        <node name="child">
+                          <map>
+                            <entry key="key2" value="value2" />
+                          </map>
+                          <node name="grandson">
+                            <map>
+                              <entry key="key3" value="value3" />
+                            </map>
+                          <node name="grandgrandson">
+                            <map>
+                              <entry key="key4" value="value4" />
+                            </map>
+                          </node> <!--grandgrandson-->
+                        </node> <!--grandson-->
+                      </node> <!--child-->
+                    </node> <!--mock-->
+
+                  </node> <!--prefs-->
+                </node> <!--util-->
+              </node> <!--java-->
+            </node> <!--tests-->
+          </node> <!--prefs-->
+        </node> <!--harmony-->
+      </node> <!--apache-->
+    </node> <!--org-->
   </root>
 </preferences>



Mime
View raw message