You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by jm...@apache.org on 2005/01/31 19:34:21 UTC
svn commit: r149280 - in struts/apps/trunk: ./
dao/src/java/org/apache/struts/apps/mailreader/dao/impl/
dao/src/test/org/apache/struts/apps/mailreader/dao/
dao/src/test/org/apache/struts/apps/mailreader/dao/impl/memory/
Author: jmitchell
Date: Mon Jan 31 10:34:19 2005
New Revision: 149280
URL: http://svn.apache.org/viewcvs?view=rev&rev=149280
Log:
further abstraction of UserDatabase
Added:
struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/AbstractSubscription.java
- copied, changed from r149242, struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/Subscription.java
struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/AbstractUser.java
- copied, changed from r149242, struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/User.java
Removed:
struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/Subscription.java
struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/User.java
Modified:
struts/apps/trunk/dao/src/test/org/apache/struts/apps/mailreader/dao/BaseTestUserDatabase.java
struts/apps/trunk/dao/src/test/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabaseTest.java
struts/apps/trunk/project.xml
Copied: struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/AbstractSubscription.java (from r149242, struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/Subscription.java)
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/AbstractSubscription.java?view=diff&rev=149280&p1=struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/Subscription.java&r1=149242&p2=struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/AbstractSubscription.java&r2=149280
==============================================================================
--- struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/Subscription.java (original)
+++ struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/AbstractSubscription.java Mon Jan 31 10:34:19 2005
@@ -19,18 +19,18 @@
package org.apache.struts.apps.mailreader.dao.impl;
+import org.apache.struts.apps.mailreader.dao.Subscription;
import org.apache.struts.apps.mailreader.dao.User;
/**
- * <p>Concrete implementation of {@link Subscription}.</p>
+ * <p>Concrete implementation of {@link AbstractSubscription}.</p>
*
* @version $Rev$
* @since Struts 1.1
*/
-public class Subscription
- implements org.apache.struts.apps.mailreader.dao.Subscription {
+public class AbstractSubscription implements Subscription {
// ----------------------------------------------------------- Constructors
@@ -43,7 +43,7 @@
* @param user The user with which we are associated
* @param host The mail host for this subscription
*/
- public Subscription(User user, String host) {
+ public AbstractSubscription(User user, String host) {
super();
this.user = user;
Copied: struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/AbstractUser.java (from r149242, struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/User.java)
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/AbstractUser.java?view=diff&rev=149280&p1=struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/User.java&r1=149242&p2=struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/AbstractUser.java&r2=149280
==============================================================================
--- struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/User.java (original)
+++ struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/AbstractUser.java Mon Jan 31 10:34:19 2005
@@ -21,19 +21,19 @@
import java.util.HashMap;
-import org.apache.struts.apps.mailreader.dao.UserDatabase;
import org.apache.struts.apps.mailreader.dao.Subscription;
+import org.apache.struts.apps.mailreader.dao.User;
+import org.apache.struts.apps.mailreader.dao.UserDatabase;
/**
- * <p>Concrete implementation of {@link User}.</p>
+ * <p>Concrete implementation of {@link AbstractUser}.</p>
*
* @version $Rev$
* @since Struts 1.1
*/
-public abstract class User
- implements org.apache.struts.apps.mailreader.dao.User {
+public abstract class AbstractUser implements User {
// ----------------------------------------------------------- Constructors
@@ -46,7 +46,7 @@
* @param database The user database with which we are associated
* @param username The username of this user
*/
- public User(UserDatabase database, String username) {
+ public AbstractUser(UserDatabase database, String username) {
super();
this.database = database;
@@ -186,7 +186,7 @@
username + "'");
}
Subscription subscription =
- new Subscription(this, host);
+ new AbstractSubscription(this, host);
synchronized (subscriptions) {
subscriptions.put(host, subscription);
}
Modified: struts/apps/trunk/dao/src/test/org/apache/struts/apps/mailreader/dao/BaseTestUserDatabase.java
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/dao/src/test/org/apache/struts/apps/mailreader/dao/BaseTestUserDatabase.java?view=diff&r1=149279&r2=149280
==============================================================================
--- struts/apps/trunk/dao/src/test/org/apache/struts/apps/mailreader/dao/BaseTestUserDatabase.java (original)
+++ struts/apps/trunk/dao/src/test/org/apache/struts/apps/mailreader/dao/BaseTestUserDatabase.java Mon Jan 31 10:34:19 2005
@@ -51,7 +51,6 @@
if (userDatabase == null){
userDatabase = getNewUserDatabase();
-
for (int i = 0; i < userCt; i++) {
User user = getNewUser(userDatabase, "user" + i);
user.setFromAddress("fromAddress" + i);
@@ -66,8 +65,6 @@
subscription.setType("type" + j);
}
}
-
- userDatabase.close();
}
}
Modified: struts/apps/trunk/dao/src/test/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabaseTest.java
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/dao/src/test/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabaseTest.java?view=diff&r1=149279&r2=149280
==============================================================================
--- struts/apps/trunk/dao/src/test/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabaseTest.java (original)
+++ struts/apps/trunk/dao/src/test/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabaseTest.java Mon Jan 31 10:34:19 2005
@@ -45,4 +45,9 @@
return user.createSubscription(host);
}
+ protected void setUp() throws Exception {
+ super.setUp();
+ // force write to disk
+ userDatabase.close();
+ }
}
Modified: struts/apps/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/project.xml?view=diff&r1=149279&r2=149280
==============================================================================
--- struts/apps/trunk/project.xml (original)
+++ struts/apps/trunk/project.xml Mon Jan 31 10:34:19 2005
@@ -368,6 +368,9 @@
<aspectSourceDirectory />
<unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
<resources>
<resource>
<directory>${basedir}/src/test</directory>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org