Author: wsmoak
Date: Tue Jul 11 23:18:44 2006
New Revision: 421161
URL: http://svn.apache.org/viewvc?rev=421161&view=rev
Log:
STR-2900 Fix Checkstyle errors in struts-mailreader-dao.
Submitted by: Frank Zammetti
Modified:
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/ExpiredPasswordException.java
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/Subscription.java
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/User.java
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/UserDatabase.java
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/AbstractSubscription.java
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/AbstractUser.java
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUser.java
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabase.java
struts/struts1/trunk/mailreader-dao/src/test/java/org/apache/struts/apps/mailreader/dao/BaseTestUserDatabase.java
struts/struts1/trunk/mailreader-dao/src/test/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabaseTest.java
Modified:
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/ExpiredPasswordException.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/ExpiredPasswordException.java?rev=421161&r1=421160&r2=421161&view=diff
==============================================================================
---
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/ExpiredPasswordException.java
(original)
+++
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/ExpiredPasswordException.java
Tue Jul 11 23:18:44 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 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.
@@ -40,4 +40,3 @@
}
-
Modified:
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/Subscription.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/Subscription.java?rev=421161&r1=421160&r2=421161&view=diff
==============================================================================
---
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/Subscription.java
(original)
+++
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/Subscription.java
Tue Jul 11 23:18:44 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 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.
Modified:
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/User.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/User.java?rev=421161&r1=421160&r2=421161&view=diff
==============================================================================
---
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/User.java
(original)
+++
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/User.java
Tue Jul 11 23:18:44 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 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.
Modified:
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/UserDatabase.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/UserDatabase.java?rev=421161&r1=421160&r2=421161&view=diff
==============================================================================
---
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/UserDatabase.java
(original)
+++
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/UserDatabase.java
Tue Jul 11 23:18:44 2006
@@ -1,5 +1,5 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2000-2004 Apache Software Foundation
*
Modified:
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/AbstractSubscription.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/AbstractSubscription.java?rev=421161&r1=421160&r2=421161&view=diff
==============================================================================
---
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/AbstractSubscription.java
(original)
+++
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/AbstractSubscription.java
Tue Jul 11 23:18:44 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 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.
Modified:
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/AbstractUser.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/AbstractUser.java?rev=421161&r1=421160&r2=421161&view=diff
==============================================================================
---
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/AbstractUser.java
(original)
+++
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/AbstractUser.java
Tue Jul 11 23:18:44 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 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.
@@ -185,7 +185,7 @@
+ "' for user '" +
username + "'");
}
- Subscription subscription =
+ Subscription subscription =
new AbstractSubscription(this, host);
synchronized (subscriptions) {
subscriptions.put(host, subscription);
Modified:
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUser.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUser.java?rev=421161&r1=421160&r2=421161&view=diff
==============================================================================
---
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUser.java
(original)
+++
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUser.java
Tue Jul 11 23:18:44 2006
@@ -1,5 +1,5 @@
/*
- * $Id: MemoryUserDatabase.java 149093 2005-01-30 02:02:55Z jmitchell $
+ * $Id: MemoryUserDatabase.java 149093 2005-01-30 02:02:55Z jmitchell $
*
* Copyright 2000-2004 Apache Software Foundation
*
Modified:
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabase.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabase.java?rev=421161&r1=421160&r2=421161&view=diff
==============================================================================
---
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabase.java
(original)
+++
struts/struts1/trunk/mailreader-dao/src/main/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabase.java
Tue Jul 11 23:18:44 2006
@@ -1,5 +1,5 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2000-2004 Apache Software Foundation
*
@@ -64,9 +64,9 @@
* The [EMAIL PROTECTED] User}s associated with this UserDatabase, keyed
by username.
*/
private HashMap users = new HashMap();
-
+
private boolean open = false;
-
+
// ------------------------------------------------------------- Properties
@@ -303,8 +303,8 @@
public boolean isOpen() {
return this.open;
}
-
-
+
+
}
Modified:
struts/struts1/trunk/mailreader-dao/src/test/java/org/apache/struts/apps/mailreader/dao/BaseTestUserDatabase.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/mailreader-dao/src/test/java/org/apache/struts/apps/mailreader/dao/BaseTestUserDatabase.java?rev=421161&r1=421160&r2=421161&view=diff
==============================================================================
---
struts/struts1/trunk/mailreader-dao/src/test/java/org/apache/struts/apps/mailreader/dao/BaseTestUserDatabase.java
(original)
+++
struts/struts1/trunk/mailreader-dao/src/test/java/org/apache/struts/apps/mailreader/dao/BaseTestUserDatabase.java
Tue Jul 11 23:18:44 2006
@@ -1,14 +1,14 @@
/*
- * $Id: Subscription.java 149009 2005-01-29 05:33:02Z jmitchell $
+ * $Id: Subscription.java 149009 2005-01-29 05:33:02Z jmitchell $
*
* Copyright 1999-2004 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.
@@ -36,7 +36,7 @@
* - [09 ] create, save, close, open findUsers(all) [done]
* - [10 ] find(bogus) [done]
* - [11 ] create, remove, find(valid), find(invalid) [done]
- *
+ *
* Registrations
*
*/
@@ -46,31 +46,31 @@
protected UserDatabase userDatabase;
private int userCt = 10;
private int subscriptionCt = 20;
-
+
protected void setUp() throws Exception {
super.setUp();
userDatabase = getNewUserDatabase();
- generateUsers(userCt, subscriptionCt, "");
+ generateUsers(userCt, subscriptionCt, "");
}
/**
- *
+ *
*/
private void generateUsers(int users, int subs, String prefix) {
for (int i = 0; i < users; i++) {
- User user = getNewUser(userDatabase, prefix + "user" + i);
- user.setFromAddress(prefix + "fromAddress" + i);
- user.setFullName(prefix + "fullName" + i);
- user.setPassword(prefix + "password" + i);
-
- for (int j = 0; j < subs; j++) {
- Subscription subscription =
getNewSubscription(user, prefix + "host" + j);
- subscription.setAutoConnect(j % 1 == 0);
- subscription.setUsername(prefix +
"subscriptionUserName" + j);
- subscription.setPassword(prefix +
"subscriptionPassword" + j);
- subscription.setType(prefix + "type" + j);
- }
+ User user = getNewUser(userDatabase, prefix + "user" + i);
+ user.setFromAddress(prefix + "fromAddress" + i);
+ user.setFullName(prefix + "fullName" + i);
+ user.setPassword(prefix + "password" + i);
+
+ for (int j = 0; j < subs; j++) {
+ Subscription subscription = getNewSubscription(user, prefix +
"host" + j);
+ subscription.setAutoConnect(j % 1 == 0);
+ subscription.setUsername(prefix + "subscriptionUserName" + j);
+ subscription.setPassword(prefix + "subscriptionPassword" + j);
+ subscription.setType(prefix + "type" + j);
+ }
}
}
@@ -79,7 +79,7 @@
super.tearDown();
userDatabase.close();
}
-
+
public void testCase01() throws Exception{
User user = userDatabase.findUser("user5");
assertTrue("Check username", "user5".equals(user.getUsername()));
@@ -87,25 +87,25 @@
assertTrue("Check fullName", "fullName5".equals(user.getFullName()));
assertTrue("Check password", "password5".equals(user.getPassword()));
assertNull("Check replyToAddress", user.getReplyToAddress());
-
+
}
public void testCase02() throws Exception{
User user = userDatabase.findUser("bogusName");
assertNull(user);
}
-
+
public void testCase03() throws Exception{
User[] users = userDatabase.findUsers();
assertTrue("Check users", users.length == userCt);
}
-
+
public void testCase04() throws Exception{
String newUserName = "newUser04";
User newUser = userDatabase.createUser(newUserName);
newUser.setPassword("pass1");
newUser.setFromAddress("fromAddress1");
newUser.setReplyToAddress("replyToAddress1");
-
+
User newUser2 = userDatabase.findUser(newUserName);
assertTrue("Check username",
newUserName.equals(newUser2.getUsername()));
assertTrue("Check fromAddress",
"fromAddress1".equals(newUser2.getFromAddress()));
@@ -113,16 +113,16 @@
assertTrue("Check password", "pass1".equals(newUser2.getPassword()));
assertNull("Check fullName", newUser2.getFullName());
}
-
+
public void testCase04a() throws Exception{
String newUserName = "newUser04a";
int subs = 5;
-
+
User newUser = userDatabase.createUser(newUserName);
newUser.setPassword("pass1");
newUser.setFromAddress("fromAddress1");
newUser.setReplyToAddress("replyToAddress1");
-
+
User newUser2 = userDatabase.findUser(newUserName);
assertTrue("Check username",
newUserName.equals(newUser2.getUsername()));
assertTrue("Check fromAddress",
"fromAddress1".equals(newUser2.getFromAddress()));
@@ -136,20 +136,20 @@
Subscription[] subscriptions = newUser3.getSubscriptions();
assertTrue ("Testing subscriptions length", subscriptions.length ==
subs);
newUser3.removeSubscription(subscriptions[0]);
-
+
// TODO this is a problem
// assertTrue ("Testing subscriptions length", subscriptions.length <
subs);
-
+
}
-
+
public void testCase05() throws Exception{
String newUserName = "anotherNewUser05";
-
+
User newUser = userDatabase.createUser(newUserName);
newUser.setPassword("pass1");
newUser.setFromAddress("fromAddress1");
newUser.setReplyToAddress("replyToAddress1");
-
+
User newUser5 = userDatabase.findUser("user5");
assertTrue("Check username", "user5".equals(newUser5.getUsername()));
assertTrue("Check fromAddress",
"fromAddress5".equals(newUser5.getFromAddress()));
@@ -158,15 +158,15 @@
assertNull("Check replyToAddress", newUser5.getReplyToAddress());
}
-
+
public void testCase05a() throws Exception{
String newUserName = "anotherNewUser05a";
-
+
User newUser = userDatabase.createUser(newUserName);
newUser.setPassword("pass1");
newUser.setFromAddress("fromAddress1");
newUser.setReplyToAddress("replyToAddress1");
-
+
User newUser5a = userDatabase.findUser("user5");
assertTrue("Check username", "user5".equals(newUser5a.getUsername()));
assertTrue("Check fromAddress",
"fromAddress5".equals(newUser5a.getFromAddress()));
@@ -176,17 +176,17 @@
Subscription[] subscriptions = newUser5a.getSubscriptions();
assertTrue ("Testing subscriptions length", subscriptions.length ==
subscriptionCt);
-
+
}
public void testCase06() throws Exception{
String newUserName = "anotherNewUser06";
-
+
User newUser = userDatabase.createUser(newUserName);
newUser.setPassword("pass1");
newUser.setFromAddress("fromAddress1");
newUser.setReplyToAddress("replyToAddress1");
-
+
User user6 = userDatabase.findUser("user6");
assertTrue("Check username", "user6".equals(user6.getUsername()));
assertTrue("Check fromAddress",
"fromAddress6".equals(user6.getFromAddress()));
@@ -195,7 +195,7 @@
assertNull("Check replyToAddress", user6.getReplyToAddress());
}
-
+
public void testCase07() throws Exception{
String newUserName = "anotherNewUser07";
@@ -203,7 +203,7 @@
newUser.setPassword("pass1");
newUser.setFromAddress("fromAddress1");
newUser.setReplyToAddress("replyToAddress1");
-
+
User user7 = userDatabase.findUser("user7");
assertTrue("Check username", "user7".equals(user7.getUsername()));
assertTrue("Check fromAddress",
"fromAddress7".equals(user7.getFromAddress()));
@@ -213,88 +213,88 @@
User[] users = userDatabase.findUsers();
assertTrue("Check users", users.length == userCt + 1);
-
+
}
-
+
public void testCase08() throws Exception{
String newUserName = "newUser08";
int subs = 5;
-
- User newUser = userDatabase.createUser(newUserName);
- newUser.setPassword("pass1");
- newUser.setFromAddress("fromAddress1");
- newUser.setReplyToAddress("replyToAddress1");
-
- // TODO fix me, this is not releasing the internal state on close
- // userDatabase.save();
- // userDatabase.close();
- // userDatabase.open();
-
- User newUser2 = userDatabase.findUser(newUserName);
- assertTrue("Check username",
newUserName.equals(newUser2.getUsername()));
- assertTrue("Check fromAddress",
"fromAddress1".equals(newUser2.getFromAddress()));
- assertTrue("Check replyToAddress",
"replyToAddress1".equals(newUser2.getReplyToAddress()));
- assertTrue("Check password",
"pass1".equals(newUser2.getPassword()));
- assertNull("Check fullName", newUser2.getFullName());
-
- generateUsers(3, subs, "08");
-
- User newUser3 = userDatabase.findUser("08user1");
- Subscription[] subscriptions = newUser3.getSubscriptions();
- assertTrue ("Testing subscriptions length", subscriptions.length ==
subs);
-
- // userDatabase.save();
- // userDatabase.close();
- // userDatabase.open();
-
- User newUser4 = userDatabase.findUser("08user1");
- Subscription[] subscriptions2 = newUser4.getSubscriptions();
- assertTrue ("Testing subscriptions length", subscriptions2.length
== subs);
-
+
+ User newUser = userDatabase.createUser(newUserName);
+ newUser.setPassword("pass1");
+ newUser.setFromAddress("fromAddress1");
+ newUser.setReplyToAddress("replyToAddress1");
+
+ // TODO fix me, this is not releasing the internal state on close
+ // userDatabase.save();
+ // userDatabase.close();
+ // userDatabase.open();
+
+ User newUser2 = userDatabase.findUser(newUserName);
+ assertTrue("Check username", newUserName.equals(newUser2.getUsername()));
+ assertTrue("Check fromAddress",
"fromAddress1".equals(newUser2.getFromAddress()));
+ assertTrue("Check replyToAddress",
"replyToAddress1".equals(newUser2.getReplyToAddress()));
+ assertTrue("Check password", "pass1".equals(newUser2.getPassword()));
+ assertNull("Check fullName", newUser2.getFullName());
+
+ generateUsers(3, subs, "08");
+
+ User newUser3 = userDatabase.findUser("08user1");
+ Subscription[] subscriptions = newUser3.getSubscriptions();
+ assertTrue ("Testing subscriptions length", subscriptions.length ==
subs);
+
+ // userDatabase.save();
+ // userDatabase.close();
+ // userDatabase.open();
+
+ User newUser4 = userDatabase.findUser("08user1");
+ Subscription[] subscriptions2 = newUser4.getSubscriptions();
+ assertTrue ("Testing subscriptions length", subscriptions2.length ==
subs);
+
}
-
+
public void testCase09() throws Exception{
-
+
// TODO fix me, this is not releasing the internal state on close
// userDatabase.save();
// userDatabase.close();
// userDatabase.open();
-
+
User[] users = userDatabase.findUsers();
assertTrue("Testing users count", users.length == userCt);
-
+
}
-
+
public void testCase010() throws Exception{
-
+
// TODO fix me, this is not releasing the internal state on close
// userDatabase.save();
// userDatabase.close();
// userDatabase.open();
-
+
User user = userDatabase.findUser("bogus user");
assertNull("Find non-existing user", user);
-
+
}
-
+
public void testCase011() throws Exception{
-
+
String newUserName = "newUser11";
User newUser = userDatabase.createUser(newUserName);
newUser.setPassword("pass1");
newUser.setFromAddress("fromAddress1");
newUser.setReplyToAddress("replyToAddress1");
-
+
User user = userDatabase.findUser(newUserName);
assertNotNull("Find non-existing user", user);
-
+
userDatabase.removeUser(user);
User user2 = userDatabase.findUser(newUserName);
assertNull("Find non-existing user", user2);
-
+
}
-
+
protected abstract UserDatabase getNewUserDatabase();
protected abstract User getNewUser(UserDatabase db, String userName);
Modified:
struts/struts1/trunk/mailreader-dao/src/test/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabaseTest.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/mailreader-dao/src/test/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabaseTest.java?rev=421161&r1=421160&r2=421161&view=diff
==============================================================================
---
struts/struts1/trunk/mailreader-dao/src/test/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabaseTest.java
(original)
+++
struts/struts1/trunk/mailreader-dao/src/test/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabaseTest.java
Tue Jul 11 23:18:44 2006
@@ -1,14 +1,14 @@
/*
- * $Id: Subscription.java 149009 2005-01-29 05:33:02Z jmitchell $
+ * $Id: Subscription.java 149009 2005-01-29 05:33:02Z jmitchell $
*
* Copyright 1999-2004 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.
@@ -31,20 +31,22 @@
protected String defaultPathName = "test-database.xml";
private boolean deleteDatabaseFile = true;
-
+
public boolean isDeleteDatabaseFile() {
- return deleteDatabaseFile;
- }
- public void setDeleteDatabaseFile(boolean deleteDatabaseFile) {
- this.deleteDatabaseFile = deleteDatabaseFile;
- }
- protected UserDatabase getNewUserDatabase(){
+ return deleteDatabaseFile;
+ }
+
+ public void setDeleteDatabaseFile(boolean deleteDatabaseFile) {
+ this.deleteDatabaseFile = deleteDatabaseFile;
+ }
+
+ protected UserDatabase getNewUserDatabase() {
// using default impl
MemoryUserDatabase memoryUserDatabase = new MemoryUserDatabase();
memoryUserDatabase.setPathname(defaultPathName);
userDatabase = memoryUserDatabase;
return memoryUserDatabase;
-
+
}
protected User getNewUser(UserDatabase db, String userName){
// using default impl
@@ -57,13 +59,14 @@
protected void setUp() throws Exception {
super.setUp();
// force write to disk
- userDatabase.close();
+ userDatabase.close();
}
+
protected void tearDown() throws Exception {
- super.tearDown();
- if (isDeleteDatabaseFile()){
- File file = new File(defaultPathName);
- file.delete();
- }
+ super.tearDown();
+ if (isDeleteDatabaseFile()) {
+ File file = new File(defaultPathName);
+ file.delete();
+ }
}
}
