Changeset 995 for trunk/sources/HeuristicLab.Hive.Server.Core/DbTestApp.cs

Timestamp:

12/16/08 17:26:43 (16 years ago)

Author:

svonolfe

Message:

Refactored DAL, Improved Caching (#372)

File:

• trunk/sources/HeuristicLab.Hive.Server.Core/DbTestApp.cs (modified) (8 diffs)

trunk/sources/HeuristicLab.Hive.Server.Core/DbTestApp.cs

@@ -43 +43 @@
       client.Login = DateTime.Now;
       client.ClientId = Guid.NewGuid();
-      clientAdapter.UpdateClient(client);
+      clientAdapter.Update(client);
 
       ClientInfo clientRead =
-        clientAdapter.GetClientById(client.ClientId);
+        clientAdapter.GetById(client.ClientId);
       Debug.Assert(
         clientRead != null &&
@@ -52 +52 @@
 
       client.CpuSpeedPerCore = 2000;
-      clientAdapter.UpdateClient(client);
+      clientAdapter.Update(client);
       clientRead =
-        clientAdapter.GetClientById(client.ClientId);
+        clientAdapter.GetById(client.ClientId);
       Debug.Assert(
        clientRead != null &&
@@ -60 +60 @@
        clientRead.CpuSpeedPerCore == 2000);
 
-      ICollection<ClientInfo> clients = clientAdapter.GetAllClients();
+      ICollection<ClientInfo> clients = 
+        clientAdapter.GetAll();
       int count = clients.Count;
 
-      clientAdapter.DeleteClient(client);
-
-      clients = clientAdapter.GetAllClients();
+      clientAdapter.Delete(client);
+
+      clients = clientAdapter.GetAll();
       Debug.Assert(count - 1 == clients.Count);
     }
@@ -74 +75 @@
 
       User user = new User();
-      user.Name = "Stefan";
-
-      userAdapter.UpdateUser(user);
+      user.Name = "TestDummy";
+
+      userAdapter.Update(user);
 
       User userRead =
-        userAdapter.GetUserById(user.PermissionOwnerId);
+        userAdapter.GetById(user.Id);
       Debug.Assert(
         userRead != null &&
-        user.PermissionOwnerId == userRead.PermissionOwnerId);
+        user.Id == userRead.Id);
 
       user.Password = "passme";
-      userAdapter.UpdateUser(user);
+      userAdapter.Update(user);
       userRead =
-        userAdapter.GetUserByName(user.Name);
+        userAdapter.GetByName(user.Name);
       Debug.Assert(
        userRead != null &&
@@ -93 +94 @@
        userRead.Password == user.Password);
 
-      ICollection<User> users = userAdapter.GetAllUsers();
+      ICollection<User> users = 
+       userAdapter.GetAll();
       int count = users.Count;
 
-      userAdapter.DeleteUser(user);
-
-      users = userAdapter.GetAllUsers();
+      userAdapter.Delete(user);
+
+      users = userAdapter.GetAll();
       Debug.Assert(count - 1 == users.Count);
     }
@@ -129 +131 @@
       group.Members.Add(subGroup);
 
-      userGroupAdapter.UpdateUserGroup(group);
+      userGroupAdapter.Update(group);
 
       UserGroup read =
-        userGroupAdapter.GetUserGroupById(group.PermissionOwnerId);
+        userGroupAdapter.GetById(group.Id);
 
       ICollection<UserGroup> userGroups =
-        userGroupAdapter.GetAllUserGroups();
+        userGroupAdapter.GetAll();
 
       IUserAdapter userAdapter =
         ServiceLocator.GetUserAdapter();
 
-      userAdapter.DeleteUser(user3);
+      userAdapter.Delete(user3);
       
       read =
-         userGroupAdapter.GetUserGroupById(group.PermissionOwnerId);
-
-      userGroupAdapter.DeleteUserGroup(subGroup);
-
-      read =
-         userGroupAdapter.GetUserGroupById(group.PermissionOwnerId);
+         userGroupAdapter.GetById(group.Id);
+
+      userGroupAdapter.Delete(subGroup);
+
+      read =
+         userGroupAdapter.GetById(group.Id);
 
       userGroups =
-        userGroupAdapter.GetAllUserGroups();
-
-      userGroupAdapter.DeleteUserGroup(group);
+        userGroupAdapter.GetAll();
+
+      userGroupAdapter.Delete(group);
 
       userGroups =
-        userGroupAdapter.GetAllUserGroups();
-
-      userAdapter.DeleteUser(user);
-      userAdapter.DeleteUser(user2);
+        userGroupAdapter.GetAll();
+
+      userAdapter.Delete(user);
+      userAdapter.Delete(user2);
     }
 
@@ -195 +197 @@
       group.Resources.Add(subGroup);
 
-      clientGroupAdapter.UpdateClientGroup(group);
+      clientGroupAdapter.Update(group);
 
       ClientGroup read =
-        clientGroupAdapter.GetClientGroupById(group.ResourceId);
+        clientGroupAdapter.GetById(group.Id);
 
       ICollection<ClientGroup> clientGroups =
-        clientGroupAdapter.GetAllClientGroups();
+        clientGroupAdapter.GetAll();
 
       IClientAdapter clientAdapter =
         ServiceLocator.GetClientAdapter();
 
-      clientAdapter.DeleteClient(client3);
-
-      read =
-         clientGroupAdapter.GetClientGroupById(group.ResourceId);
-
-      clientGroupAdapter.DeleteClientGroup(subGroup);
-
-      read =
-         clientGroupAdapter.GetClientGroupById(group.ResourceId);
+      clientAdapter.Delete(client3);
+
+      read =
+         clientGroupAdapter.GetById(group.Id);
+
+      clientGroupAdapter.Delete(subGroup);
+
+      read =
+         clientGroupAdapter.GetById(group.Id);
 
       clientGroups =
-        clientGroupAdapter.GetAllClientGroups();
-
-      clientGroupAdapter.DeleteClientGroup(group);
+        clientGroupAdapter.GetAll();
+
+      clientGroupAdapter.Delete(group);
 
       clientGroups =
-        clientGroupAdapter.GetAllClientGroups();
-
-      clientAdapter.DeleteClient(client);
-      clientAdapter.DeleteClient(client2);
+        clientGroupAdapter.GetAll();
+
+      clientAdapter.Delete(client);
+      clientAdapter.Delete(client2);
     }
 
@@ -238 +240 @@
 
       job.Client = client;
-      jobAdapter.UpdateJob(job);
-
-      ICollection<Job> jobs = jobAdapter.GetAllJobs();
-
-      jobAdapter.DeleteJob(job);
-
-      jobs = jobAdapter.GetAllJobs();
+      jobAdapter.Update(job);
+
+      ICollection<Job> jobs = jobAdapter.GetAll();
+
+      jobAdapter.Delete(job);
+
+      jobs = jobAdapter.GetAll();
     }
 
     public override void Run() {
-      TestClientAdapter();
-      TestUserAdapter();
-      TestUserGroupAdapter();
-      TestClientGroupAdapter();
-      TestJobAdapter();
-
       ITransactionManager transactionManager =
         ServiceLocator.GetTransactionManager();
-
+      
+      TestClientAdapter();
       transactionManager.UpdateDB();
+
+      TestUserAdapter();
+      transactionManager.UpdateDB();
+
+      TestUserGroupAdapter();
+      transactionManager.UpdateDB();
+
+      TestClientGroupAdapter();
+      transactionManager.UpdateDB();  
+
+      TestJobAdapter();
+      transactionManager.UpdateDB();     
     }
   }