upd: rename package name and all references to it

[gigi.git] / tests / club / wpia / gigi / email / TestSendmail.java

diff --git a/tests/org/cacert/gigi/email/TestSendmail.java b/tests/club/wpia/gigi/email/TestSendmail.java
similarity index 93%
rename from tests/org/cacert/gigi/email/TestSendmail.java
rename to tests/club/wpia/gigi/email/TestSendmail.java
index d9af0a28f62e6fceaaefb998afc3466243cc6c5c..9f3358b95e077d411cd6fea845606ceed121efeb 100644 (file)
--- a/tests/org/cacert/gigi/email/TestSendmail.java
+++ b/tests/club/wpia/gigi/email/TestSendmail.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi.email;
+package club.wpia.gigi.email;

 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;


@@ -25,10 +25,10 @@ import java.util.Random;
 
 import javax.net.ssl.SSLSocketFactory;
 
 
 import javax.net.ssl.SSLSocketFactory;
 

-import org.cacert.gigi.testUtils.ConfiguredTest;
-import org.cacert.gigi.util.ServerConstants;

 import org.junit.Test;
 
 import org.junit.Test;
 

+import club.wpia.gigi.testUtils.ConfiguredTest;
+import club.wpia.gigi.util.ServerConstants;

 import sun.security.x509.AlgorithmId;
 import sun.security.x509.CertificateAlgorithmId;
 import sun.security.x509.CertificateSerialNumber;
 import sun.security.x509.AlgorithmId;
 import sun.security.x509.CertificateAlgorithmId;
 import sun.security.x509.CertificateSerialNumber;


@@ -55,7 +55,7 @@ public class TestSendmail extends ConfiguredTest {
 
         String subj = "subj-" + createUniqueName();
         String msg = "msg-" + createUniqueName();
 
         String subj = "subj-" + createUniqueName();
         String msg = "msg-" + createUniqueName();

-        EmailProvider.getInstance().sendMail(succmail, subj, msg, "system@cacert.org", "Testtarget", "Testsender", null, false);
+        EmailProvider.getInstance().sendMail(succmail, subj, msg, "system@wpia.club", "Testtarget", "Testsender", null, false);

 
         try (Socket s = SSLSocketFactory.getDefault().createSocket(imap, 993);//
                 PrintWriter pw = new PrintWriter(new OutputStreamWriter(s.getOutputStream(), "UTF-8"), true);//
 
         try (Socket s = SSLSocketFactory.getDefault().createSocket(imap, 993);//
                 PrintWriter pw = new PrintWriter(new OutputStreamWriter(s.getOutputStream(), "UTF-8"), true);//


@@ -86,7 +86,7 @@ public class TestSendmail extends ConfiguredTest {
             pw.println("log logout");
             imapUntil(br, "log");
             assertThat(body, containsString("From: " + ServerConstants.getSupportMailAddress()));
             pw.println("log logout");
             imapUntil(br, "log");
             assertThat(body, containsString("From: " + ServerConstants.getSupportMailAddress()));

-            assertThat(body, containsString("To: gigi-testuser@dogcraft.de"));
+            assertThat(body, containsString("To: " + succmail));

             assertThat(body, containsString("Subject: " + subj));
             assertThat(body, containsString(Base64.getEncoder().encodeToString(msg.getBytes("UTF-8"))));
 
             assertThat(body, containsString("Subject: " + subj));
             assertThat(body, containsString(Base64.getEncoder().encodeToString(msg.getBytes("UTF-8"))));
 


@@ -110,7 +110,7 @@ public class TestSendmail extends ConfiguredTest {
     private void initSelfsign() throws GeneralSecurityException, CertificateException, IOException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException {
         assumeNotNull(getTestProps().getProperty("emailProvider.smtpHost"), getTestProps().getProperty("emailProvider.smtpPort"));
         Properties prop = new Properties();
     private void initSelfsign() throws GeneralSecurityException, CertificateException, IOException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException {
         assumeNotNull(getTestProps().getProperty("emailProvider.smtpHost"), getTestProps().getProperty("emailProvider.smtpPort"));
         Properties prop = new Properties();

-        prop.setProperty("emailProvider", "org.cacert.gigi.email.SendMail");
+        prop.setProperty("emailProvider", "club.wpia.gigi.email.SendMail");

         prop.setProperty("emailProvider.smtpHost", getTestProps().getProperty("emailProvider.smtpHost"));
         prop.setProperty("emailProvider.smtpPort", getTestProps().getProperty("emailProvider.smtpPort"));
         KeyPair kp = generateKeypair();
         prop.setProperty("emailProvider.smtpHost", getTestProps().getProperty("emailProvider.smtpHost"));
         prop.setProperty("emailProvider.smtpPort", getTestProps().getProperty("emailProvider.smtpPort"));
         KeyPair kp = generateKeypair();


@@ -120,7 +120,7 @@ public class TestSendmail extends ConfiguredTest {
         info.set(X509CertInfo.SERIAL_NUMBER, new CertificateSerialNumber(rng.nextInt() & 0x7fffffff));
         AlgorithmId algID = AlgorithmId.get("SHA256WithRSA");
         info.set(X509CertInfo.ALGORITHM_ID, new CertificateAlgorithmId(algID));
         info.set(X509CertInfo.SERIAL_NUMBER, new CertificateSerialNumber(rng.nextInt() & 0x7fffffff));
         AlgorithmId algID = AlgorithmId.get("SHA256WithRSA");
         info.set(X509CertInfo.ALGORITHM_ID, new CertificateAlgorithmId(algID));

-        info.set(X509CertInfo.SUBJECT, new X500Name("EMAIL=system@cacert.org"));
+        info.set(X509CertInfo.SUBJECT, new X500Name("EMAIL=system@wpia.club"));

         info.set(X509CertInfo.KEY, new CertificateX509Key(kp.getPublic()));
         info.set(X509CertInfo.VALIDITY, new CertificateValidity(new Date(System.currentTimeMillis()), new Date(System.currentTimeMillis() + 60 * 60 * 1000)));
         info.set(X509CertInfo.ISSUER, new X500Name("CN=test-issue"));
         info.set(X509CertInfo.KEY, new CertificateX509Key(kp.getPublic()));
         info.set(X509CertInfo.VALIDITY, new CertificateValidity(new Date(System.currentTimeMillis()), new Date(System.currentTimeMillis() + 60 * 60 * 1000)));
         info.set(X509CertInfo.ISSUER, new X500Name("CN=test-issue"));