Author: hoffmann
Date: Sat Dec 2 16:14:35 2006
New Revision: 481671
URL: http://svn.apache.org/viewvc?view=rev&rev=481671
Log:
made the tests of fulcrum-security-torque OS and DB independent. See TRB-36
Added:
jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-schema-idtable-init.sql
jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-schema.sql
jakarta/turbine/fulcrum/trunk/security/torque/src/test/id-table-schema.sql
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/HsqlDB.java
Modified:
jakarta/turbine/fulcrum/trunk/security/torque/project.properties
jakarta/turbine/fulcrum/trunk/security/torque/project.xml
jakarta/turbine/fulcrum/trunk/security/torque/src/test/Torque.properties
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerTest.java
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java
Modified: jakarta/turbine/fulcrum/trunk/security/torque/project.properties
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/project.properties?view=diff&rev=481671&r1=481670&r2=481671
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/project.properties (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/project.properties Sat Dec 2
16:14:35 2006
@@ -60,7 +60,7 @@
# mysql, oracle, postgresql, sapdb, sybase
# -------------------------------------------------------------------
-torque.database = mysql
+torque.database = hypersonic
# -------------------------------------------------------------------
@@ -142,12 +142,12 @@
# and columns to be the same as SQL name.
# -------------------------------------------------------------------
-torque.database.driver = org.gjt.mm.mysql.Driver
-torque.database.createUrl = jdbc:mysql://localhost:3306/mysql
-torque.database.buildUrl = jdbc:mysql://localhost:3306/fulcrum
-torque.database.url = jdbc:mysql://localhost:3306/fulcrum
-torque.database.user = root
+torque.database.driver = org.hsqldb.jdbcDriver
+torque.database.createUrl = jdbc:hsqldb:.
+torque.database.buildUrl = jdbc:hsqldb:.
+torque.database.url = jdbc:hsqldb:.
+torque.database.user = sa
torque.database.password =
-torque.database.host = localhost
+torque.database.host = .
torque.sameJavaName = false
Modified: jakarta/turbine/fulcrum/trunk/security/torque/project.xml
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/project.xml?view=diff&rev=481671&r1=481670&r2=481671
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/project.xml Sat Dec 2
16:14:35 2006
@@ -102,9 +102,9 @@
</dependency>
<dependency>
- <artifactId>mysql-connector-java</artifactId>
- <groupId>mysql</groupId>
- <version>3.1.12</version>
+ <artifactId>hsqldb</artifactId>
+ <groupId>hsqldb</groupId>
+ <version>1.8.0.7</version>
</dependency>
</dependencies>
Modified:
jakarta/turbine/fulcrum/trunk/security/torque/src/test/Torque.properties
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/Torque.properties?view=diff&rev=481671&r1=481670&r2=481671
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/Torque.properties
(original)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/Torque.properties
Sat Dec 2 16:14:35 2006
@@ -19,13 +19,13 @@
#
torque.database.default = fulcrum
-torque.database.fulcrum.adapter = mysql
+torque.database.fulcrum.adapter = hypersonic
#Using commons-dbcp
torque.dsfactory.fulcrum.factory =
org.apache.torque.dsfactory.SharedPoolDataSourceFactory
-torque.dsfactory.fulcrum.connection.driver = org.gjt.mm.mysql.Driver
-torque.dsfactory.fulcrum.connection.url = jdbc:mysql://localhost:3306/fulcrum
-torque.dsfactory.fulcrum.connection.user = root
+torque.dsfactory.fulcrum.connection.driver = org.hsqldb.jdbcDriver
+torque.dsfactory.fulcrum.connection.url = jdbc:hsqldb:.
+torque.dsfactory.fulcrum.connection.user = sa
torque.dsfactory.fulcrum.connection.password =
torque.dsfactory.bookstore.pool.validationQuery = SELECT 1
Added:
jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-schema-idtable-init.sql
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-schema-idtable-init.sql?view=auto&rev=481671
==============================================================================
---
jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-schema-idtable-init.sql
(added)
+++
jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-schema-idtable-init.sql
Sat Dec 2 16:14:35 2006
@@ -0,0 +1,11 @@
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (101,
'FULCRUM_PERMISSION', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (102,
'FULCRUM_ROLE', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (103,
'FULCRUM_GROUP', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (104,
'FULCRUM_USER', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (105,
'BASIC_USER_GROUP', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (106,
'DYNAMIC_ROLE_PERMISSION', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (107,
'DYNAMIC_USER_GROUP', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (108,
'DYNAMIC_GROUP_ROLE', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (109,
'DYNAMIC_USER_DELEGATES', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (110,
'TURBINE_ROLE_PERMISSION', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (111,
'TURBINE_USER_GROUP_ROLE', 1000, 10);
Added: jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-schema.sql
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-schema.sql?view=auto&rev=481671
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-schema.sql
(added)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/fulcrum-schema.sql
Sat Dec 2 16:14:35 2006
@@ -0,0 +1,150 @@
+SET IGNORECASE TRUE
+
+-----------------------------------------------------------------------------
+-- FULCRUM_PERMISSION
+-----------------------------------------------------------------------------
+drop table FULCRUM_PERMISSION if exists;
+
+CREATE TABLE FULCRUM_PERMISSION
+(
+ PERMISSION_ID INTEGER NOT NULL,
+ PERMISSION_NAME VARCHAR(64) NOT NULL,
+ PRIMARY KEY(PERMISSION_ID),
+ UNIQUE (PERMISSION_NAME)
+);
+
+
+-----------------------------------------------------------------------------
+-- FULCRUM_ROLE
+-----------------------------------------------------------------------------
+drop table FULCRUM_ROLE if exists;
+
+CREATE TABLE FULCRUM_ROLE
+(
+ ROLE_ID INTEGER NOT NULL,
+ ROLE_NAME VARCHAR(64) NOT NULL,
+ PRIMARY KEY(ROLE_ID),
+ UNIQUE (ROLE_NAME)
+);
+
+
+-----------------------------------------------------------------------------
+-- FULCRUM_GROUP
+-----------------------------------------------------------------------------
+drop table FULCRUM_GROUP if exists;
+
+CREATE TABLE FULCRUM_GROUP
+(
+ GROUP_ID INTEGER NOT NULL,
+ GROUP_NAME VARCHAR(64) NOT NULL,
+ PRIMARY KEY(GROUP_ID),
+ UNIQUE (GROUP_NAME)
+);
+
+
+-----------------------------------------------------------------------------
+-- FULCRUM_USER
+-----------------------------------------------------------------------------
+drop table FULCRUM_USER if exists;
+
+CREATE TABLE FULCRUM_USER
+(
+ USER_ID INTEGER NOT NULL,
+ LOGIN_NAME VARCHAR(64) NOT NULL,
+ PASSWORD_VALUE VARCHAR(16) NOT NULL,
+ PRIMARY KEY(USER_ID),
+ UNIQUE (LOGIN_NAME)
+);
+
+
+-----------------------------------------------------------------------------
+-- BASIC_USER_GROUP
+-----------------------------------------------------------------------------
+drop table BASIC_USER_GROUP if exists;
+
+CREATE TABLE BASIC_USER_GROUP
+(
+ USER_ID INTEGER NOT NULL,
+ GROUP_ID INTEGER NOT NULL,
+ PRIMARY KEY(USER_ID,GROUP_ID)
+);
+
+
+-----------------------------------------------------------------------------
+-- DYNAMIC_ROLE_PERMISSION
+-----------------------------------------------------------------------------
+drop table DYNAMIC_ROLE_PERMISSION if exists;
+
+CREATE TABLE DYNAMIC_ROLE_PERMISSION
+(
+ ROLE_ID INTEGER NOT NULL,
+ PERMISSION_ID INTEGER NOT NULL,
+ PRIMARY KEY(ROLE_ID,PERMISSION_ID)
+);
+
+
+-----------------------------------------------------------------------------
+-- DYNAMIC_USER_GROUP
+-----------------------------------------------------------------------------
+drop table DYNAMIC_USER_GROUP if exists;
+
+CREATE TABLE DYNAMIC_USER_GROUP
+(
+ USER_ID INTEGER NOT NULL,
+ GROUP_ID INTEGER NOT NULL,
+ PRIMARY KEY(USER_ID,GROUP_ID)
+);
+
+
+-----------------------------------------------------------------------------
+-- DYNAMIC_GROUP_ROLE
+-----------------------------------------------------------------------------
+drop table DYNAMIC_GROUP_ROLE if exists;
+
+CREATE TABLE DYNAMIC_GROUP_ROLE
+(
+ GROUP_ID INTEGER NOT NULL,
+ ROLE_ID INTEGER NOT NULL,
+ PRIMARY KEY(GROUP_ID,ROLE_ID)
+);
+
+
+-----------------------------------------------------------------------------
+-- DYNAMIC_USER_DELEGATES
+-----------------------------------------------------------------------------
+drop table DYNAMIC_USER_DELEGATES if exists;
+
+CREATE TABLE DYNAMIC_USER_DELEGATES
+(
+ DELEGATOR_USER_ID INTEGER NOT NULL,
+ DELEGATEE_USER_ID INTEGER NOT NULL,
+ PRIMARY KEY(DELEGATOR_USER_ID,DELEGATEE_USER_ID)
+);
+
+
+-----------------------------------------------------------------------------
+-- TURBINE_ROLE_PERMISSION
+-----------------------------------------------------------------------------
+drop table TURBINE_ROLE_PERMISSION if exists;
+
+CREATE TABLE TURBINE_ROLE_PERMISSION
+(
+ ROLE_ID INTEGER NOT NULL,
+ PERMISSION_ID INTEGER NOT NULL,
+ PRIMARY KEY(ROLE_ID,PERMISSION_ID)
+);
+
+
+-----------------------------------------------------------------------------
+-- TURBINE_USER_GROUP_ROLE
+-----------------------------------------------------------------------------
+drop table TURBINE_USER_GROUP_ROLE if exists;
+
+CREATE TABLE TURBINE_USER_GROUP_ROLE
+(
+ USER_ID INTEGER NOT NULL,
+ GROUP_ID INTEGER NOT NULL,
+ ROLE_ID INTEGER NOT NULL,
+ PRIMARY KEY(USER_ID,GROUP_ID,ROLE_ID)
+);
+
Added:
jakarta/turbine/fulcrum/trunk/security/torque/src/test/id-table-schema.sql
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/id-table-schema.sql?view=auto&rev=481671
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/torque/src/test/id-table-schema.sql
(added)
+++ jakarta/turbine/fulcrum/trunk/security/torque/src/test/id-table-schema.sql
Sat Dec 2 16:14:35 2006
@@ -0,0 +1,18 @@
+
+-----------------------------------------------------------------------------
+-- ID_TABLE
+-----------------------------------------------------------------------------
+drop table ID_TABLE if exists;
+
+CREATE TABLE ID_TABLE
+(
+ ID_TABLE_ID INTEGER NOT NULL,
+ TABLE_NAME VARCHAR(255) NOT NULL,
+ NEXT_ID INTEGER,
+ QUANTITY INTEGER,
+ PRIMARY KEY(ID_TABLE_ID),
+ UNIQUE (TABLE_NAME)
+);
+
+
+
Added:
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/HsqlDB.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/HsqlDB.java?view=auto&rev=481671
==============================================================================
---
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/HsqlDB.java
(added)
+++
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/HsqlDB.java
Sat Dec 2 16:14:35 2006
@@ -0,0 +1,152 @@
+package org.apache.fulcrum.security.torque;
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * 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.
+ */
+
+import java.io.File;
+import java.io.FileReader;
+import java.net.URL;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.hsqldb.jdbcDriver;
+
+/**
+ * This Class provides a nice Setup for a Hypersonic SQL Server,
+ * which will only be held in Memory.
+ *
+ * It allows loading of .sql Files, to setup Tests easily.
+ *
+ * @author <a href="[EMAIL PROTECTED]">Jürgen Hoffmann</a>
+ */
+public class HsqlDB
+{
+ private Connection connection = null;
+
+ private static Log log = LogFactory.getLog(HsqlDB.class);
+
+ public HsqlDB(String uri, String loadFile) throws Exception
+ {
+ Class.forName(jdbcDriver.class.getName());
+
+ this.connection = DriverManager.getConnection(uri, "sa", "");
+
+ if(StringUtils.isNotEmpty(loadFile))
+ {
+ loadSqlFile(loadFile);
+ }
+ }
+
+ public HsqlDB(String uri, URL loadFile) throws Exception
+ {
+ this(uri, new File(loadFile.toURI()));
+ }
+
+ public HsqlDB(String uri, File loadFile) throws Exception
+ {
+ this(uri, loadFile.getAbsolutePath());
+ }
+
+ public Connection getConnection()
+ {
+ return connection;
+ }
+
+ public void close()
+ {
+ try
+ {
+ connection.close();
+ }
+ catch (Exception e)
+ {
+ }
+ }
+
+ private void loadSqlFile(String fileName) throws Exception
+ {
+ Statement statement = null;
+ try
+ {
+ statement = connection.createStatement();
+ String commands = getFileContents(fileName);
+
+ for (int targetPos = commands.indexOf(';'); targetPos > -1;
targetPos = commands.indexOf(';'))
+ {
+ String cmd = commands.substring(0, targetPos + 1);
+ try
+ {
+ statement.execute(cmd);
+ }
+ catch (SQLException sqle)
+ {
+ log.warn("Statement: " + cmd + ": " + sqle.getMessage());
+ }
+
+ commands = commands.substring(targetPos + 2);
+ }
+ }
+ finally
+ {
+ if(statement != null)
+ {
+ statement.close();
+ }
+ }
+ }
+
+ private String getFileContents(String fileName) throws Exception
+ {
+ System.out.println(fileName);
+ FileReader fr = new FileReader(fileName);
+
+ char fileBuf[] = new char[1024];
+ StringBuffer sb = new StringBuffer(1000);
+ int res = -1;
+
+ while ((res = fr.read(fileBuf, 0, 1024)) > -1)
+ {
+ sb.append(fileBuf, 0, res);
+ }
+ fr.close();
+ return sb.toString();
+ }
+
+ public void addSQL(String sqlFile) throws Exception
+ {
+ if(StringUtils.isNotEmpty(sqlFile))
+ {
+ loadSqlFile(sqlFile);
+ }
+ }
+
+ public void addSQL(URL sqlFile) throws Exception
+ {
+ this.addSQL(new File(sqlFile.toURI()));
+ }
+
+ public void addSQL(File sqlFile) throws Exception
+ {
+ this.addSQL(sqlFile.getAbsolutePath());
+ }
+}
Modified:
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java?view=diff&rev=481671&r1=481670&r2=481671
==============================================================================
---
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java
(original)
+++
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java
Sat Dec 2 16:14:35 2006
@@ -34,10 +34,16 @@
*/
public class TorqueGroupManagerTest extends AbstractGroupManagerTest
{
+ protected static HsqlDB hsqlDB = null;
+
public void setUp()
{
try
{
+ this.hsqlDB = new HsqlDB("jdbc:hsqldb:.",
"src/test/fulcrum-schema.sql");
+ hsqlDB.addSQL("src/test/id-table-schema.sql");
+ hsqlDB.addSQL("src/test/fulcrum-schema-idtable-init.sql");
+
this.setRoleFileName("src/test/DynamicTorqueRoleConfig.xml");
this.setConfigurationFileName("src/test/DynamicTorqueComponentConfig.xml");
securityService = (SecurityService) lookup(SecurityService.ROLE);
Modified:
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java?view=diff&rev=481671&r1=481670&r2=481671
==============================================================================
---
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java
(original)
+++
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java
Sat Dec 2 16:14:35 2006
@@ -30,12 +30,18 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Thomas Vandahl</a>
+ * @author <a href="[EMAIL PROTECTED]">Jürgen Hoffmann</a>
* @version $Id:$
*/
public class TorquePermissionManagerTest extends AbstractPermissionManagerTest
{
+ protected static HsqlDB hsqlDB = null;
+
public void setUp() throws Exception
{
+ this.hsqlDB = new HsqlDB("jdbc:hsqldb:.",
"src/test/fulcrum-schema.sql");
+ hsqlDB.addSQL("src/test/id-table-schema.sql");
+ hsqlDB.addSQL("src/test/fulcrum-schema-idtable-init.sql");
this.setRoleFileName("src/test/DynamicTorqueRoleConfig.xml");
this.setConfigurationFileName("src/test/DynamicTorqueComponentConfig.xml");
Modified:
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java?view=diff&rev=481671&r1=481670&r2=481671
==============================================================================
---
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java
(original)
+++
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java
Sat Dec 2 16:14:35 2006
@@ -31,14 +31,20 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Thomas Vandahl</a>
+ * @author <a href="[EMAIL PROTECTED]">Jürgen Hoffmann</a>
* @version $Id:$
*/
public class TorqueRoleManagerTest extends AbstractRoleManagerTest
{
+ protected static HsqlDB hsqlDB = null;
+
public void setUp()
{
try
{
+ this.hsqlDB = new HsqlDB("jdbc:hsqldb:.",
"src/test/fulcrum-schema.sql");
+ hsqlDB.addSQL("src/test/id-table-schema.sql");
+ hsqlDB.addSQL("src/test/fulcrum-schema-idtable-init.sql");
this.setRoleFileName("src/test/DynamicTorqueRoleConfig.xml");
this.setConfigurationFileName("src/test/DynamicTorqueComponentConfig.xml");
securityService = (SecurityService) lookup(SecurityService.ROLE);
Modified:
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java?view=diff&rev=481671&r1=481670&r2=481671
==============================================================================
---
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java
(original)
+++
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java
Sat Dec 2 16:14:35 2006
@@ -30,14 +30,22 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Thomas Vandahl</a>
+ * @author <a href="[EMAIL PROTECTED]">Jürgen Hoffmann</a>
+ *
* @version $Id:$
*/
public class TorqueUserManagerTest extends AbstractUserManagerTest
{
+ protected static HsqlDB hsqlDB = null;
+
public void setUp()
{
try
{
+ this.hsqlDB = new HsqlDB("jdbc:hsqldb:.",
"src/test/fulcrum-schema.sql");
+ hsqlDB.addSQL("src/test/id-table-schema.sql");
+ hsqlDB.addSQL("src/test/fulcrum-schema-idtable-init.sql");
+
this.setRoleFileName("src/test/DynamicTorqueRoleConfig.xml");
this.setConfigurationFileName("src/test/DynamicTorqueComponentConfig.xml");
securityService = (SecurityService) lookup(SecurityService.ROLE);
Modified:
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerTest.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerTest.java?view=diff&rev=481671&r1=481670&r2=481671
==============================================================================
---
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerTest.java
(original)
+++
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerTest.java
Sat Dec 2 16:14:35 2006
@@ -1,4 +1,5 @@
package org.apache.fulcrum.security.torque.basic;
+
/*
* Copyright 2001-2004 The Apache Software Foundation
*
@@ -19,6 +20,7 @@
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.model.basic.entity.BasicUser;
import org.apache.fulcrum.security.model.basic.test.AbstractModelManagerTest;
+import org.apache.fulcrum.security.torque.HsqlDB;
import org.apache.fulcrum.security.torque.om.TorqueBasicUserGroupPeer;
import org.apache.fulcrum.security.torque.om.TorqueGroupPeer;
import org.apache.fulcrum.security.torque.om.TorqueUserPeer;
@@ -27,25 +29,35 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Thomas Vandahl</a>
+ * @author <a href="[EMAIL PROTECTED]">Jürgen Hoffmann</a>
* @version $Id:$
*/
public class TorqueBasicModelManagerTest extends AbstractModelManagerTest
{
+ protected static HsqlDB hsqlDB = null;
+
public void setUp() throws Exception
{
+ if(hsqlDB == null)
+ {
+ this.hsqlDB = new HsqlDB("jdbc:hsqldb:.",
"src/test/fulcrum-schema.sql");
+ hsqlDB.addSQL("src/test/id-table-schema.sql");
+ hsqlDB.addSQL("src/test/fulcrum-schema-idtable-init.sql");
+ }
this.setRoleFileName("src/test/BasicTorqueRoleConfig.xml");
this.setConfigurationFileName("src/test/BasicTorqueComponentConfig.xml");
+
securityService = (SecurityService) lookup(SecurityService.ROLE);
super.setUp();
}
-
- public void testRevokeAllUser() throws Exception
+
+ public void testRevokeAllUser() throws Exception
{
- super.testRevokeAllUser();
- User user = userManager.getUserInstance("Clint2");
- assertEquals(0, ((BasicUser) user).getGroups().size());
- }
-
+ super.testRevokeAllUser();
+ User user = userManager.getUserInstance("Clint2");
+ assertEquals(0, ((BasicUser) user).getGroups().size());
+ }
+
public void tearDown()
{
// cleanup tables
@@ -55,11 +67,11 @@
criteria.add(TorqueBasicUserGroupPeer.GROUP_ID, 0,
Criteria.GREATER_THAN);
criteria.add(TorqueBasicUserGroupPeer.USER_ID, 0,
Criteria.GREATER_THAN);
TorqueBasicUserGroupPeer.doDelete(criteria);
-
+
criteria.clear();
criteria.add(TorqueUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
TorqueUserPeer.doDelete(criteria);
-
+
criteria.clear();
criteria.add(TorqueGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
TorqueGroupPeer.doDelete(criteria);
@@ -74,7 +86,7 @@
/**
* Constructor for TorqueBasicModelManagerTest.
- *
+ *
* @param arg0
*/
public TorqueBasicModelManagerTest(String arg0)
Modified:
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java?view=diff&rev=481671&r1=481670&r2=481671
==============================================================================
---
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java
(original)
+++
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java
Sat Dec 2 16:14:35 2006
@@ -1,4 +1,5 @@
package org.apache.fulcrum.security.torque.dynamic;
+
/*
* Copyright 2001-2004 The Apache Software Foundation
*
@@ -17,6 +18,7 @@
import org.apache.fulcrum.security.SecurityService;
import
org.apache.fulcrum.security.model.dynamic.test.AbstractDynamicModelManagerTest;
+import org.apache.fulcrum.security.torque.HsqlDB;
import org.apache.fulcrum.security.torque.om.TorqueDynamicGroupRolePeer;
import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePermissionPeer;
import org.apache.fulcrum.security.torque.om.TorqueDynamicUserDelegatesPeer;
@@ -30,15 +32,21 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Thomas Vandahl</a>
+ * @author <a href="[EMAIL PROTECTED]">Jürgen Hoffmann</a>
* @version $Id:$
*/
-public class TorqueDynamicModelManagerTest
- extends AbstractDynamicModelManagerTest
+public class TorqueDynamicModelManagerTest extends
AbstractDynamicModelManagerTest
{
+ protected static HsqlDB hsqlDB = null;
+
public void setUp()
{
try
{
+ this.hsqlDB = new HsqlDB("jdbc:hsqldb:.",
"src/test/fulcrum-schema.sql");
+ hsqlDB.addSQL("src/test/id-table-schema.sql");
+ hsqlDB.addSQL("src/test/fulcrum-schema-idtable-init.sql");
+
this.setRoleFileName("src/test/DynamicTorqueRoleConfig.xml");
this.setConfigurationFileName("src/test/DynamicTorqueComponentConfig.xml");
securityService = (SecurityService) lookup(SecurityService.ROLE);
@@ -58,11 +66,11 @@
Criteria criteria = new Criteria();
criteria.add(TorqueDynamicUserGroupPeer.USER_ID, 0,
Criteria.GREATER_THAN);
TorqueDynamicUserGroupPeer.doDelete(criteria);
-
+
criteria.clear();
criteria.add(TorqueDynamicGroupRolePeer.GROUP_ID, 0,
Criteria.GREATER_THAN);
TorqueDynamicGroupRolePeer.doDelete(criteria);
-
+
criteria.clear();
criteria.add(TorqueDynamicRolePermissionPeer.ROLE_ID, 0,
Criteria.GREATER_THAN);
TorqueDynamicRolePermissionPeer.doDelete(criteria);
@@ -74,7 +82,7 @@
criteria.clear();
criteria.add(TorqueUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
TorqueUserPeer.doDelete(criteria);
-
+
criteria.clear();
criteria.add(TorqueGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
TorqueGroupPeer.doDelete(criteria);
@@ -82,7 +90,7 @@
criteria.clear();
criteria.add(TorqueRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
TorqueRolePeer.doDelete(criteria);
-
+
criteria.clear();
criteria.add(TorquePermissionPeer.PERMISSION_ID, 0,
Criteria.GREATER_THAN);
TorquePermissionPeer.doDelete(criteria);
@@ -97,7 +105,7 @@
/**
* Constructor for TorqueDynamicModelManagerTest.
- *
+ *
* @param arg0
*/
public TorqueDynamicModelManagerTest(String arg0)
Modified:
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java?view=diff&rev=481671&r1=481670&r2=481671
==============================================================================
---
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java
(original)
+++
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java
Sat Dec 2 16:14:35 2006
@@ -17,6 +17,7 @@
import org.apache.fulcrum.security.SecurityService;
import
org.apache.fulcrum.security.model.turbine.test.AbstractTurbineModelManagerTest;
+import org.apache.fulcrum.security.torque.HsqlDB;
import org.apache.fulcrum.security.torque.om.TorqueGroupPeer;
import org.apache.fulcrum.security.torque.om.TorquePermissionPeer;
import org.apache.fulcrum.security.torque.om.TorqueRolePeer;
@@ -28,17 +29,23 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Thomas Vandahl</a>
+ * @author <a href="[EMAIL PROTECTED]">Jürgen Hoffmann</a>
* @version $Id:$
*/
public class TorqueTurbineModelManagerTest
extends AbstractTurbineModelManagerTest
{
+ protected static HsqlDB hsqlDB = null;
public void setUp() throws Exception
{
try
{
+ this.hsqlDB = new HsqlDB("jdbc:hsqldb:.",
"src/test/fulcrum-schema.sql");
+ hsqlDB.addSQL("src/test/id-table-schema.sql");
+ hsqlDB.addSQL("src/test/fulcrum-schema-idtable-init.sql");
+
this.setRoleFileName("src/test/TurbineTorqueRoleConfig.xml");
this.setConfigurationFileName("src/test/TurbineTorqueComponentConfig.xml");
securityService = (SecurityService) lookup(SecurityService.ROLE);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
