Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-07-12 21:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert database URL to use absolute path. Fixes test with Maven.

Browse Source
This commit is contained in:
Luke Taylor 2004-07-02 14:07:26 +00:00
parent ce712eaccf
commit b957b5e25b
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
core/src/test/java/org/acegisecurity/providers/dao/jdbc/JdbcDaoTests.java
View File

@ -20,12 +20,18 @@ import junit.framework.TestCase;
import net.sf.acegisecurity.providers.dao.UserDetails; import net.sf.acegisecurity.providers.dao.UserDetails;
import net.sf.acegisecurity.providers.dao.UsernameNotFoundException; import net.sf.acegisecurity.providers.dao.UsernameNotFoundException;
import org.springframework.core.io.ClassPathResource;
import org.springframework.jdbc.datasource.DriverManagerDataSource; import org.springframework.jdbc.datasource.DriverManagerDataSource;
import org.springframework.jdbc.object.MappingSqlQuery; import org.springframework.jdbc.object.MappingSqlQuery;
import java.io.File;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import javax.sql.DataSource;
/** /**
* Tests {@link JdbcDaoImpl}. * Tests {@link JdbcDaoImpl}.
@ -161,14 +167,8 @@ public class JdbcDaoTests extends TestCase {
} }
private JdbcDaoImpl makePopulatedJdbcDao() throws Exception { private JdbcDaoImpl makePopulatedJdbcDao() throws Exception {
DriverManagerDataSource ds = new DriverManagerDataSource();
ds.setDriverClassName("org.hsqldb.jdbcDriver");
ds.setUrl("jdbc:hsqldb:acegisecuritytest");
ds.setUsername("sa");
ds.setPassword("");
JdbcDaoImpl dao = new JdbcDaoImpl(); JdbcDaoImpl dao = new JdbcDaoImpl();
dao.setDataSource(ds); dao.setDataSource(makeDataSource());
dao.afterPropertiesSet(); dao.afterPropertiesSet();
return dao; return dao;
@ -176,20 +176,28 @@ public class JdbcDaoTests extends TestCase {
private JdbcDaoImpl makePopulatedJdbcDaoWithRolePrefix() private JdbcDaoImpl makePopulatedJdbcDaoWithRolePrefix()
throws Exception { throws Exception {
DriverManagerDataSource ds = new DriverManagerDataSource();
ds.setDriverClassName("org.hsqldb.jdbcDriver");
ds.setUrl("jdbc:hsqldb:acegisecuritytest");
ds.setUsername("sa");
ds.setPassword("");
JdbcDaoImpl dao = new JdbcDaoImpl(); JdbcDaoImpl dao = new JdbcDaoImpl();
dao.setDataSource(ds); dao.setDataSource(makeDataSource());
dao.setRolePrefix("ARBITRARY_PREFIX_"); dao.setRolePrefix("ARBITRARY_PREFIX_");
dao.afterPropertiesSet(); dao.afterPropertiesSet();
return dao; return dao;
} }
private DataSource makeDataSource()
throws Exception {
ClassPathResource dbScript = new ClassPathResource("acegisecuritytest.script");
String path = dbScript.getFile().getParentFile().getAbsolutePath();
DriverManagerDataSource ds = new DriverManagerDataSource();
ds.setDriverClassName("org.hsqldb.jdbcDriver");
ds.setUrl("jdbc:hsqldb:" + path + File.separator + "acegisecuritytest");
ds.setUsername("sa");
ds.setPassword("");
return ds;
}
//~ Inner Classes ========================================================== //~ Inner Classes ==========================================================
private class MockMappingSqlQuery extends MappingSqlQuery { private class MockMappingSqlQuery extends MappingSqlQuery {