root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Moved tests over from testsuite to core

This commit is contained in:
Arjen Poutsma 2008-10-29 12:17:13 +00:00
parent da8b1c73ab
commit 4ddebb083e
3 changed files with 61 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
org.springframework.core/src/test/java/org/springframework/util/MethodInvokerTests.java → org.springframework.testsuite/src/test/java/org/springframework/util/MethodInvokerTests.java
View File

6
org.springframework.testsuite/src/test/java/org/springframework/web/util/Log4jWebConfigurerTests.java
View File

@ -29,8 +29,6 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.core.io.FileSystemResourceLoader;
import org.springframework.mock.web.MockServletConfig;
import org.springframework.mock.web.MockServletContext;
import org.springframework.util.Log4jConfigurerTests;
import org.springframework.util.MockLog4jAppender;
/**
* @author Juergen Hoeller
@ -47,7 +45,7 @@ public class Log4jWebConfigurerTests extends TestCase {
}
public void testInitLoggingWithAbsoluteFilePath() throws FileNotFoundException {
URL url = Log4jConfigurerTests.class.getResource("testlog4j.properties");
URL url = Log4jWebConfigurerTests.class.getResource("testlog4j.properties");
doTestInitLogging(url.toString(), false);
}
@ -67,7 +65,7 @@ public class Log4jWebConfigurerTests extends TestCase {
*/
public void testInitLoggingWithFileUrlAndRefreshInterval() throws FileNotFoundException {
URL url = Log4jConfigurerTests.class.getResource("testlog4j.properties");
URL url = Log4jWebConfigurerTests.class.getResource("testlog4j.properties");
doTestInitLogging(url.toString(), true);
}

59
org.springframework.testsuite/src/test/java/org/springframework/web/util/MockLog4jAppender.java Normal file
View File

@ -0,0 +1,59 @@
/*
* Copyright 2002-2005 the original author or authors.
*
* 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.springframework.web.util;
import java.util.ArrayList;
import java.util.List;
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.spi.LoggingEvent;
/**
* @author Alef Arendsen
*/
public class MockLog4jAppender extends AppenderSkeleton {
public static final List loggingStrings = new ArrayList();
public static boolean closeCalled = false;
/* (non-Javadoc)
* @see org.apache.log4j.AppenderSkeleton#append(org.apache.log4j.spi.LoggingEvent)
*/
protected void append(LoggingEvent evt) {
//System.out.println("Adding " + evt.getMessage());
loggingStrings.add(evt.getMessage());
}
/* (non-Javadoc)
* @see org.apache.log4j.Appender#close()
*/
public void close() {
closeCalled = true;
}
/* (non-Javadoc)
* @see org.apache.log4j.Appender#requiresLayout()
*/
public boolean requiresLayout() {
return false;
}
}