You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by gh...@apache.org on 2006/04/27 21:42:05 UTC
svn commit: r397621 - in
/incubator/harmony/enhanced/classlib/trunk/modules/logging: make/common/
src/test/java-internal/ src/test/java.injected/ src/test/java/org/
src/test/java/org/apache/ src/test/java/org/apache/harmony/
src/test/java/org/apache/ha...
Author: gharley
Date: Thu Apr 27 12:42:00 2006
New Revision: 397621
URL: http://svn.apache.org/viewcvs?rev=397621&view=rev
Log:
Merge all logging tests into one package whose name meets naming convention. Other modules to follow.
Added:
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java-internal/
- copied from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java.injected/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/AllTests.java (with props)
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/AllTests.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/AllTests.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ConsoleHandlerTest.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/ConsoleHandlerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ErrorManagerTest.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/ErrorManagerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/FileHandlerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FilterTest.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/FilterTest.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FormatterTest.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/FormatterTest.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/HandlerTest.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/HandlerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTest.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LevelTest.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LogManagerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LogRecordTest.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LoggerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingPermissionTest.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LoggingPermissionTest.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/MemoryHandlerTest.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/MemoryHandlerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SimpleFormatterTest.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/SimpleFormatterTest.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SocketHandlerTest.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/SocketHandlerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/StreamHandlerTest.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/StreamHandlerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/XMLFormatterTest.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/XMLFormatterTest.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/DefaultPropertyHelper.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/util/DefaultPropertyHelper.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/EnvironmentHelper.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/util/EnvironmentHelper.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/ProjectVersion.java
- copied, changed from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/util/ProjectVersion.java
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res.properties (with props)
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res2.properties (with props)
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res3.properties (with props)
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res_en_US.properties (with props)
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res_zh_CN.properties (with props)
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/config/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/config/java/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/config/java/util/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/config/java/util/logging/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/config/java/util/logging/logging.config (with props)
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/serialization/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/serialization/java/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/serialization/java/util/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/serialization/java/util/logging/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/serialization/java/util/logging/Level.ser (with props)
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/serialization/java/util/logging/LogPermission.ser (with props)
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/serialization/java/util/logging/LogRecord.ser (with props)
Removed:
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java.injected/
incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml
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=397621&r1=397620&r2=397621&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 12:42:00 2006
@@ -17,7 +17,8 @@
<project name="Common_LOGGING_Build">
- <target name="compile.java" description="Compile LOGGING java code">
+ <target name="compile.java" description="Compile LOGGING java code"
+ depends="copy.resources">
<echo message="Compiling LOGGING classes from ${hy.logging.src.main.java}" />
<mkdir dir="${hy.logging.bin.main}" />
@@ -45,14 +46,14 @@
</target>
- <target name="compile.tests">
+ <target name="compile.tests" depends="copy.test.resources" >
<echo message="Compiling LOGGING tests from ${hy.logging.src.test.java}" />
- <mkdir dir="${hy.logging.bin.injected}" />
+ <mkdir dir="${hy.logging.bin.internal}" />
<mkdir dir="${hy.logging.bin.test}" />
- <javac srcdir="${hy.logging.src.test.injected}"
- destdir="${hy.logging.bin.injected}"
+ <javac srcdir="${hy.logging.src.test.internal}"
+ destdir="${hy.logging.bin.internal}"
sourcepath=""
source="${hy.javac.source}"
target="${hy.javac.target}"
@@ -76,7 +77,7 @@
<fileset dir="${hy.target}/jre/lib/boot">
<include name="**/*.jar" />
</fileset>
- <pathelement path="${hy.logging.bin.injected}"/>
+ <pathelement path="${hy.logging.bin.internal}"/>
</bootclasspath>
<classpath location="../../../../build/tests" />
</javac>
@@ -106,7 +107,7 @@
<fileset dir="${hy.target}/jre/lib/boot">
<include name="**/*.jar" />
</fileset>
- <pathelement path="${hy.logging.bin.injected}"/>
+ <pathelement path="${hy.logging.bin.internal}"/>
</bootclasspath>
<classpath>
<pathelement path="${hy.logging.bin.test}"/>
@@ -120,17 +121,11 @@
unless="test.case">
<fileset dir="${hy.logging.src.test.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" />
+ <include name="org/apache/harmony/logging/tests/java/util/logging/*Test.java"/>
+ <exclude name="org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java" />
+ <exclude name="org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java" />
+ <exclude name="org/apache/harmony/logging/tests/java/util/logging/LoggingPermissionTest.java" />
+ <exclude name="org/apache/harmony/logging/tests/java/util/logging/SocketHandlerTest.java" />
</fileset>
</batchtest>
</junit>
@@ -156,5 +151,15 @@
</fileset>
</copy>
</target>
+
+ <target name="copy.test.resources">
+ <mkdir dir="${hy.logging.bin.test}" />
+ <copy todir="${hy.logging.bin.test}" includeemptydirs="false">
+ <fileset dir="${hy.logging.src.test.resources}">
+ <exclude name="**/*.java" />
+ </fileset>
+ </copy>
+ </target>
+
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml?rev=397621&r1=397620&r2=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml Thu Apr 27 12:42:00 2006
@@ -25,14 +25,14 @@
<test>
<java location="src/test/java" />
<resources location="src/test/resources" />
- <injected location="src/test/java.injected" />
+ <internal location="src/test/java-internal" />
</test>
<natives location="src/natives" />
</src>
<bin>
<main location="bin/main" />
<test location="bin/test" />
- <injected location="bin/injected" />
+ <internal location="bin/test-internal" />
</bin>
<packaging>
</packaging>
Added: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/AllTests.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/AllTests.java?rev=397621&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/AllTests.java (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/AllTests.java Thu Apr 27 12:42:00 2006
@@ -0,0 +1,37 @@
+/* Copyright 2004 The Apache Software Foundation or its licensors, as applicable
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.harmony.logging.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * Test suite that includes all tests for the Logging project.
+ */
+public class AllTests {
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(AllTests.suite());
+ }
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("All Logging test suites");
+ // $JUnit-BEGIN$
+ suite.addTest(org.apache.harmony.logging.tests.java.util.logging.AllTests.suite());
+ // $JUnit-END$
+ return suite;
+ }
+}
\ No newline at end of file
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/AllTests.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/AllTests.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/AllTests.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/AllTests.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/AllTests.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/AllTests.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/AllTests.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/AllTests.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging;
+package org.apache.harmony.logging.tests.java.util.logging;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -23,7 +23,8 @@
public class AllTests {
public static Test suite() {
- TestSuite suite = new TestSuite("Test for java.util.logging");
+ TestSuite suite = new TestSuite(
+ "Suite for org.apache.harmony.logging.tests.java.util.logging");
// $JUnit-BEGIN$
suite.addTestSuite(LogManagerTest.class);
suite.addTestSuite(FilterTest.class);
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ConsoleHandlerTest.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/ConsoleHandlerTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ConsoleHandlerTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ConsoleHandlerTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/ConsoleHandlerTest.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/ConsoleHandlerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ConsoleHandlerTest.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging;
+package org.apache.harmony.logging.tests.java.util.logging;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -32,7 +32,7 @@
import java.util.logging.SimpleFormatter;
import junit.framework.TestCase;
-import tests.api.java.util.logging.util.EnvironmentHelper;
+import org.apache.harmony.logging.tests.java.util.logging.util.EnvironmentHelper;
import tests.util.CallVerificationStack;
/**
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ErrorManagerTest.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/ErrorManagerTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ErrorManagerTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ErrorManagerTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/ErrorManagerTest.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/ErrorManagerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ErrorManagerTest.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging;
+package org.apache.harmony.logging.tests.java.util.logging;
import java.util.logging.ErrorManager;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/FileHandlerTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/FileHandlerTest.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/FileHandlerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging;
+package org.apache.harmony.logging.tests.java.util.logging;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
@@ -39,8 +39,8 @@
import java.util.logging.XMLFormatter;
import junit.framework.TestCase;
-import tests.api.java.util.logging.util.DefaultPropertyHelper;
-import tests.api.java.util.logging.util.EnvironmentHelper;
+import org.apache.harmony.logging.tests.java.util.logging.util.DefaultPropertyHelper;
+import org.apache.harmony.logging.tests.java.util.logging.util.EnvironmentHelper;
/**
*/
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FilterTest.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/FilterTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FilterTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FilterTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/FilterTest.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/FilterTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FilterTest.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging;
+package org.apache.harmony.logging.tests.java.util.logging;
import java.util.logging.Filter;
import java.util.logging.LogRecord;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FormatterTest.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/FormatterTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FormatterTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FormatterTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/FormatterTest.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/FormatterTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FormatterTest.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging;
+package org.apache.harmony.logging.tests.java.util.logging;
import java.text.MessageFormat;
import java.util.Locale;
@@ -108,7 +108,7 @@
// normal case
r.setMessage("msg");
ResourceBundle rb = ResourceBundle
- .getBundle("tests/api/java/util/logging/res");
+ .getBundle("bundles/java/util/logging/res");
r.setResourceBundle(rb);
assertEquals(rb.getString("msg"), f.formatMessage(r));
@@ -126,7 +126,7 @@
assertEquals(rb.getString("pattern{0,number}"), f.formatMessage(r));
// another bundle
- rb = ResourceBundle.getBundle("tests/api/java/util/logging/res",
+ rb = ResourceBundle.getBundle("bundles/java/util/logging/res",
Locale.US);
r.setMessage("msg");
r.setResourceBundle(rb);
@@ -138,7 +138,7 @@
// set bundle name but not bundle
r.setResourceBundle(null);
- r.setResourceBundleName("tests/api/java/util/logging/res");
+ r.setResourceBundleName("bundles/java/util/logging/res");
r.setMessage("msg");
assertEquals("msg", f.formatMessage(r));
}
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/HandlerTest.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/HandlerTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/HandlerTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/HandlerTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/HandlerTest.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/HandlerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/HandlerTest.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging;
+package org.apache.harmony.logging.tests.java.util.logging;
import java.io.UnsupportedEncodingException;
import java.security.Permission;
@@ -29,7 +29,7 @@
import java.util.logging.SimpleFormatter;
import junit.framework.TestCase;
-import tests.api.java.util.logging.util.EnvironmentHelper;
+import org.apache.harmony.logging.tests.java.util.logging.util.EnvironmentHelper;
import tests.util.CallVerificationStack;
/**
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTest.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LevelTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LevelTest.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LevelTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTest.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging;
+package org.apache.harmony.logging.tests.java.util.logging;
import java.io.Serializable;
import java.util.Locale;
@@ -21,7 +21,7 @@
import java.util.logging.Level;
import junit.framework.TestCase;
-import tests.api.java.util.logging.util.ProjectVersion;
+import org.apache.harmony.logging.tests.java.util.logging.util.ProjectVersion;
import tests.util.SerializationTester;
/**
@@ -46,7 +46,7 @@
protected void setUp() throws Exception {
super.setUp();
System.err.println(Locale.getDefault().toString());
- rb = ResourceBundle.getBundle("tests/api/java/util/logging/res");
+ rb = ResourceBundle.getBundle("bundles/java/util/logging/res");
}
/*
@@ -327,12 +327,12 @@
public void testSerializationCompability() throws Exception {
SerializationTester.assertCompabilityEquals(Level.ALL,
- "tests/api/java/util/logging/Level.ser");
+ "serialization/java/util/logging/Level.ser");
}
public void testGetLocalName() {
Level l = new MockLevel("level1", 120,
- "tests/api/java/util/logging/res");
+ "bundles/java/util/logging/res");
assertEquals(rb.getString("level1"), l.getLocalizedName());
l = new MockLevel("bad name", 120, "res");
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LogManagerTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LogManagerTest.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LogManagerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging;
+package org.apache.harmony.logging.tests.java.util.logging;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
@@ -32,8 +32,8 @@
import java.util.logging.LoggingPermission;
import junit.framework.TestCase;
-import tests.api.java.util.logging.util.DefaultPropertyHelper;
-import tests.api.java.util.logging.util.EnvironmentHelper;
+import org.apache.harmony.logging.tests.java.util.logging.util.DefaultPropertyHelper;
+import org.apache.harmony.logging.tests.java.util.logging.util.EnvironmentHelper;
/**
*
@@ -71,7 +71,7 @@
// should be replaced by the one upper
static final String configFilePath = LogManagerTest.class.getClassLoader()
- .getResource("tests/api/java/util/logging/logging.config")
+ .getResource("config/java/util/logging/logging.config")
.getPath();
static final String clearPath = System.getProperty("clearpath");
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LogRecordTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LogRecordTest.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LogRecordTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging;
+package org.apache.harmony.logging.tests.java.util.logging;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -92,12 +92,12 @@
lr.setResourceBundle(null);
assertNull(lr.getResourceBundle());
- lr.setResourceBundleName("tests/api/java/util/logging/res");
+ lr.setResourceBundleName("bundles/java/util/logging/res");
assertNull(lr.getResourceBundle());
lr.setResourceBundleName(null);
ResourceBundle rb = ResourceBundle
- .getBundle("tests/api/java/util/logging/res");
+ .getBundle("bundles/java/util/logging/res");
lr.setResourceBundle(rb);
assertEquals(rb, lr.getResourceBundle());
assertNull(lr.getResourceBundleName());
@@ -276,7 +276,7 @@
public void testSerialization() throws Exception {
lr.setLoggerName("logger");
- lr.setResourceBundleName("tests/api/java/util/logging/res2");
+ lr.setResourceBundleName("bundles/java/util/logging/res2");
lr.setSourceClassName("class");
lr.setSourceMethodName("method");
lr.setParameters(new Object[] { new Object(), new Object() });
@@ -285,7 +285,7 @@
lr.setSequenceNumber(12321312);
lr.setMillis(12313123);
lr.setResourceBundle(ResourceBundle.getBundle(
- "tests/api/java/util/logging/res", Locale.US));
+ "bundles/java/util/logging/res", Locale.US));
if (!SerializationTester.assertEquals(lr)) {
LogRecord result = (LogRecord) SerializationTester.getLastOutput();
assertSame(result.getLevel(), lr.getLevel());
@@ -323,7 +323,7 @@
lr.setSequenceNumber(12321312);
lr.setMillis(12313123);
lr.setResourceBundle(ResourceBundle.getBundle(
- "tests/api/java/util/logging/res", Locale.US));
+ "bundles/java/util/logging/res", Locale.US));
if (!SerializationTester.assertEquals(lr)) {
LogRecord result = (LogRecord) SerializationTester.getLastOutput();
assertSame(result.getLevel(), lr.getLevel());
@@ -351,7 +351,7 @@
public void testSerializationCompability() throws Exception {
LogRecord r = new LogRecord(Level.ALL, "msg");
SerializationTester.assertCompabilityEquals(r,
- "tests/api/java/util/logging/LogRecord.ser");
+ "serialization/java/util/logging/LogRecord.ser");
}
public static class MockHandler extends Handler {
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LoggerTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LoggerTest.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LoggerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging;
+package org.apache.harmony.logging.tests.java.util.logging;
import java.security.Permission;
import java.util.Locale;
@@ -28,8 +28,10 @@
import java.util.logging.Logger;
import java.util.logging.LoggingPermission;
+import java.util.logging.LoggerExtension;
+
import junit.framework.TestCase;
-import tests.api.java.util.logging.util.EnvironmentHelper;
+import org.apache.harmony.logging.tests.java.util.logging.util.EnvironmentHelper;
import tests.util.CallVerificationStack;
/**
@@ -40,11 +42,11 @@
private static String className = LoggerTest.class.getName();
- private final static String VALID_RESOURCE_BUNDLE = "tests/api/java/util/logging/res";
+ private final static String VALID_RESOURCE_BUNDLE = "bundles/java/util/logging/res";
- private final static String VALID_RESOURCE_BUNDLE2 = "tests/api/java/util/logging/res2";
+ private final static String VALID_RESOURCE_BUNDLE2 = "bundles/java/util/logging/res2";
- private final static String VALID_RESOURCE_BUNDLE3 = "tests/api/java/util/logging/res3";
+ private final static String VALID_RESOURCE_BUNDLE3 = "bundles/java/util/logging/res3";
private final static String INVALID_RESOURCE_BUNDLE = "impossible_not_existing";
@@ -3372,6 +3374,7 @@
* Test whether privileged code is used to load resource bundles.
*/
public void testLoadResourceBundle() {
+ //
SecurityManager oldMan = System.getSecurityManager();
System.setSecurityManager(new MockNoLoadingClassSecurityManager());
try {
@@ -3380,6 +3383,17 @@
System.setSecurityManager(oldMan);
}
}
+
+ public void testLoadResourceBundleNonExistent() {
+ try {
+ // Try a load a non-existant resource bundle.
+ LoggerExtension.loadResourceBundle("missinglogger.properties");
+ fail("Expected an exception.");
+ } catch (MissingResourceException ex) {
+ // Expected exception is precisely a MissingResourceException
+ assertTrue(ex.getClass() == MissingResourceException.class);
+ }
+ }
/*
* A mock logger, used to test the protected constructors and fields.
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingPermissionTest.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LoggingPermissionTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingPermissionTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingPermissionTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LoggingPermissionTest.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/LoggingPermissionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingPermissionTest.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging;
+package org.apache.harmony.logging.tests.java.util.logging;
import java.util.logging.LoggingPermission;
@@ -51,7 +51,7 @@
public void testSerializationCompability() throws Exception {
LoggingPermission lp = new LoggingPermission("control", "");
SerializationTester.assertCompabilityEquals(lp,
- "tests/api/java/util/logging/LogPermission.ser");
+ "serialization/java/util/logging/LogPermission.ser");
}
public void testLoggingPermission() {
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/MemoryHandlerTest.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/MemoryHandlerTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/MemoryHandlerTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/MemoryHandlerTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/MemoryHandlerTest.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/MemoryHandlerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/MemoryHandlerTest.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging;
+package org.apache.harmony.logging.tests.java.util.logging;
import java.io.File;
import java.io.IOException;
@@ -31,8 +31,8 @@
import java.util.logging.SimpleFormatter;
import junit.framework.TestCase;
-import tests.api.java.util.logging.util.DefaultPropertyHelper;
-import tests.api.java.util.logging.util.EnvironmentHelper;
+import org.apache.harmony.logging.tests.java.util.logging.util.DefaultPropertyHelper;
+import org.apache.harmony.logging.tests.java.util.logging.util.EnvironmentHelper;
/**
*
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SimpleFormatterTest.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/SimpleFormatterTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SimpleFormatterTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SimpleFormatterTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/SimpleFormatterTest.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/SimpleFormatterTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SimpleFormatterTest.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging;
+package org.apache.harmony.logging.tests.java.util.logging;
import java.util.Calendar;
import java.util.ResourceBundle;
@@ -73,7 +73,7 @@
public void testLocalizedFormat() {
// if bundle set, should use localized message
ResourceBundle rb = ResourceBundle
- .getBundle("tests/api/java/util/logging/res");
+ .getBundle("bundles/java/util/logging/res");
lr.setResourceBundle(rb);
lr.setMessage("msg");
String localeMsg = rb.getString("msg");
@@ -82,7 +82,7 @@
// if bundle not set but bundle name set, should use original message
lr.setResourceBundle(null);
- lr.setResourceBundleName("tests/api/java/util/logging/res");
+ lr.setResourceBundleName("bundles/java/util/logging/res");
lr.setMessage("msg");
str = sf.format(lr);
localeMsg = rb.getString("msg");
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SocketHandlerTest.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/SocketHandlerTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SocketHandlerTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SocketHandlerTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/SocketHandlerTest.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/SocketHandlerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SocketHandlerTest.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging;
+package org.apache.harmony.logging.tests.java.util.logging;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -36,8 +36,8 @@
import java.util.logging.XMLFormatter;
import junit.framework.TestCase;
-import tests.api.java.util.logging.util.DefaultPropertyHelper;
-import tests.api.java.util.logging.util.EnvironmentHelper;
+import org.apache.harmony.logging.tests.java.util.logging.util.DefaultPropertyHelper;
+import org.apache.harmony.logging.tests.java.util.logging.util.EnvironmentHelper;
import tests.util.CallVerificationStack;
/**
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/StreamHandlerTest.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/StreamHandlerTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/StreamHandlerTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/StreamHandlerTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/StreamHandlerTest.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/StreamHandlerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/StreamHandlerTest.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging;
+package org.apache.harmony.logging.tests.java.util.logging;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -37,7 +37,7 @@
import java.util.logging.StreamHandler;
import junit.framework.TestCase;
-import tests.api.java.util.logging.util.EnvironmentHelper;
+import org.apache.harmony.logging.tests.java.util.logging.util.EnvironmentHelper;
import tests.util.CallVerificationStack;
/**
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/XMLFormatterTest.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/XMLFormatterTest.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/XMLFormatterTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/XMLFormatterTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/XMLFormatterTest.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/XMLFormatterTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/XMLFormatterTest.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging;
+package org.apache.harmony.logging.tests.java.util.logging;
import java.io.UnsupportedEncodingException;
import java.util.ResourceBundle;
@@ -59,7 +59,7 @@
// but put the original message into the key element
// further more, if message pattern has no effect
ResourceBundle rb = ResourceBundle
- .getBundle("tests/api/java/util/logging/res");
+ .getBundle("bundles/java/util/logging/res");
lr.setResourceBundle(rb);
lr.setMessage("pattern");
String result = formatter.format(lr);
@@ -94,7 +94,7 @@
lr.setParameters(new Object[] { "100", "200" });
lr.setSequenceNumber(1);
ResourceBundle rb = ResourceBundle
- .getBundle("tests/api/java/util/logging/res");
+ .getBundle("bundles/java/util/logging/res");
lr.setResourceBundle(rb);
lr.setResourceBundleName("rbname");
String output = formatter.format(lr);
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/DefaultPropertyHelper.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/util/DefaultPropertyHelper.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/DefaultPropertyHelper.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/DefaultPropertyHelper.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/util/DefaultPropertyHelper.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/util/DefaultPropertyHelper.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/DefaultPropertyHelper.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging.util;
+package org.apache.harmony.logging.tests.java.util.logging.util;
import java.io.BufferedOutputStream;
import java.io.File;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/EnvironmentHelper.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/util/EnvironmentHelper.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/EnvironmentHelper.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/EnvironmentHelper.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/util/EnvironmentHelper.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/util/EnvironmentHelper.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/EnvironmentHelper.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging.util;
+package org.apache.harmony.logging.tests.java.util.logging.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Copied: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/ProjectVersion.java (from r397478, incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/util/ProjectVersion.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/ProjectVersion.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/ProjectVersion.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/util/ProjectVersion.java&r1=397478&r2=397621&rev=397621&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/tests/api/java/util/logging/util/ProjectVersion.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/ProjectVersion.java Thu Apr 27 12:42:00 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package tests.api.java.util.logging.util;
+package org.apache.harmony.logging.tests.java.util.logging.util;
/**
*
Added: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res.properties
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res.properties?rev=397621&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res.properties (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res.properties Thu Apr 27 12:42:00 2006
@@ -0,0 +1,12 @@
+level1=en_US_level1
+SEVERE=US_SEVERE
+WARNING=US_WARNING
+CONFIG=US_CONFIG
+FINE=US_FINE
+FINER=US_FINER
+FINEST=US_FINEST
+ALL=US_ALL
+OFF=US_OFF
+msg=US_MSG
+pattern=US_pattern {0, number}
+pattern{0,number}=US
\ No newline at end of file
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res2.properties
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res2.properties?rev=397621&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res2.properties (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res2.properties Thu Apr 27 12:42:00 2006
@@ -0,0 +1,13 @@
+level1=level1
+SEVERE=SEVERE2
+WARNING=WARNING2
+CONFIG=CONFIG2
+FINE=FINE2
+FINER=FINER2
+FINEST=FINEST2
+ALL=ALL2
+OFF=OFF2
+msg=MSG2
+pattern=pattern {0, number}2
+pattern{0,number}=NOLOCALE2
+LOGGERTEST=Test_NoLocale2
\ No newline at end of file
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res2.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res3.properties
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res3.properties?rev=397621&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res3.properties (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res3.properties Thu Apr 27 12:42:00 2006
@@ -0,0 +1,13 @@
+level1=level13
+SEVERE=SEVERE3
+WARNING=WARNING3
+CONFIG=CONFIG3
+FINE=FINE3
+FINER=FINER3
+FINEST=FINEST3
+ALL=ALL3
+OFF=OFF3
+msg=MSG3
+pattern=pattern {0, number}3
+pattern{0,number}=NOLOCALE3
+LOGGERTEST=Test_NoLocale3
\ No newline at end of file
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res3.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res_en_US.properties
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res_en_US.properties?rev=397621&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res_en_US.properties (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res_en_US.properties Thu Apr 27 12:42:00 2006
@@ -0,0 +1,12 @@
+level1=en_US_level1
+SEVERE=US_SEVERE
+WARNING=US_WARNING
+CONFIG=US_CONFIG
+FINE=US_FINE
+FINER=US_FINER
+FINEST=US_FINEST
+ALL=US_ALL
+OFF=US_OFF
+msg=US_MSG
+pattern=US_pattern {0, number}
+pattern{0,number}=US
\ No newline at end of file
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res_en_US.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res_zh_CN.properties
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res_zh_CN.properties?rev=397621&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res_zh_CN.properties (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res_zh_CN.properties Thu Apr 27 12:42:00 2006
@@ -0,0 +1,13 @@
+level1=zh_CN_level1
+SEVERE=zh_CN_SEVERE
+WARNING=zh_CN_WARNING
+CONFIG=ZH_CN_CONFIG
+FINE=ZH_CN_FINE
+FINER=ZH_CN_FINER
+FINEST=ZH_CN_FINEST
+ALL=ZH_CN_ALL
+OFF=ZH_CN_OFF
+msg=ZH_CN_MSG
+pattern=ZH_CN_pattern {0, number}
+pattern{0,number}=ZH_CN
+LOGGERTEST=Test_ZH_CN
\ No newline at end of file
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/bundles/java/util/logging/res_zh_CN.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/config/java/util/logging/logging.config
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/config/java/util/logging/logging.config?rev=397621&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/config/java/util/logging/logging.config (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/config/java/util/logging/logging.config Thu Apr 27 12:42:00 2006
@@ -0,0 +1,3 @@
+handlers=org.apache.harmony.logging.tests.java.util.logging.LogManagerTest$MockHandler java.util.logging.ConsoleHandler
+.level=ALL
+org.apache.harmony.logging.tests.java.util.logging.LogManagerTest$MockHandler.level=OFF
\ No newline at end of file
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/config/java/util/logging/logging.config
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/serialization/java/util/logging/Level.ser
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/serialization/java/util/logging/Level.ser?rev=397621&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/serialization/java/util/logging/Level.ser
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/serialization/java/util/logging/LogPermission.ser
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/serialization/java/util/logging/LogPermission.ser?rev=397621&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/serialization/java/util/logging/LogPermission.ser
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/serialization/java/util/logging/LogRecord.ser
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/serialization/java/util/logging/LogRecord.ser?rev=397621&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/logging/src/test/resources/serialization/java/util/logging/LogRecord.ser
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream