Author: bago Date: Thu Oct 8 09:59:04 2009 New Revision: 823108 URL: http://svn.apache.org/viewvc?rev=823108&view=rev Log: Fix DKIMSignTest for using "Fake" classes instead of "Mock" classes (mailet-base:tests upgrade). m2 build descriptors upgrade for the latest dependencies.
Modified: james/jdkim/trunk/mailets/pom.xml james/jdkim/trunk/mailets/src/test/java/org/apache/james/jdkim/mailets/DKIMSignTest.java james/jdkim/trunk/main/pom.xml james/jdkim/trunk/stage/pom.xml Modified: james/jdkim/trunk/mailets/pom.xml URL: http://svn.apache.org/viewvc/james/jdkim/trunk/mailets/pom.xml?rev=823108&r1=823107&r2=823108&view=diff ============================================================================== --- james/jdkim/trunk/mailets/pom.xml (original) +++ james/jdkim/trunk/mailets/pom.xml Thu Oct 8 09:59:04 2009 @@ -17,7 +17,7 @@ <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-mailet</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </dependency> <dependency> @@ -36,13 +36,13 @@ <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-mailet-base</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> </dependency> <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-mailet-base</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> <type>test-jar</type> <scope>test</scope> </dependency> @@ -88,13 +88,13 @@ <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>1.4</version> + <version>1.4.1</version> </dependency> <dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> - <version>1.1</version> + <version>1.1.1</version> </dependency> </dependencies> Modified: james/jdkim/trunk/mailets/src/test/java/org/apache/james/jdkim/mailets/DKIMSignTest.java URL: http://svn.apache.org/viewvc/james/jdkim/trunk/mailets/src/test/java/org/apache/james/jdkim/mailets/DKIMSignTest.java?rev=823108&r1=823107&r2=823108&view=diff ============================================================================== --- james/jdkim/trunk/mailets/src/test/java/org/apache/james/jdkim/mailets/DKIMSignTest.java (original) +++ james/jdkim/trunk/mailets/src/test/java/org/apache/james/jdkim/mailets/DKIMSignTest.java Thu Oct 8 09:59:04 2009 @@ -39,9 +39,9 @@ import org.apache.james.jdkim.PermFailException; import org.apache.mailet.Mail; import org.apache.mailet.Mailet; -import org.apache.mailet.base.test.MockMail; -import org.apache.mailet.base.test.MockMailContext; -import org.apache.mailet.base.test.MockMailetConfig; +import org.apache.mailet.base.test.FakeMail; +import org.apache.mailet.base.test.FakeMailContext; +import org.apache.mailet.base.test.FakeMailetConfig; public class DKIMSignTest extends TestCase { @@ -50,13 +50,13 @@ Mailet mailet = new DKIMSign(); - MockMailetConfig mci = new MockMailetConfig("Test",new MockMailContext()); + FakeMailetConfig mci = new FakeMailetConfig("Test",new FakeMailContext()); mci.setProperty("signatureTemplate","v=1; s=selector; d=example.com; h=from:to:received:received; a=rsa-sha256; bh=; b=;"); mci.setProperty("privateKey","MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBANgNpgpfPBVjCpZsuGa4nrppMA3zCYNH6t8cTwd+eRI5rHSgihMznOq5mtMujfTzvRgx9jPHB8HqP83PdB3CtQP+3RgxgmJQrJYmcIp9lcckEn7J9Eevuhb5RbdxWj0IbZsF8jGwifBh7XvmD1SPKe0mla56p0QijVzZuG/0ynrpAgMBAAECgYEAjxdzCdmLRKrk3z3AX6AU2GdEQWjeuwkNoJjyKod0DkMOWevdptv/KGKnDQj/UeWALp8gbah7Fc5cVaX5RKCpG3WRO32NeFUUTGDyY2SjZR6UDAW2yXwJGNVxhA5x514f9Yz+ZeODbBSqpl6cGaUqUPq81vvSMUl5VoMn/ufuPwECQQD02QfYPhmCP8g4BVhxxlgfvj5WA7R7tWRSNCT3C0naPpwaono9+PSuhUgxRbOgFvxh8StHyXomdVBt/LzeAl6JAkEA4eTejDsmMCfxe47JnHbgpxNphYpSQBB9FZgMUU5hAXgpX3EtIS3JxjSSOx3EYoO51ZywBOWUXNcMJAXoNM0hYQJAQDnZ4/BOMqtWctN8IsQbg6Acq+Vm53hqa2HAPIlagwQfYKE0HaN7U3gkusAE4T6GT466gqcoAoSNZ3x/cmD+uQJAePyZCaiAephaKSA/8VJmXnXyNXjxNqjeJduq9T0yjZPrLNg0IKoigMsVax41WcJNnRBv4h+IR/VR5lVXmjgn4QJANq02dLdX2phQqOP+Ss1EP9TT7t6HxLbKUuoPdGVKf0q1gZEyAC1Re2I4SLMEfpt3+ivMj1X2zDzIHP5mogfblA=="); mailet.init(mci); - Mail mail = new MockMail(); + Mail mail = new FakeMail(); mail.setMessage(new MimeMessage(Session .getDefaultInstance(new Properties()), new ByteArrayInputStream(message.getBytes()))); @@ -71,8 +71,8 @@ mail.getMessage().writeTo(rawMessage); String res = rawMessage.toString(); - MockPublicKeyRecordRetriever mockPublicKeyRecordRetriever = new MockPublicKeyRecordRetriever("v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYDaYKXzwVYwqWbLhmuJ66aTAN8wmDR+rfHE8HfnkSOax0oIoTM5zquZrTLo30870YMfYzxwfB6j/Nz3QdwrUD/t0YMYJiUKyWJnCKfZXHJBJ+yfRHr7oW+UW3cVo9CG2bBfIxsInwYe175g9UjyntJpWueqdEIo1c2bhv9Mp66QIDAQAB;", "selector", "example.com"); - new DKIMVerifier(mockPublicKeyRecordRetriever).verify(new ByteArrayInputStream(res.getBytes())); + MockPublicKeyRecordRetriever MockPublicKeyRecordRetriever = new MockPublicKeyRecordRetriever("v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYDaYKXzwVYwqWbLhmuJ66aTAN8wmDR+rfHE8HfnkSOax0oIoTM5zquZrTLo30870YMfYzxwfB6j/Nz3QdwrUD/t0YMYJiUKyWJnCKfZXHJBJ+yfRHr7oW+UW3cVo9CG2bBfIxsInwYe175g9UjyntJpWueqdEIo1c2bhv9Mp66QIDAQAB;", "selector", "example.com"); + new DKIMVerifier(MockPublicKeyRecordRetriever).verify(new ByteArrayInputStream(res.getBytes())); } public void testDKIMSignMessageAsText() throws MessagingException, IOException, FailException { @@ -83,13 +83,13 @@ Mailet mailet = new DKIMSign(); - MockMailetConfig mci = new MockMailetConfig("Test",new MockMailContext()); + FakeMailetConfig mci = new FakeMailetConfig("Test",new FakeMailContext()); mci.setProperty("signatureTemplate","v=1; s=selector; d=example.com; h=from:to:received:received; a=rsa-sha256; bh=; b=;"); mci.setProperty("privateKey","MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBANgNpgpfPBVjCpZsuGa4nrppMA3zCYNH6t8cTwd+eRI5rHSgihMznOq5mtMujfTzvRgx9jPHB8HqP83PdB3CtQP+3RgxgmJQrJYmcIp9lcckEn7J9Eevuhb5RbdxWj0IbZsF8jGwifBh7XvmD1SPKe0mla56p0QijVzZuG/0ynrpAgMBAAECgYEAjxdzCdmLRKrk3z3AX6AU2GdEQWjeuwkNoJjyKod0DkMOWevdptv/KGKnDQj/UeWALp8gbah7Fc5cVaX5RKCpG3WRO32NeFUUTGDyY2SjZR6UDAW2yXwJGNVxhA5x514f9Yz+ZeODbBSqpl6cGaUqUPq81vvSMUl5VoMn/ufuPwECQQD02QfYPhmCP8g4BVhxxlgfvj5WA7R7tWRSNCT3C0naPpwaono9+PSuhUgxRbOgFvxh8StHyXomdVBt/LzeAl6JAkEA4eTejDsmMCfxe47JnHbgpxNphYpSQBB9FZgMUU5hAXgpX3EtIS3JxjSSOx3EYoO51ZywBOWUXNcMJAXoNM0hYQJAQDnZ4/BOMqtWctN8IsQbg6Acq+Vm53hqa2HAPIlagwQfYKE0HaN7U3gkusAE4T6GT466gqcoAoSNZ3x/cmD+uQJAePyZCaiAephaKSA/8VJmXnXyNXjxNqjeJduq9T0yjZPrLNg0IKoigMsVax41WcJNnRBv4h+IR/VR5lVXmjgn4QJANq02dLdX2phQqOP+Ss1EP9TT7t6HxLbKUuoPdGVKf0q1gZEyAC1Re2I4SLMEfpt3+ivMj1X2zDzIHP5mogfblA=="); mailet.init(mci); - Mail mail = new MockMail(); + Mail mail = new FakeMail(); mail.setMessage(mm); Mailet m7bit = new ConvertTo7Bit(); @@ -103,8 +103,8 @@ mail.getMessage().writeTo(rawMessage); String res = rawMessage.toString(); - MockPublicKeyRecordRetriever mockPublicKeyRecordRetriever = new MockPublicKeyRecordRetriever("v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYDaYKXzwVYwqWbLhmuJ66aTAN8wmDR+rfHE8HfnkSOax0oIoTM5zquZrTLo30870YMfYzxwfB6j/Nz3QdwrUD/t0YMYJiUKyWJnCKfZXHJBJ+yfRHr7oW+UW3cVo9CG2bBfIxsInwYe175g9UjyntJpWueqdEIo1c2bhv9Mp66QIDAQAB;", "selector", "example.com"); - new DKIMVerifier(mockPublicKeyRecordRetriever).verify(new ByteArrayInputStream(res.getBytes())); + MockPublicKeyRecordRetriever MockPublicKeyRecordRetriever = new MockPublicKeyRecordRetriever("v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYDaYKXzwVYwqWbLhmuJ66aTAN8wmDR+rfHE8HfnkSOax0oIoTM5zquZrTLo30870YMfYzxwfB6j/Nz3QdwrUD/t0YMYJiUKyWJnCKfZXHJBJ+yfRHr7oW+UW3cVo9CG2bBfIxsInwYe175g9UjyntJpWueqdEIo1c2bhv9Mp66QIDAQAB;", "selector", "example.com"); + new DKIMVerifier(MockPublicKeyRecordRetriever).verify(new ByteArrayInputStream(res.getBytes())); } public void testDKIMSignMessageAsObjectConvertedTo7Bit() throws MessagingException, IOException, FailException { @@ -115,14 +115,14 @@ mm.setHeader("Content-Transfer-Encoding", "8bit"); mm.saveChanges(); - MockMailContext mockMailContext = new MockMailContext(); - mockMailContext.getServerInfo(); - MockMailetConfig mci = new MockMailetConfig("Test",mockMailContext); + FakeMailContext FakeMailContext = new FakeMailContext(); + FakeMailContext.getServerInfo(); + FakeMailetConfig mci = new FakeMailetConfig("Test",FakeMailContext); mci.setProperty("signatureTemplate","v=1; s=selector; d=example.com; h=from:to:received:received; a=rsa-sha256; bh=; b=;"); mci.setProperty("privateKey","MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBANgNpgpfPBVjCpZsuGa4nrppMA3zCYNH6t8cTwd+eRI5rHSgihMznOq5mtMujfTzvRgx9jPHB8HqP83PdB3CtQP+3RgxgmJQrJYmcIp9lcckEn7J9Eevuhb5RbdxWj0IbZsF8jGwifBh7XvmD1SPKe0mla56p0QijVzZuG/0ynrpAgMBAAECgYEAjxdzCdmLRKrk3z3AX6AU2GdEQWjeuwkNoJjyKod0DkMOWevdptv/KGKnDQj/UeWALp8gbah7Fc5cVaX5RKCpG3WRO32NeFUUTGDyY2SjZR6UDAW2yXwJGNVxhA5x514f9Yz+ZeODbBSqpl6cGaUqUPq81vvSMUl5VoMn/ufuPwECQQD02QfYPhmCP8g4BVhxxlgfvj5WA7R7tWRSNCT3C0naPpwaono9+PSuhUgxRbOgFvxh8StHyXomdVBt/LzeAl6JAkEA4eTejDsmMCfxe47JnHbgpxNphYpSQBB9FZgMUU5hAXgpX3EtIS3JxjSSOx3EYoO51ZywBOWUXNcMJAXoNM0hYQJAQDnZ4/BOMqtWctN8IsQbg6Acq+Vm53hqa2HAPIlagwQfYKE0HaN7U3gkusAE4T6GT466gqcoAoSNZ3x/cmD+uQJAePyZCaiAephaKSA/8VJmXnXyNXjxNqjeJduq9T0yjZPrLNg0IKoigMsVax41WcJNnRBv4h+IR/VR5lVXmjgn4QJANq02dLdX2phQqOP+Ss1EP9TT7t6HxLbKUuoPdGVKf0q1gZEyAC1Re2I4SLMEfpt3+ivMj1X2zDzIHP5mogfblA=="); - Mail mail = new MockMail(); + Mail mail = new FakeMail(); mail.setMessage(mm); Mailet mailet = new DKIMSign(); @@ -140,8 +140,8 @@ mail.getMessage().writeTo(rawMessage); String res = rawMessage.toString(); - MockPublicKeyRecordRetriever mockPublicKeyRecordRetriever = new MockPublicKeyRecordRetriever("v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYDaYKXzwVYwqWbLhmuJ66aTAN8wmDR+rfHE8HfnkSOax0oIoTM5zquZrTLo30870YMfYzxwfB6j/Nz3QdwrUD/t0YMYJiUKyWJnCKfZXHJBJ+yfRHr7oW+UW3cVo9CG2bBfIxsInwYe175g9UjyntJpWueqdEIo1c2bhv9Mp66QIDAQAB;", "selector", "example.com"); - new DKIMVerifier(mockPublicKeyRecordRetriever).verify(new ByteArrayInputStream(res.getBytes())); + MockPublicKeyRecordRetriever MockPublicKeyRecordRetriever = new MockPublicKeyRecordRetriever("v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYDaYKXzwVYwqWbLhmuJ66aTAN8wmDR+rfHE8HfnkSOax0oIoTM5zquZrTLo30870YMfYzxwfB6j/Nz3QdwrUD/t0YMYJiUKyWJnCKfZXHJBJ+yfRHr7oW+UW3cVo9CG2bBfIxsInwYe175g9UjyntJpWueqdEIo1c2bhv9Mp66QIDAQAB;", "selector", "example.com"); + new DKIMVerifier(MockPublicKeyRecordRetriever).verify(new ByteArrayInputStream(res.getBytes())); } public void testDKIMSignMessageAsObjectNotConverted() throws MessagingException, IOException, FailException { @@ -152,14 +152,14 @@ mm.setHeader("Content-Transfer-Encoding", "8bit"); mm.saveChanges(); - MockMailContext mockMailContext = new MockMailContext(); - mockMailContext.getServerInfo(); - MockMailetConfig mci = new MockMailetConfig("Test",mockMailContext); + FakeMailContext FakeMailContext = new FakeMailContext(); + FakeMailContext.getServerInfo(); + FakeMailetConfig mci = new FakeMailetConfig("Test",FakeMailContext); mci.setProperty("signatureTemplate","v=1; s=selector; d=example.com; h=from:to:received:received; a=rsa-sha256; bh=; b=;"); mci.setProperty("privateKey","MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBANgNpgpfPBVjCpZsuGa4nrppMA3zCYNH6t8cTwd+eRI5rHSgihMznOq5mtMujfTzvRgx9jPHB8HqP83PdB3CtQP+3RgxgmJQrJYmcIp9lcckEn7J9Eevuhb5RbdxWj0IbZsF8jGwifBh7XvmD1SPKe0mla56p0QijVzZuG/0ynrpAgMBAAECgYEAjxdzCdmLRKrk3z3AX6AU2GdEQWjeuwkNoJjyKod0DkMOWevdptv/KGKnDQj/UeWALp8gbah7Fc5cVaX5RKCpG3WRO32NeFUUTGDyY2SjZR6UDAW2yXwJGNVxhA5x514f9Yz+ZeODbBSqpl6cGaUqUPq81vvSMUl5VoMn/ufuPwECQQD02QfYPhmCP8g4BVhxxlgfvj5WA7R7tWRSNCT3C0naPpwaono9+PSuhUgxRbOgFvxh8StHyXomdVBt/LzeAl6JAkEA4eTejDsmMCfxe47JnHbgpxNphYpSQBB9FZgMUU5hAXgpX3EtIS3JxjSSOx3EYoO51ZywBOWUXNcMJAXoNM0hYQJAQDnZ4/BOMqtWctN8IsQbg6Acq+Vm53hqa2HAPIlagwQfYKE0HaN7U3gkusAE4T6GT466gqcoAoSNZ3x/cmD+uQJAePyZCaiAephaKSA/8VJmXnXyNXjxNqjeJduq9T0yjZPrLNg0IKoigMsVax41WcJNnRBv4h+IR/VR5lVXmjgn4QJANq02dLdX2phQqOP+Ss1EP9TT7t6HxLbKUuoPdGVKf0q1gZEyAC1Re2I4SLMEfpt3+ivMj1X2zDzIHP5mogfblA=="); - Mail mail = new MockMail(); + Mail mail = new FakeMail(); mail.setMessage(mm); Mailet mailet = new DKIMSign(); @@ -177,9 +177,9 @@ mail.getMessage().writeTo(rawMessage); String res = rawMessage.toString(); - MockPublicKeyRecordRetriever mockPublicKeyRecordRetriever = new MockPublicKeyRecordRetriever("v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYDaYKXzwVYwqWbLhmuJ66aTAN8wmDR+rfHE8HfnkSOax0oIoTM5zquZrTLo30870YMfYzxwfB6j/Nz3QdwrUD/t0YMYJiUKyWJnCKfZXHJBJ+yfRHr7oW+UW3cVo9CG2bBfIxsInwYe175g9UjyntJpWueqdEIo1c2bhv9Mp66QIDAQAB;", "selector", "example.com"); + MockPublicKeyRecordRetriever MockPublicKeyRecordRetriever = new MockPublicKeyRecordRetriever("v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYDaYKXzwVYwqWbLhmuJ66aTAN8wmDR+rfHE8HfnkSOax0oIoTM5zquZrTLo30870YMfYzxwfB6j/Nz3QdwrUD/t0YMYJiUKyWJnCKfZXHJBJ+yfRHr7oW+UW3cVo9CG2bBfIxsInwYe175g9UjyntJpWueqdEIo1c2bhv9Mp66QIDAQAB;", "selector", "example.com"); try { - new DKIMVerifier(mockPublicKeyRecordRetriever).verify(new ByteArrayInputStream(res.getBytes())); + new DKIMVerifier(MockPublicKeyRecordRetriever).verify(new ByteArrayInputStream(res.getBytes())); fail("Expected PermFail"); } catch (PermFailException e) { Modified: james/jdkim/trunk/main/pom.xml URL: http://svn.apache.org/viewvc/james/jdkim/trunk/main/pom.xml?rev=823108&r1=823107&r2=823108&view=diff ============================================================================== --- james/jdkim/trunk/main/pom.xml (original) +++ james/jdkim/trunk/main/pom.xml Thu Oct 8 09:59:04 2009 @@ -75,25 +75,25 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.3</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-mailet-base</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> </dependency> <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-mailet-base</artifactId> <scope>test</scope> <classifier>tests</classifier> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> </dependency> <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-mailet</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </dependency> <dependency> Modified: james/jdkim/trunk/stage/pom.xml URL: http://svn.apache.org/viewvc/james/jdkim/trunk/stage/pom.xml?rev=823108&r1=823107&r2=823108&view=diff ============================================================================== --- james/jdkim/trunk/stage/pom.xml (original) +++ james/jdkim/trunk/stage/pom.xml Thu Oct 8 09:59:04 2009 @@ -49,7 +49,7 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.3</version> + <version>1.4</version> </dependency> <dependency> <groupId>javax.activation</groupId> @@ -59,43 +59,43 @@ <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-mailet</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </dependency> <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-mailet-base</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> </dependency> <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-mailet-base</artifactId> <classifier>tests</classifier> <scope>test</scope> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> </dependency> <dependency> <groupId>org.apache.james</groupId> <artifactId>james-parent</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> <type>pom</type> </dependency> <dependency> <groupId>org.apache.james</groupId> <artifactId>james-project</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> <type>pom</type> </dependency> <dependency> <groupId>org.apache.james</groupId> <artifactId>james-parent</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> <type>xml</type> <classifier>site</classifier> </dependency> <dependency> <groupId>org.apache.james</groupId> <artifactId>james-project</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> <type>xml</type> <classifier>site</classifier> </dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org