huber 2002/12/06 11:12:00
Modified: src/test/org/apache/cocoon/components/resolver/test
ResolverImplTestCase.java
src/test/org/apache/cocoon/environment/commandline/test
CommandLineContextTestCase.java
src/test/org/apache/cocoon/util/test IOUtilsTestCase.java
Log:
fixed compiliation error,
moved to org.apache.avalon.framework.log.LogEnabled
added check of relative names for IOUtils.normalizedFilename
Revision Changes Path
1.4 +2 -2
xml-cocoon2/src/test/org/apache/cocoon/components/resolver/test/ResolverImplTestCase.java
Index: ResolverImplTestCase.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/test/org/apache/cocoon/components/resolver/test/ResolverImplTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResolverImplTestCase.java 22 Feb 2002 07:05:08 -0000 1.3
+++ ResolverImplTestCase.java 6 Dec 2002 19:11:59 -0000 1.4
@@ -448,7 +448,7 @@
context.put(Constants.CONTEXT_WORK_DIR, workDir);
CommandlineContext commandline_context = new
CommandlineContext(commandlineContextDir.toString());
- commandline_context.setLogger(getLogger());
+ commandline_context.enableLogging(getLogEnabledLogger());
context.put(Constants.CONTEXT_ENVIRONMENT_CONTEXT, commandline_context);
}
}
1.4 +4 -4
xml-cocoon2/src/test/org/apache/cocoon/environment/commandline/test/CommandLineContextTestCase.java
Index: CommandLineContextTestCase.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/test/org/apache/cocoon/environment/commandline/test/CommandLineContextTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CommandLineContextTestCase.java 27 Sep 2002 16:27:38 -0000 1.3
+++ CommandLineContextTestCase.java 6 Dec 2002 19:12:00 -0000 1.4
@@ -59,6 +59,7 @@
import junit.swingui.TestRunner;
import org.apache.avalon.framework.context.DefaultContext;
+import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
@@ -143,8 +144,7 @@
public void setUp() throws Exception {
commandlineContextDir = System.getProperty("java.io.tmpdir", "/tmp");
commandlineContext = new CommandlineContext(commandlineContextDir);
- Logger logger = setupLogger();
- commandlineContext.setLogger(logger);
+ commandlineContext.enableLogging( new ConsoleLogger() );
}
@@ -254,7 +254,6 @@
*
* @return Logger for logging
* @since
- */
private final Logger setupLogger() {
//FIXME(GP): This method should setup a LogConfigurator and LogManager
// according to the configuration spec. not yet
completed/implemented
@@ -268,5 +267,6 @@
return logger;
}
+ */
}
1.3 +3 -1
xml-cocoon2/src/test/org/apache/cocoon/util/test/IOUtilsTestCase.java
Index: IOUtilsTestCase.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/test/org/apache/cocoon/util/test/IOUtilsTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IOUtilsTestCase.java 22 Feb 2002 07:05:08 -0000 1.2
+++ IOUtilsTestCase.java 6 Dec 2002 19:12:00 -0000 1.3
@@ -102,6 +102,8 @@
new String[]{"\\a\\b\\c", "a" + File.separator + "b" +
File.separator + "c"},
new String[]{"a/b/c", "a" + File.separator + "b" + File.separator +
"c"},
new String[]{"a\\b\\c", "a" + File.separator + "b" + File.separator
+ "c"},
+
+ new String[]{"a/b/../c", "a" + File.separator + "c"},
};
for (int i = 0; i < test_values.length; i++) {
String tests[] = (String[]) test_values[i];
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
