merge with branch 1.x

scm-webapp/src/test/java/sonia/scm/user/DefaultUserManagerTest.java

@@ -35,13 +35,22 @@ package sonia.scm.user;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.google.common.collect.Lists;
+
+import org.junit.Before;
+import org.junit.Test;
 
 import sonia.scm.store.JAXBStoreFactory;
 import sonia.scm.store.StoreFactory;
 import sonia.scm.user.xml.XmlUserDAO;
 import sonia.scm.util.MockUtil;
 
-import org.junit.Before;
+import static org.mockito.Mockito.*;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.util.Collections;
+import java.util.List;
 
 /**
  *
@@ -49,11 +58,6 @@ import org.junit.Before;
  */
 public class DefaultUserManagerTest extends UserManagerTestBase
 {
-  
-  @Before
-  public void setAdminSubject(){
-    setSubject(MockUtil.createAdminSubject());
-  }
 
   /**
    * Method description
@@ -63,13 +67,72 @@ public class DefaultUserManagerTest extends UserManagerTestBase
    */
   @Override
   public UserManager createManager()
+  {
+    return new DefaultUserManager(createXmlUserDAO());
+  }
+
+  /**
+   * Method description
+   *
+   */
+  @Test
+  public void testDefaultAccountAfterFristStart()
+  {
+    UserDAO userDAO = mock(UserDAO.class);
+    List<User> users = Lists.newArrayList(new User("tuser"));
+
+    when(userDAO.getAll()).thenReturn(users);
+
+    UserManager userManager = new DefaultUserManager(userDAO);
+
+    userManager.init(contextProvider);
+    verify(userDAO, never()).add(any(User.class));
+  }
+
+  /**
+   * Method description
+   *
+   */
+  @Test
+  @SuppressWarnings("unchecked")
+  public void testDefaultAccountCreation()
+  {
+    UserDAO userDAO = mock(UserDAO.class);
+
+    when(userDAO.getAll()).thenReturn(Collections.EMPTY_LIST);
+
+    UserManager userManager = new DefaultUserManager(userDAO);
+
+    userManager.init(contextProvider);
+    verify(userDAO, times(2)).add(any(User.class));
+  }
+
+  //~--- set methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   */
+  @Before
+  public void setAdminSubject()
+  {
+    setSubject(MockUtil.createAdminSubject());
+  }
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  private XmlUserDAO createXmlUserDAO()
   {
     StoreFactory factory = new JAXBStoreFactory();
 
     factory.init(contextProvider);
 
-    XmlUserDAO userDAO = new XmlUserDAO(factory);
-    
-    return new DefaultUserManager(userDAO);
+    return new XmlUserDAO(factory);
   }
 }