Author: jmitchell
Date: Tue Feb 1 10:27:53 2005
New Revision: 149429
URL: http://svn.apache.org/viewcvs?view=rev&rev=149429
Log:
finished tests for UserDatabase
Modified:
struts/apps/trunk/dao/src/test/org/apache/struts/apps/mailreader/dao/BaseTestUserDatabase.java
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=149428&r2=149429
==============================================================================
---
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
Tue Feb 1 10:27:53 2005
@@ -32,12 +32,10 @@
* - [06 ] createUser3, findUsers(all) [done]
* - [06a] createUser4 (duplicate) [done]
* - [07 ] findUsers(all) [done]
- * - [08 ] create, save, close, open find(new one) []
- * - [09 ] create, save, close, open findUsers(all) []
- * - [10 ] find(bogus) []
- * - [11 ] find(new one 1), find(new one 3) []
- * - [12 ] remove2, find(new one2) []
- * - [13 ] remove(bogus) []
+ * - [08 ] create, save, close, open find(new one) [done]
+ * - [09 ] create, save, close, open findUsers(all) [done]
+ * - [10 ] find(bogus) [done]
+ * - [11 ] create, remove, find(valid), find(invalid) [done]
*
* Registrations
*
@@ -85,216 +83,222 @@
userDatabase.close();
}
- public void testCase01(){
- try {
- User user = userDatabase.findUser("user5");
- assertTrue("Check username", "user5".equals(user.getUsername()));
- assertTrue("Check fromAddress",
"fromAddress5".equals(user.getFromAddress()));
- assertTrue("Check fullName",
"fullName5".equals(user.getFullName()));
- assertTrue("Check password",
"password5".equals(user.getPassword()));
- assertNull("Check replyToAddress", user.getReplyToAddress());
-
- } catch (ExpiredPasswordException e) {
- fail(e.getMessage());
- }
+ public void testCase01() throws Exception{
+ User user = userDatabase.findUser("user5");
+ assertTrue("Check username", "user5".equals(user.getUsername()));
+ assertTrue("Check fromAddress",
"fromAddress5".equals(user.getFromAddress()));
+ assertTrue("Check fullName", "fullName5".equals(user.getFullName()));
+ assertTrue("Check password", "password5".equals(user.getPassword()));
+ assertNull("Check replyToAddress", user.getReplyToAddress());
}
- public void testCase02(){
- try {
- User user = userDatabase.findUser("bogusName");
- assertNull(user);
-
- } catch (ExpiredPasswordException e) {
- fail(e.getMessage());
- }
+ public void testCase02() throws Exception{
+ User user = userDatabase.findUser("bogusName");
+ assertNull(user);
}
- public void testCase03(){
+ public void testCase03() throws Exception{
User[] users = userDatabase.findUsers();
assertTrue("Check users", users.length == userCt);
-
}
- public void testCase04(){
+ public void testCase04() throws Exception{
String newUserName = "newUser04";
- try {
- 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()));
- assertTrue("Check replyToAddress",
"replyToAddress1".equals(newUser2.getReplyToAddress()));
- assertTrue("Check password",
"pass1".equals(newUser2.getPassword()));
- assertNull("Check fullName", newUser2.getFullName());
-
- } catch (ExpiredPasswordException e) {
- fail(e.getMessage());
- }
+ 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()));
+ assertTrue("Check replyToAddress",
"replyToAddress1".equals(newUser2.getReplyToAddress()));
+ assertTrue("Check password", "pass1".equals(newUser2.getPassword()));
+ assertNull("Check fullName", newUser2.getFullName());
}
- public void testCase04a(){
+ public void testCase04a() throws Exception{
String newUserName = "newUser04a";
int subs = 5;
- try {
-
- 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()));
- assertTrue("Check replyToAddress",
"replyToAddress1".equals(newUser2.getReplyToAddress()));
- assertTrue("Check password",
"pass1".equals(newUser2.getPassword()));
- assertNull("Check fullName", newUser2.getFullName());
-
- generateUsers(3, subs, "04a");
-
- User newUser3 = userDatabase.findUser("04auser1");
- 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);
+
+ 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()));
+ assertTrue("Check replyToAddress",
"replyToAddress1".equals(newUser2.getReplyToAddress()));
+ assertTrue("Check password", "pass1".equals(newUser2.getPassword()));
+ assertNull("Check fullName", newUser2.getFullName());
+
+ generateUsers(3, subs, "04a");
+
+ User newUser3 = userDatabase.findUser("04auser1");
+ 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);
- } catch (ExpiredPasswordException e) {
- fail(e.getMessage());
- }
}
- public void testCase05(){
+ public void testCase05() throws Exception{
String newUserName = "anotherNewUser05";
- try {
- 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()));
- assertTrue("Check fullName",
"fullName5".equals(newUser5.getFullName()));
- assertTrue("Check password",
"password5".equals(newUser5.getPassword()));
- assertNull("Check replyToAddress", newUser5.getReplyToAddress());
+
+ 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()));
+ assertTrue("Check fullName",
"fullName5".equals(newUser5.getFullName()));
+ assertTrue("Check password",
"password5".equals(newUser5.getPassword()));
+ assertNull("Check replyToAddress", newUser5.getReplyToAddress());
- } catch (ExpiredPasswordException e) {
- fail(e.getMessage());
- }
}
- public void testCase05a(){
+ public void testCase05a() throws Exception{
String newUserName = "anotherNewUser05a";
- try {
- 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()));
- assertTrue("Check fullName",
"fullName5".equals(newUser5a.getFullName()));
- assertTrue("Check password",
"password5".equals(newUser5a.getPassword()));
- assertNull("Check replyToAddress", newUser5a.getReplyToAddress());
+
+ 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()));
+ assertTrue("Check fullName",
"fullName5".equals(newUser5a.getFullName()));
+ assertTrue("Check password",
"password5".equals(newUser5a.getPassword()));
+ assertNull("Check replyToAddress", newUser5a.getReplyToAddress());
- Subscription[] subscriptions = newUser5a.getSubscriptions();
- assertTrue ("Testing subscriptions length", subscriptions.length
== subscriptionCt);
+ Subscription[] subscriptions = newUser5a.getSubscriptions();
+ assertTrue ("Testing subscriptions length", subscriptions.length ==
subscriptionCt);
- } catch (ExpiredPasswordException e) {
- fail(e.getMessage());
- }
}
- public void testCase06(){
+ public void testCase06() throws Exception{
String newUserName = "anotherNewUser06";
- try {
- 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()));
- assertTrue("Check fullName",
"fullName6".equals(user6.getFullName()));
- assertTrue("Check password",
"password6".equals(user6.getPassword()));
- assertNull("Check replyToAddress", user6.getReplyToAddress());
+
+ 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()));
+ assertTrue("Check fullName", "fullName6".equals(user6.getFullName()));
+ assertTrue("Check password", "password6".equals(user6.getPassword()));
+ assertNull("Check replyToAddress", user6.getReplyToAddress());
- } catch (ExpiredPasswordException e) {
- fail(e.getMessage());
- }
}
- public void testCase07(){
+ public void testCase07() throws Exception{
String newUserName = "anotherNewUser07";
- try {
- User newUser = userDatabase.createUser(newUserName);
- 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()));
- assertTrue("Check fullName",
"fullName7".equals(user7.getFullName()));
- assertTrue("Check password",
"password7".equals(user7.getPassword()));
- assertNull("Check replyToAddress", user7.getReplyToAddress());
- User[] users = userDatabase.findUsers();
- assertTrue("Check users", users.length == userCt + 1);
+ User newUser = userDatabase.createUser(newUserName);
+ 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()));
+ assertTrue("Check fullName", "fullName7".equals(user7.getFullName()));
+ assertTrue("Check password", "password7".equals(user7.getPassword()));
+ assertNull("Check replyToAddress", user7.getReplyToAddress());
+
+ User[] users = userDatabase.findUsers();
+ assertTrue("Check users", users.length == userCt + 1);
- } catch (ExpiredPasswordException e) {
- fail(e.getMessage());
- }
}
public void testCase08() throws Exception{
String newUserName = "newUser08";
int subs = 5;
- try {
- User newUser = userDatabase.createUser(newUserName);
- newUser.setPassword("pass1");
- newUser.setFromAddress("fromAddress1");
- newUser.setReplyToAddress("replyToAddress1");
+ 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);
- // TODO fix me, this is not releasing the internate state on close
+ }
+
+ public void testCase09() throws Exception{
+
+ // 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);
+ 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 newUser4 = userDatabase.findUser("08user1");
- Subscription[] subscriptions2 = newUser4.getSubscriptions();
- assertTrue ("Testing subscriptions length", subscriptions2.length
== subs);
+ User user = userDatabase.findUser("bogus user");
+ assertNull("Find non-existing user", user);
- } catch (ExpiredPasswordException e) {
- fail(e.getMessage());
- }
}
+ 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);
protected abstract Subscription getNewSubscription(User user, String host);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
