Repository: james-jdkim Updated Branches: refs/heads/master b75471999 -> 82a37d5e8
JAMES-1831 JDKIM should compile and pass tests Project: http://git-wip-us.apache.org/repos/asf/james-jdkim/repo Commit: http://git-wip-us.apache.org/repos/asf/james-jdkim/commit/2f58682a Tree: http://git-wip-us.apache.org/repos/asf/james-jdkim/tree/2f58682a Diff: http://git-wip-us.apache.org/repos/asf/james-jdkim/diff/2f58682a Branch: refs/heads/master Commit: 2f58682a1eb3adc283294a648bcffa6dd8290ede Parents: b754719 Author: benwa <[email protected]> Authored: Thu Oct 6 15:42:56 2016 +0200 Committer: benwa <[email protected]> Committed: Fri Oct 7 10:39:42 2016 +0200 ---------------------------------------------------------------------- .../james/jdkim/mailets/DKIMSignTest.java | 53 +++++++++++--------- .../james/jdkim/mailets/DKIMVerifyTest.java | 10 ++-- pom.xml | 4 +- 3 files changed, 35 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-jdkim/blob/2f58682a/mailets/src/test/java/org/apache/james/jdkim/mailets/DKIMSignTest.java ---------------------------------------------------------------------- diff --git a/mailets/src/test/java/org/apache/james/jdkim/mailets/DKIMSignTest.java b/mailets/src/test/java/org/apache/james/jdkim/mailets/DKIMSignTest.java index fdc6138..41297be 100644 --- a/mailets/src/test/java/org/apache/james/jdkim/mailets/DKIMSignTest.java +++ b/mailets/src/test/java/org/apache/james/jdkim/mailets/DKIMSignTest.java @@ -63,7 +63,7 @@ public class DKIMSignTest { "b+IfiEf1UeZVV5o4J+ECQDatNnS3V9qYUKjj/krNRD/U0+7eh8S2ylLqD3RlSn9K\r\n" + "tYGRMgAtUXtiOEizBH6bd/orzI9V9sw8yBz+ZqIH25Q=\r\n" + "-----END RSA PRIVATE KEY-----\r\n"; - // "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBANgNpgpfPBVjCpZsuGa4nrppMA3zCYNH6t8cTwd+eRI5rHSgihMznOq5mtMujfTzvRgx9jPHB8HqP83PdB3CtQP+3RgxgmJQrJYmcIp9lcckEn7J9Eevuhb5RbdxWj0IbZsF8jGwifBh7XvmD1SPKe0mla56p0QijVzZuG/0ynrpAgMBAAECgYEAjxdzCdmLRKrk3z3AX6AU2GdEQWjeuwkNoJjyKod0DkMOWevdptv/KGKnDQj/UeWALp8gbah7Fc5cVaX5RKCpG3WRO32NeFUUTGDyY2SjZR6UDAW2yXwJGNVxhA5x514f9Yz+ZeODbBSqpl6cGaUqUPq81vvSMUl5VoMn/ufuPwECQQD02QfYPhmCP8g4BVhxxlgfvj5WA7R7tWRSNCT3C0naPpwaono9+PSuhUgxRbOgFvxh8StHyXomdVBt/LzeAl6JAkEA4eTejDsmMCfxe47JnHbgpxNphYpSQBB9FZgMUU5hAXgpX3EtIS3JxjSSOx3EYoO51ZywBOWUXNcMJAXoNM0hYQJAQDnZ4/BOMqtWctN8IsQbg6Acq+Vm53hqa2HAPIlagwQfYKE0HaN7U3gkusAE4T6GT466gqcoAoSNZ3x/cmD+uQJAePyZCaiAephaKSA/8VJmXnXyNXjxNqjeJduq9T0yjZPrLNg0IKoigMsVax41WcJNnRBv4h+IR/VR5lVXmjgn4QJANq02dLdX2phQqOP+Ss1EP9TT7t6HxLbKUuoPdGVKf0q1gZEyAC1Re2I4SLMEfpt3+ivMj1X2zDzIHP5mogfblA=="); + private static final FakeMailContext FAKE_MAIL_CONTEXT = FakeMailContext.defaultContext(); @Test public void testDKIMSign() throws MessagingException, IOException, @@ -73,7 +73,7 @@ public class DKIMSignTest { Mailet mailet = new DKIMSign(); FakeMailetConfig mci = new FakeMailetConfig("Test", - new FakeMailContext()); + FAKE_MAIL_CONTEXT); mci .setProperty( "signatureTemplate", @@ -82,10 +82,11 @@ public class DKIMSignTest { mailet.init(mci); - Mail mail = new FakeMail(); - mail.setMessage(new MimeMessage(Session + Mail mail = FakeMail.builder() + .mimeMessage(new MimeMessage(Session .getDefaultInstance(new Properties()), - new ByteArrayInputStream(message.getBytes()))); + new ByteArrayInputStream(message.getBytes()))) + .build(); mailet.service(mail); @@ -118,18 +119,18 @@ public class DKIMSignTest { Mailet mailet = new DKIMSign(); - FakeMailetConfig mci = new FakeMailetConfig("Test", - new FakeMailContext()); + FakeMailetConfig mci = new FakeMailetConfig("Test", FAKE_MAIL_CONTEXT); mci.setProperty("signatureTemplate", "v=1; t=" + ((System.currentTimeMillis() / 1000) + 1000) + "; s=selector; d=example.com; h=from:to:received:received; a=rsa-sha256; bh=; b=;"); mci.setProperty("privateKey", TESTING_PEM); mailet.init(mci); - Mail mail = new FakeMail(); - mail.setMessage(new MimeMessage(Session + Mail mail = FakeMail.builder() + .mimeMessage(new MimeMessage(Session .getDefaultInstance(new Properties()), - new ByteArrayInputStream(message.getBytes()))); + new ByteArrayInputStream(message.getBytes()))) + .build(); mailet.service(mail); @@ -159,8 +160,7 @@ public class DKIMSignTest { Mailet mailet = new DKIMSign(); - FakeMailetConfig mci = new FakeMailetConfig("Test", - new FakeMailContext()); + FakeMailetConfig mci = new FakeMailetConfig("Test", FAKE_MAIL_CONTEXT); mci .setProperty( "signatureTemplate", @@ -169,10 +169,11 @@ public class DKIMSignTest { mailet.init(mci); - Mail mail = new FakeMail(); - mail.setMessage(new MimeMessage(Session + Mail mail = FakeMail.builder() + .mimeMessage(new MimeMessage(Session .getDefaultInstance(new Properties()), - new ByteArrayInputStream(message.getBytes()))); + new ByteArrayInputStream(message.getBytes()))) + .build(); mailet.service(mail); @@ -209,8 +210,7 @@ public class DKIMSignTest { Mailet mailet = new DKIMSign(); - FakeMailetConfig mci = new FakeMailetConfig("Test", - new FakeMailContext()); + FakeMailetConfig mci = new FakeMailetConfig("Test", FAKE_MAIL_CONTEXT); mci .setProperty( "signatureTemplate", @@ -222,8 +222,9 @@ public class DKIMSignTest { mailet.init(mci); - Mail mail = new FakeMail(); - mail.setMessage(mm); + Mail mail = FakeMail.builder() + .mimeMessage(mm) + .build(); Mailet m7bit = new ConvertTo7Bit(); m7bit.init(mci); @@ -254,7 +255,7 @@ public class DKIMSignTest { mm.setHeader("Content-Transfer-Encoding", "8bit"); mm.saveChanges(); - FakeMailContext FakeMailContext = new FakeMailContext(); + FakeMailContext FakeMailContext = FAKE_MAIL_CONTEXT; FakeMailContext.getServerInfo(); FakeMailetConfig mci = new FakeMailetConfig("Test", FakeMailContext); mci.setProperty( @@ -264,8 +265,9 @@ public class DKIMSignTest { "privateKey", TESTING_PEM); - Mail mail = new FakeMail(); - mail.setMessage(mm); + Mail mail = FakeMail.builder() + .mimeMessage(mm) + .build(); Mailet mailet = new DKIMSign(); mailet.init(mci); @@ -299,7 +301,7 @@ public class DKIMSignTest { mm.setHeader("Content-Transfer-Encoding", "8bit"); mm.saveChanges(); - FakeMailContext FakeMailContext = new FakeMailContext(); + FakeMailContext FakeMailContext = FAKE_MAIL_CONTEXT; FakeMailContext.getServerInfo(); FakeMailetConfig mci = new FakeMailetConfig("Test", FakeMailContext); mci.setProperty( @@ -309,8 +311,9 @@ public class DKIMSignTest { "privateKey", TESTING_PEM); - Mail mail = new FakeMail(); - mail.setMessage(mm); + Mail mail = FakeMail.builder() + .mimeMessage(mm) + .build(); Mailet mailet = new DKIMSign(); mailet.init(mci); http://git-wip-us.apache.org/repos/asf/james-jdkim/blob/2f58682a/mailets/src/test/java/org/apache/james/jdkim/mailets/DKIMVerifyTest.java ---------------------------------------------------------------------- diff --git a/mailets/src/test/java/org/apache/james/jdkim/mailets/DKIMVerifyTest.java b/mailets/src/test/java/org/apache/james/jdkim/mailets/DKIMVerifyTest.java index 7612bd4..7e708d4 100644 --- a/mailets/src/test/java/org/apache/james/jdkim/mailets/DKIMVerifyTest.java +++ b/mailets/src/test/java/org/apache/james/jdkim/mailets/DKIMVerifyTest.java @@ -109,15 +109,15 @@ public class DKIMVerifyTest { }; - FakeMailetConfig mci = new FakeMailetConfig("Test", - new FakeMailContext()); + FakeMailetConfig mci = new FakeMailetConfig("Test", FakeMailContext.defaultContext()); mailet.init(mci); - Mail mail = new FakeMail(); - mail.setMessage(new MimeMessage(Session + Mail mail = FakeMail.builder() + .mimeMessage(new MimeMessage(Session .getDefaultInstance(new Properties()), - new ByteArrayInputStream(message.getBytes()))); + new ByteArrayInputStream(message.getBytes()))) + .build(); mailet.service(mail); return mail; http://git-wip-us.apache.org/repos/asf/james-jdkim/blob/2f58682a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2eacb8b..49cc1f8 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.james</groupId> <artifactId>james-project</artifactId> - <version>1.8.3-SNAPSHOT</version> + <version>3.0.0-beta5-SNAPSHOT</version> </parent> <groupId>org.apache.james.jdkim</groupId> @@ -66,7 +66,7 @@ <geronimo-javamail.version>1.8.3</geronimo-javamail.version> <commons-codec.version>1.7</commons-codec.version> <commons-logging.version>1.1.1</commons-logging.version> - <apache-mailet.version>2.5.1-SNAPSHOT</apache-mailet.version> + <apache-mailet.version>3.0.0-beta5-SNAPSHOT</apache-mailet.version> <dnsjava.version>2.1.1</dnsjava.version> <not-yet-commons-ssl.version>0.3.11</not-yet-commons-ssl.version> <apache-mime4j.version>0.8.0-SNAPSHOT</apache-mime4j.version> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
