OO-1829 remove illegal mail addresses from testcases

src/test/java/org/olat/core/util/mail/EmailAddressValidatorTest.java

@@ -23,7 +23,6 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-import org.olat.core.util.mail.EmailAddressValidator;
 
 /**
  * Description:<br>
@@ -47,6 +46,7 @@ public class EmailAddressValidatorTest {
 		Assert.assertTrue(EmailAddressValidator.isValidEmailAddress("contakt@umläüte.biz"));
 		Assert.assertTrue(EmailAddressValidator.isValidEmailAddress("dont.knwo.what.it@means.中国"));
 		Assert.assertTrue(EmailAddressValidator.isValidEmailAddress("dont.knwo@in.рф"));
+		Assert.assertTrue(EmailAddressValidator.isValidEmailAddress("gnägi@frentix.com"));
 		
 		// wrong stuff
 		Assert.assertFalse(EmailAddressValidator.isValidEmailAddress(null));
@@ -54,9 +54,16 @@ public class EmailAddressValidatorTest {
 		Assert.assertFalse(EmailAddressValidator.isValidEmailAddress("asdf"));
 		Assert.assertFalse(EmailAddressValidator.isValidEmailAddress("asdf@.."));		
 		Assert.assertFalse(EmailAddressValidator.isValidEmailAddress("wrong email @ address dot com"));
+		Assert.assertFalse(EmailAddressValidator.isValidEmailAddress("wrong.email@address_dot_com"));
 		Assert.assertFalse(EmailAddressValidator.isValidEmailAddress("email @with.blank"));
 		Assert.assertFalse(EmailAddressValidator.isValidEmailAddress("great.domain.com"));
 		Assert.assertFalse(EmailAddressValidator.isValidEmailAddress("some.thing@"));
-		
+		Assert.assertFalse(EmailAddressValidator.isValidEmailAddress("gnaegi"));
+		Assert.assertFalse(EmailAddressValidator.isValidEmailAddress("g@g"));
+
+		// valid addresses but disable in OLAT because this is not what we want users to enter as mail addresses
+		Assert.assertFalse(EmailAddressValidator.isValidEmailAddress("\"Florian Gnaegi\" <gnaegi@frentix.com>")); 
+		// Validates true by library. Don't know what this would be usefull for. Not needed by OpenOLAT
+		Assert.assertTrue(EmailAddressValidator.isValidEmailAddress("someone@[192.168.1.100]")); 		
 	}
 }

src/test/java/org/olat/core/util/mail/manager/MailTest.java

@@ -26,8 +26,6 @@
 package org.olat.core.util.mail.manager;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.File;
@@ -45,7 +43,6 @@ import org.olat.core.id.User;
 import org.olat.core.id.UserConstants;
 import org.olat.core.util.mail.MailBundle;
 import org.olat.core.util.mail.MailContext;
-import org.olat.core.util.mail.MailHelper;
 import org.olat.core.util.mail.MailManager;
 import org.olat.core.util.mail.MailTemplate;
 import org.olat.core.util.mail.MailerResult;
@@ -91,42 +88,6 @@ public class MailTest extends OlatTestCase {
 		id6 = JunitTestHelper.createAndPersistIdentityAsUser("six");
 	}
 
-	/**
-	 * Simple helper to test valid email addresses
-	 * @param mailAddress
-	 */
-	private void isValid(String mailAddress) {
-		assertTrue(MailHelper.isValidEmailAddress(mailAddress));
-	}
-	/**
-	 * Simple helper to test invalid email addresses
-	 * @param mailAddress
-	 */
-	private void isInvalid(String mailAddress) {
-		assertFalse(MailHelper.isValidEmailAddress(mailAddress));
-	}
-
-	/**
-	 * Test the email addres validator
-	 */
-	@Test public void testValidEmailAddresses() {
-		// valid addresses
-		isValid("gnaegi@frentix.com");
-		isValid("login@w.pl");
-		// invalid addresses
-		isInvalid(null);
-		isInvalid("");
-		isInvalid("gnägi@frentix.com");
-		isInvalid("gnaegi @ frentix.com");
-		isInvalid("gnaegi@frentix_com");
-		isInvalid("gnaegi");
-		isInvalid("g@g");
-		// valid addresses but disable in OLAT because this is not what we want users to enter as mail addresses
-		isInvalid("\"Florian Gnaegi\" <gnaegi@frentix.com>"); 
-		isInvalid("someone@[192.168.1.100]"); 
-	}
-
-	
 	/**
 	 * this is more a playground method to understand the evaluate method than a
 	 * rela testcase

src/test/java/org/olat/user/EmailCheckPerformanceTest.java

@@ -40,7 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @author Christian Guretzki
  */
 public class EmailCheckPerformanceTest extends OlatTestCase {
-	private static final String TEST_DOMAIN = "@test.test";
+	private static final String TEST_DOMAIN = "@testtest.com";
 
 	private static final String USERNAME_CONSTANT = "email-test";