git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[utils]
/
security
/
jpatest
/
src
/
test
/
java
/
org
/
wamblee
/
security
/
authentication
/
jpa
/
JpaUserAdministrationTest.java
diff --git
a/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserAdministrationTest.java
b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserAdministrationTest.java
index c5bd6dbb3332d1f427bd4328151f609d1dbf91b8..548c83b3ce179ccd71be9e4f1a916983e6abf0bf 100644
(file)
--- a/
security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserAdministrationTest.java
+++ b/
security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserAdministrationTest.java
@@
-17,12
+17,12
@@
package org.wamblee.security.authentication.jpa;
import java.lang.reflect.Method;
import java.sql.Connection;
import java.lang.reflect.Method;
import java.sql.Connection;
+import java.util.logging.Level;
+import java.util.logging.Logger;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.wamblee.security.authentication.UserAdministration;
import org.wamblee.security.authentication.UserAdministrationImplTest;
import org.wamblee.security.authentication.UserAdministration;
import org.wamblee.security.authentication.UserAdministrationImplTest;
-import org.wamblee.
suppor
t.persistence.DatabaseUtils.JdbcUnitOfWork;
+import org.wamblee.
tes
t.persistence.DatabaseUtils.JdbcUnitOfWork;
/**
* User administration tests with persistence based on Hibernate. This executes
/**
* User administration tests with persistence based on Hibernate. This executes
@@
-33,8
+33,8
@@
import org.wamblee.support.persistence.DatabaseUtils.JdbcUnitOfWork;
* @author Erik Brakkee
*/
public class JpaUserAdministrationTest extends UserAdministrationImplTest {
* @author Erik Brakkee
*/
public class JpaUserAdministrationTest extends UserAdministrationImplTest {
- private static final Log
LOG = LogFactory
- .getLog
(JpaUserAdministrationTest.class
);
+ private static final Log
ger LOG = Logger
+ .getLog
ger(JpaUserAdministrationTest.class.getName()
);
private UserAdministrationTester userAdminTester;
private UserAdministrationTester userAdminTester;
@@
-72,7
+72,7
@@
public class JpaUserAdministrationTest extends UserAdministrationImplTest {
for (final Method method : methods) {
if (method.getName().startsWith("test")) {
for (final Method method : methods) {
if (method.getName().startsWith("test")) {
- userAdminTester.getJpaTester().getDbUtils().cleanDatabase();
+ userAdminTester.getJpaTester().getDbUtils().cleanDatabase(
new SecurityTables()
);
clearUserCache();
userAdminTester.getJpaTester().getDbUtils().executeInTransaction(
new JdbcUnitOfWork<Void>() {
clearUserCache();
userAdminTester.getJpaTester().getDbUtils().executeInTransaction(
new JdbcUnitOfWork<Void>() {
@@
-84,8
+84,8
@@
public class JpaUserAdministrationTest extends UserAdministrationImplTest {
try {
method.invoke(JpaUserAdministrationTest.this);
} catch (Throwable t) {
try {
method.invoke(JpaUserAdministrationTest.this);
} catch (Throwable t) {
- LOG.
error(
"Test " + method.getName() +
- " failed");
+ LOG.
log(Level.WARNING,
"Test " + method.getName() +
+ " failed"
, t
);
throw new RuntimeException(t.getMessage(), t);
} finally {
LOG.info("Test " + method.getName() +
throw new RuntimeException(t.getMessage(), t);
} finally {
LOG.info("Test " + method.getName() +