Remove trailing whitespace from unit tests

James Moger

2013-09-30 c00577e5ddded5e53c9074da7def30bd9c350a1e

 src/test/java/com/gitblit/tests/LdapUserServiceTest.java

@@ -40,34 +40,34 @@
/**
 * An Integration test for LDAP that tests going against an in-memory UnboundID
 * LDAP server.
 * 
 *
 * @author jcrygier
 *
 */
public class LdapUserServiceTest {
	

   private LdapUserService ldapUserService;
	

   static int ldapPort = 1389;
	

   @BeforeClass
   public static void createInMemoryLdapServer() throws Exception {
      InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig("dc=MyDomain");
      config.addAdditionalBindCredentials("cn=Directory Manager", "password");
      config.setListenerConfigs(InMemoryListenerConfig.createLDAPConfig("default", ldapPort));
      config.setSchema(null);
		

      InMemoryDirectoryServer ds = new InMemoryDirectoryServer(config);
      ds.importFromLDIF(true, new LDIFReader(LdapUserServiceTest.class.getResourceAsStream("resources/ldapUserServiceSampleData.ldif")));
      ds.startListening();
   }
	

   @Before
   public void createLdapUserService() {
      ldapUserService = new LdapUserService();
      ldapUserService.setup(getSettings());
   }
	

   private MemorySettings getSettings() {
      Map<String, Object> backingMap = new HashMap<String, Object>();
      backingMap.put("realm.ldap.server", "ldap://localhost:" + ldapPort);
@@ -83,79 +83,79 @@
      backingMap.put("realm.ldap.admins", "UserThree @Git_Admins \"@Git Admins\"");
      backingMap.put("realm.ldap.displayName", "displayName");
      backingMap.put("realm.ldap.email", "email");
		

      MemorySettings ms = new MemorySettings(backingMap);
      return ms;
   }
	

   @Test
   public void testAuthenticate() {		
   public void testAuthenticate() {
      UserModel userOneModel = ldapUserService.authenticate("UserOne", "userOnePassword".toCharArray());
      assertNotNull(userOneModel);
      assertNotNull(userOneModel.getTeam("git_admins"));
      assertNotNull(userOneModel.getTeam("git_users"));
      assertTrue(userOneModel.canAdmin);
		

      UserModel userOneModelFailedAuth = ldapUserService.authenticate("UserOne", "userTwoPassword".toCharArray());
      assertNull(userOneModelFailedAuth);
		

      UserModel userTwoModel = ldapUserService.authenticate("UserTwo", "userTwoPassword".toCharArray());
      assertNotNull(userTwoModel);
      assertNotNull(userTwoModel.getTeam("git_users"));
      assertNull(userTwoModel.getTeam("git_admins"));
      assertNotNull(userTwoModel.getTeam("git admins"));
      assertTrue(userTwoModel.canAdmin);
		

      UserModel userThreeModel = ldapUserService.authenticate("UserThree", "userThreePassword".toCharArray());
      assertNotNull(userThreeModel);
      assertNotNull(userThreeModel.getTeam("git_users"));
      assertNull(userThreeModel.getTeam("git_admins"));
      assertTrue(userThreeModel.canAdmin);
   }
	

   @Test
   public void testDisplayName() {
      UserModel userOneModel = ldapUserService.authenticate("UserOne", "userOnePassword".toCharArray());
      assertNotNull(userOneModel);
      assertEquals("User One", userOneModel.displayName);
		

      // Test more complicated scenarios - concat
      MemorySettings ms = getSettings();
      ms.put("realm.ldap.displayName", "${personalTitle}. ${givenName} ${surname}");
      ldapUserService = new LdapUserService();
      ldapUserService.setup(ms);
		

      userOneModel = ldapUserService.authenticate("UserOne", "userOnePassword".toCharArray());
      assertNotNull(userOneModel);
      assertEquals("Mr. User One", userOneModel.displayName);
   }
	

   @Test
   public void testEmail() {
      UserModel userOneModel = ldapUserService.authenticate("UserOne", "userOnePassword".toCharArray());
      assertNotNull(userOneModel);
      assertEquals("userone@gitblit.com", userOneModel.emailAddress);
		

      // Test more complicated scenarios - concat
      MemorySettings ms = getSettings();
      ms.put("realm.ldap.email", "${givenName}.${surname}@gitblit.com");
      ldapUserService = new LdapUserService();
      ldapUserService.setup(ms);
		

      userOneModel = ldapUserService.authenticate("UserOne", "userOnePassword".toCharArray());
      assertNotNull(userOneModel);
      assertEquals("User.One@gitblit.com", userOneModel.emailAddress);
   }
	

   @Test
   public void testLdapInjection() {
      // Inject so "(&(objectClass=person)(sAMAccountName=${username}))" becomes "(&(objectClass=person)(sAMAccountName=*)(userPassword=userOnePassword))"
      // Thus searching by password
		

      UserModel userOneModel = ldapUserService.authenticate("*)(userPassword=userOnePassword", "userOnePassword".toCharArray());
      assertNull(userOneModel);
   }
	

   @Test
   public void testLocalAccount() {
      UserModel localAccount = new UserModel("bruce");
@@ -164,8 +164,8 @@
      ldapUserService.deleteUser(localAccount.username);
      assertTrue("Failed to add local account",
            ldapUserService.updateUserModel(localAccount));
      assertEquals("Accounts are not equal!", 
            localAccount, 
      assertEquals("Accounts are not equal!",
            localAccount,
            ldapUserService.authenticate(localAccount.username, "gimmesomesugar".toCharArray()));
      assertTrue("Failed to delete local account!",
            ldapUserService.deleteUser(localAccount.username));