diff options
author | rescobar | 2011-08-06 00:32:26 +0000 |
---|---|---|
committer | Ryan D. Brooks | 2011-08-06 00:32:26 +0000 |
commit | ddeb5f6d1a22878842589f8e15cd4d9932749eb3 (patch) | |
tree | 6c488178a7f053747a8f651fe27679b3577d5ea6 | |
parent | 2eb9559e58b8847b72a4d4645b620b61a02cdcaa (diff) | |
download | org.eclipse.osee-ddeb5f6d1a22878842589f8e15cd4d9932749eb3.tar.gz org.eclipse.osee-ddeb5f6d1a22878842589f8e15cd4d9932749eb3.tar.xz org.eclipse.osee-ddeb5f6d1a22878842589f8e15cd4d9932749eb3.zip |
refinement[bgz_349095]: Fix MailServiceConfig setTo method create single test class
7 files changed, 209 insertions, 288 deletions
diff --git a/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/AllMailTestSuite.java b/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/AllMailTestSuite.java index 10bcbdb1768..d93ccfcbe3e 100644 --- a/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/AllMailTestSuite.java +++ b/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/AllMailTestSuite.java @@ -20,10 +20,7 @@ import org.junit.runners.Suite; @Suite.SuiteClasses({ MailEventUtilTest.class, MailMessageTest.class, - MailServiceConfigSingleParamStringTest.class, - MailServiceConfigSingleParamIntTest.class, - MailServiceConfigSingleParamBoolTest.class, - MailServiceConfigSetToTest.class, + MailServiceConfigTest.class, MailUtilsContainsAnyTest.class, MailUtilsCreateFromHtmlTest.class, MailUtilsCreateFromStringTest.class, diff --git a/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailServiceConfigSetToTest.java b/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailServiceConfigSetToTest.java deleted file mode 100644 index 83431a5390f..00000000000 --- a/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailServiceConfigSetToTest.java +++ /dev/null @@ -1,106 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.mail; - -import java.util.ArrayList; -import java.util.Collection; -import junit.framework.Assert; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; - -/** - * Test unit for {@link MailServiceConfig} - * - * @author Shawn F. cook - */ -@RunWith(Parameterized.class) -public class MailServiceConfigSetToTest { - private final String host; - private final String pword; - private final String sysAdminEmail; - private final String transport; - private final String username; - private final int port; - - public MailServiceConfigSetToTest(String host, String pword, int port, String sysAdminEmail, String transport, String username) { - this.host = host; - this.pword = pword; - this.port = port; - this.sysAdminEmail = sysAdminEmail; - this.transport = transport; - this.username = username; - } - - @org.junit.Test - public void testMailMsgSetTo() { - MailServiceConfig mailsvc = new MailServiceConfig(); - MailServiceConfig mailsvc_to = new MailServiceConfig(); - - mailsvc_to.setHost(host); - mailsvc_to.setPassword(pword); - mailsvc_to.setPort(port); - mailsvc_to.setSystemAdminEmailAddress(sysAdminEmail); - mailsvc_to.setTransport(transport); - mailsvc_to.setUserName(username); - mailsvc.setTo(mailsvc_to); - Assert.assertEquals(mailsvc_to.getHost(), mailsvc.getHost()); - Assert.assertEquals(mailsvc_to.getPassword(), mailsvc.getPassword()); - Assert.assertEquals(mailsvc_to.getPort(), mailsvc.getPort()); - Assert.assertEquals(mailsvc_to.getSystemAdminEmailAddress(), mailsvc.getSystemAdminEmailAddress()); - Assert.assertEquals(mailsvc_to.getTransport(), mailsvc.getTransport()); - Assert.assertEquals(mailsvc_to.getUserName(), mailsvc.getUserName()); - - }//test_MailMsg_accessors - - @Parameters - public static Collection<Object[]> getData() { - Collection<Object[]> data = new ArrayList<Object[]>(); - data.add(new Object[] {"This is a host value.",//host - "This is a pword value.",//pword - 0,//port - "This is a sysAdminEmail value.",//sysAdminEmail - "This is a transport value.",//transport - "This is a username value."});//username - - data.add(new Object[] {"such.and.such.somewhere.com",//host - "th1$_!S_@_p#$$w0)d",//pword - 25,//port - "so.and.so@such-and-such.org",//sysAdminEmail - "smtp",//transport - "joe.schmoe"});//username - - data.add(new Object[] {"1.Testing special characters - ~`!@#$%^&*()_-+={}|[]:\";'<>?,./",//host - "2.Testing special characters - ~`!@#$%^&*()_-+={}|[]:\";'<>?,./",//pword - 32000,//port - "3.Testing special characters - ~`!@#$%^&*()_-+={}|[]:\";'<>?,./",//sysAdminEmail - "4.Testing special characters - ~`!@#$%^&*()_-+={}|[]:\";'<>?,./",//transport - "5.Testing special characters - ~`!@#$%^&*()_-+={}|[]:\";'<>?,./"});//username - - //generate a very long string - String aLongString1 = "1."; - String aLongString2 = "2."; - String aLongString3 = "3."; - String aLongString4 = "4."; - String aLongString5 = "5."; - //make a 1000 char string. - for (int i = 0; i < 1000; i++) { - aLongString1 += "x"; - aLongString2 += "x"; - aLongString3 += "x"; - aLongString4 += "x"; - aLongString5 += "x"; - } - data.add(new Object[] {aLongString1, aLongString2, 49151, aLongString3, aLongString4, aLongString5}); - - return data; - }//getData -}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailServiceConfigSingleParamBoolTest.java b/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailServiceConfigSingleParamBoolTest.java deleted file mode 100644 index abdfd4451af..00000000000 --- a/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailServiceConfigSingleParamBoolTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.mail; - -import java.util.ArrayList; -import java.util.Collection; -import junit.framework.Assert; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; - -/** - * Test unit for {@link MailServiceConfig} - * - * @author Shawn F. cook - */ -@RunWith(Parameterized.class) -public class MailServiceConfigSingleParamBoolTest { - boolean bool_value; - - public MailServiceConfigSingleParamBoolTest(boolean bool_value) { - this.bool_value = bool_value; - } - - @org.junit.Test - public void testMailMsgBoolAccessors() { - MailServiceConfig mailsvc = new MailServiceConfig(); - mailsvc.setAuthenticationRequired(bool_value); - Assert.assertEquals(bool_value, mailsvc.isAuthenticationRequired()); - mailsvc.setDebug(bool_value); - Assert.assertEquals(bool_value, mailsvc.isDebug()); - mailsvc.setMailStatsEnabled(bool_value); - Assert.assertEquals(bool_value, mailsvc.isMailStatsEnabled()); - }//test_MailMsg_accessors - - @Parameters - public static Collection<Object[]> getData() { - Collection<Object[]> data = new ArrayList<Object[]>(); - - data.add(new Object[] {false}); - data.add(new Object[] {true}); - - return data; - }//getData -}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailServiceConfigSingleParamIntTest.java b/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailServiceConfigSingleParamIntTest.java deleted file mode 100644 index e1fe79494ec..00000000000 --- a/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailServiceConfigSingleParamIntTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.mail; - -import java.util.ArrayList; -import java.util.Collection; -import junit.framework.Assert; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; - -/** - * Test unit for {@link MailServiceConfig} - * - * @author Shawn F. cook - */ -@RunWith(Parameterized.class) -public class MailServiceConfigSingleParamIntTest { - int int_value; - - public MailServiceConfigSingleParamIntTest(int int_value) { - this.int_value = int_value; - } - - @org.junit.Test - public void testMailMsgIntAccessors() { - MailServiceConfig mailsvc = new MailServiceConfig(); - mailsvc.setPort(int_value); - Assert.assertEquals(int_value, mailsvc.getPort()); - }//test_MailMsg_accessors - - @Parameters - public static Collection<Object[]> getData() { - Collection<Object[]> data = new ArrayList<Object[]>(); - - data.add(new Object[] {0}); - data.add(new Object[] {-1234}); - data.add(new Object[] {999999}); - data.add(new Object[] {-8376346}); - - return data; - }//getData -} diff --git a/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailServiceConfigSingleParamStringTest.java b/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailServiceConfigSingleParamStringTest.java deleted file mode 100644 index c10e09a6445..00000000000 --- a/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailServiceConfigSingleParamStringTest.java +++ /dev/null @@ -1,68 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.mail; - -import java.util.ArrayList; -import java.util.Collection; -import junit.framework.Assert; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; - -/** - * Test unit for {@link MailServiceConfig} - * - * @author Shawn F. cook - */ -@RunWith(Parameterized.class) -public class MailServiceConfigSingleParamStringTest { - String str_value; - - public MailServiceConfigSingleParamStringTest(String str_value) { - this.str_value = str_value; - } - - @org.junit.Test - public void testMailMsgStringAccessors() { - MailServiceConfig mailsvc = new MailServiceConfig(); - - mailsvc.setHost(str_value); - Assert.assertEquals(str_value, mailsvc.getHost()); - mailsvc.setPassword(str_value); - Assert.assertEquals(str_value, mailsvc.getPassword()); - mailsvc.setSystemAdminEmailAddress(str_value); - Assert.assertEquals(str_value, mailsvc.getSystemAdminEmailAddress()); - mailsvc.setTransport(str_value); - Assert.assertEquals(str_value, mailsvc.getTransport()); - mailsvc.setUserName(str_value); - Assert.assertEquals(str_value, mailsvc.getUserName()); - - }//test_MailMsg_accessors - - @Parameters - public static Collection<Object[]> getData() { - Collection<Object[]> data = new ArrayList<Object[]>(); - - data.add(new Object[] {"One new string value."}); - data.add(new Object[] {"joe.schmoe@somedomain.com"}); - data.add(new Object[] {"Testing special characters - ~`!@#$%^&*()_-+={}|[]:\";'<>?,./"}); - - //generate a very long string - String aLongString = ""; - //make a 1000 char string. - for (int i = 0; i < 1000; i++) { - aLongString += "x"; - } - data.add(new Object[] {aLongString}); - - return data; - }//getData -} diff --git a/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailServiceConfigTest.java b/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailServiceConfigTest.java new file mode 100644 index 00000000000..89d10d73cab --- /dev/null +++ b/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailServiceConfigTest.java @@ -0,0 +1,199 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 Boeing. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.mail; + +import java.util.ArrayList; +import java.util.Collection; +import junit.framework.Assert; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; + +/** + * Test unit for {@link MailServiceConfig} + * + * @author Roberto E. Escobar + */ +@RunWith(Parameterized.class) +public class MailServiceConfigTest { + private static final String SPECIAL_CHARS = "~`!@#$%^&*()_-+={}|[]:\";'<>?,./"; + + private static final String DEFAULT_HOST = ""; + private static final String DEFAULT_USER = ""; + private static final String DEFAULT_PASSWD = ""; + private static final int DEFAULT_PORT = 25; + private static final String DEFAULT_TRANSPORT = "smtp"; + private static final boolean DEFAULT_DEBUG = false; + private static final boolean DEFAULT_AUTHENTICATION = false; + private static final String DEFAULT_SYSTEM_EMAIL = ""; + private static final boolean DEFAULT_MAIL_STATS = false; + + private final MailServiceConfig config = new MailServiceConfig(); + + private final String userName; + private final String password; + private final String host; + private final int port; + private final String transport; + private final String systemAdminEmailAddress; + private final boolean debug; + private final boolean authenticationRequired; + private final boolean mailStatsEnabled; + + public MailServiceConfigTest(String userName, String password, String host, int port, String transport, String systemAdminEmailAddress, boolean debug, boolean authenticationRequired, boolean mailStatsEnabled) { + super(); + this.userName = userName; + this.password = password; + this.host = host; + this.port = port; + this.transport = transport; + this.systemAdminEmailAddress = systemAdminEmailAddress; + this.debug = debug; + this.authenticationRequired = authenticationRequired; + this.mailStatsEnabled = mailStatsEnabled; + } + + @org.junit.Test + public void testSetGetHost() { + Assert.assertEquals(DEFAULT_HOST, config.getHost()); + config.setHost(host); + Assert.assertEquals(host, config.getHost()); + } + + @org.junit.Test + public void testMailMsgIntAccessors() { + Assert.assertEquals(DEFAULT_PORT, config.getPort()); + config.setPort(port); + Assert.assertEquals(port, config.getPort()); + } + + @org.junit.Test + public void testSetGetUserName() { + Assert.assertEquals(DEFAULT_USER, config.getUserName()); + config.setUserName(userName); + Assert.assertEquals(userName, config.getUserName()); + } + + @org.junit.Test + public void testSetGetPassword() { + Assert.assertEquals(DEFAULT_PASSWD, config.getPassword()); + config.setPassword(password); + Assert.assertEquals(password, config.getPassword()); + } + + @org.junit.Test + public void testSetGetSystemAdminEmailAddress() { + Assert.assertEquals(DEFAULT_SYSTEM_EMAIL, config.getSystemAdminEmailAddress()); + config.setSystemAdminEmailAddress(systemAdminEmailAddress); + Assert.assertEquals(systemAdminEmailAddress, config.getSystemAdminEmailAddress()); + } + + @org.junit.Test + public void testSetGetTransport() { + Assert.assertEquals(DEFAULT_TRANSPORT, config.getTransport()); + config.setTransport(transport); + Assert.assertEquals(transport, config.getTransport()); + } + + @org.junit.Test + public void testSetIsDebug() { + Assert.assertEquals(DEFAULT_DEBUG, config.isDebug()); + config.setDebug(debug); + Assert.assertEquals(debug, config.isDebug()); + } + + @org.junit.Test + public void testSetIsAuthenticationRequired() { + Assert.assertEquals(DEFAULT_AUTHENTICATION, config.isAuthenticationRequired()); + config.setAuthenticationRequired(authenticationRequired); + Assert.assertEquals(authenticationRequired, config.isAuthenticationRequired()); + } + + @org.junit.Test + public void testSetIsMailStats() { + Assert.assertEquals(DEFAULT_MAIL_STATS, config.isMailStatsEnabled()); + config.setMailStatsEnabled(mailStatsEnabled); + Assert.assertEquals(mailStatsEnabled, config.isMailStatsEnabled()); + } + + @org.junit.Test + public void testSetTo() { + MailServiceConfig config1 = new MailServiceConfig(); + Assert.assertEquals(DEFAULT_HOST, config.getHost()); + Assert.assertEquals(DEFAULT_PORT, config.getPort()); + Assert.assertEquals(DEFAULT_USER, config.getUserName()); + Assert.assertEquals(DEFAULT_PASSWD, config.getPassword()); + Assert.assertEquals(DEFAULT_SYSTEM_EMAIL, config.getSystemAdminEmailAddress()); + Assert.assertEquals(DEFAULT_TRANSPORT, config.getTransport()); + Assert.assertEquals(DEFAULT_DEBUG, config.isDebug()); + Assert.assertEquals(DEFAULT_AUTHENTICATION, config.isAuthenticationRequired()); + Assert.assertEquals(DEFAULT_MAIL_STATS, config.isMailStatsEnabled()); + + MailServiceConfig config2 = new MailServiceConfig(); + config2.setHost(host); + config2.setPort(port); + config2.setUserName(userName); + config2.setPassword(password); + config2.setSystemAdminEmailAddress(systemAdminEmailAddress); + config2.setTransport(transport); + config2.setDebug(debug); + config2.setAuthenticationRequired(authenticationRequired); + config2.setMailStatsEnabled(mailStatsEnabled); + + Assert.assertEquals(host, config2.getHost()); + Assert.assertEquals(port, config2.getPort()); + Assert.assertEquals(userName, config2.getUserName()); + Assert.assertEquals(password, config2.getPassword()); + Assert.assertEquals(systemAdminEmailAddress, config2.getSystemAdminEmailAddress()); + Assert.assertEquals(transport, config2.getTransport()); + Assert.assertEquals(debug, config2.isDebug()); + Assert.assertEquals(authenticationRequired, config2.isAuthenticationRequired()); + Assert.assertEquals(mailStatsEnabled, config2.isMailStatsEnabled()); + + config1.setTo(config2); + + Assert.assertEquals(host, config1.getHost()); + Assert.assertEquals(port, config1.getPort()); + Assert.assertEquals(userName, config1.getUserName()); + Assert.assertEquals(password, config1.getPassword()); + Assert.assertEquals(systemAdminEmailAddress, config1.getSystemAdminEmailAddress()); + Assert.assertEquals(transport, config1.getTransport()); + Assert.assertEquals(debug, config1.isDebug()); + Assert.assertEquals(authenticationRequired, config1.isAuthenticationRequired()); + Assert.assertEquals(mailStatsEnabled, config1.isMailStatsEnabled()); + } + + private static void addTest(Collection<Object[]> data, String userName, String password, String host, int port, String transport, String systemAdminEmailAddress, boolean debug, boolean authenticationRequired, boolean mailStatsEnabled) { + data.add(new Object[] { + userName, + password, + host, + port, + transport, + systemAdminEmailAddress, + debug, + authenticationRequired, + mailStatsEnabled}); + } + + @Parameters + public static Collection<Object[]> getData() { + Collection<Object[]> data = new ArrayList<Object[]>(); + + addTest(data, SPECIAL_CHARS, "pword", "123.9.1.2", 0, "smpts", "joe.schmoe@somedomain.com", true, true, true); + addTest(data, "u1", SPECIAL_CHARS, "such.and.such.somewhere.com", Integer.MAX_VALUE, "tx1", "", false, true, true); + addTest(data, "u2", "p1", SPECIAL_CHARS, Integer.MIN_VALUE, "tx2", "sys1@xyz.com", true, false, true); + addTest(data, "u3", "p2", "host1", 8000, SPECIAL_CHARS, "sys2@xyz.com", true, true, false); + addTest(data, "u4", "p3", "host2", 9999, "tx3", SPECIAL_CHARS, false, false, false); + addTest(data, null, null, null, 9999, null, null, false, true, false); + return data; + } +} diff --git a/plugins/org.eclipse.osee.mail/src/org/eclipse/osee/mail/MailServiceConfig.java b/plugins/org.eclipse.osee.mail/src/org/eclipse/osee/mail/MailServiceConfig.java index b873304e3ad..9f8ca86880a 100644 --- a/plugins/org.eclipse.osee.mail/src/org/eclipse/osee/mail/MailServiceConfig.java +++ b/plugins/org.eclipse.osee.mail/src/org/eclipse/osee/mail/MailServiceConfig.java @@ -118,12 +118,15 @@ public class MailServiceConfig { public void setTo(MailServiceConfig other) { if (other != null) { - this.setHost(other.getHost()); - this.setPassword(other.getPassword()); - this.setPort(other.getPort()); - this.setSystemAdminEmailAddress(other.getSystemAdminEmailAddress()); - this.setTransport(other.getTransport()); - this.setUserName(other.getUserName()); + setAuthenticationRequired(other.isAuthenticationRequired()); + setDebug(other.isDebug()); + setHost(other.getHost()); + setMailStatsEnabled(other.isMailStatsEnabled()); + setPassword(other.getPassword()); + setPort(other.getPort()); + setSystemAdminEmailAddress(other.getSystemAdminEmailAddress()); + setTransport(other.getTransport()); + setUserName(other.getUserName()); } } |