Changeset 3949 for branches/HeuristicLab.Services.Authentication Prototype/UnitTests

Timestamp:

06/25/10 17:42:10 (14 years ago)

Author:

hmayr

Message:

following changes (#1046):

• changed AbstractHeuristicLabTest.cs

Location:

branches/HeuristicLab.Services.Authentication Prototype/UnitTests

Files:

• AbstractHeuristicLabTest.cs (modified) (1 diff)
• HeuristicLabUserTest.cs (modified) (3 diffs)

branches/HeuristicLab.Services.Authentication Prototype/UnitTests/AbstractHeuristicLabTest.cs

@@ -22 +22 @@
 
     /// <summary>
-    /// creates and opens a local database our of the DataClasses
+    /// creates and opens a local database out of the DataClasses and checks connection state
     /// </summary>
-    [TestMethod()]
-    public virtual void createDBTest() {
+    [TestInitialize()]
+    public virtual void updateDBConnection() {
       Assert.IsNotNull(db);
-
       DatabaseUtil.createDatabase(db);
-
+      if (db.Connection.State != System.Data.ConnectionState.Open) {
+        db.Connection.Open();
+      }
       Assert.AreEqual<System.Data.ConnectionState>(System.Data.ConnectionState.Open, db.Connection.State);
     }
 
     /// <summary>
-    /// checks if the database connection is open
-    /// should be used by all other test methods
+    /// closes db connection
     /// </summary>
-    protected virtual void checkConnection() {
-      Assert.IsNotNull(db);
-
-      if (db.Connection.State != System.Data.ConnectionState.Open) {
-        db.Connection.Open();
+    [TestCleanup()]
+    public virtual void closeDBConnection() {
+      if (db.Connection.State == System.Data.ConnectionState.Open) {
+        db.Connection.Close();
       }
-
-      Assert.AreEqual<System.Data.ConnectionState>(System.Data.ConnectionState.Open, db.Connection.State);
+      Assert.AreEqual<System.Data.ConnectionState>(System.Data.ConnectionState.Closed, db.Connection.State);
     }
   }

branches/HeuristicLab.Services.Authentication Prototype/UnitTests/HeuristicLabUserTest.cs

@@ -19 +19 @@
     [TestMethod()]
     public void modifyUserTest() {
-      checkConnection();
-
       // insert new user
       Persistence.HeuristicLabUser user = new HeuristicLabUser("testname", "testemail", "testquestion", "testcomment");
@@ -220 +218 @@
       Assert.AreEqual<String>("pwd1", target.GetPassword());
       target.ResetPassword();
-      Assert.AreEqual<String>("", target.GetPassword());
+      Assert.AreEqual<String>("INIT", target.GetPassword());
     }
 
@@ -242 +240 @@
       HeuristicLabUser target = new HeuristicLabUser("testname", "testemail", "testquestion", "testcomment");
       target.PasswordAnswer = "answer";
-      Assert.AreEqual<String>("", target.GetPassword("answer"));
+      Assert.AreEqual<String>("INIT", target.GetPassword("answer"));
       target.ChangePassword(target.Password, "pwd1");
       Assert.AreEqual<String>("pwd1", target.GetPassword("answer"));