youys
/
ant
Not watched
1
0
Fork 1
Code
Releases 0 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

Merge branch '1.9.x'

master
Stefan Bodewig 7 years ago
parent
1c5a92fb1f 608b65a3e3
commit
cf6965b58b
2 changed files with 48 additions and 51 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +16
    -8
      src/tests/junit/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java
  2. +32
    -43
      src/tests/junit/org/apache/tools/mail/MailMessageTest.java

+ 16
- 8
src/tests/junit/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java View File

@@ -71,16 +71,24 @@ public class TranslateTest {

@SuppressWarnings("resource")
FileInputStream fis1 = new FileInputStream(file1);
@SuppressWarnings("resource")
FileInputStream fis2 = new FileInputStream(file2);
int read = 0;
while ((read = fis1.read(buffer1)) != -1) {
fis2.read(buffer2);
for (int i = 0; i < read; ++i) {
if (buffer1[i] != buffer2[i]) {
return false;
try {
@SuppressWarnings("resource")
FileInputStream fis2 = new FileInputStream(file2);
try {
int read = 0;
while ((read = fis1.read(buffer1)) != -1) {
fis2.read(buffer2);
for (int i = 0; i < read; ++i) {
if (buffer1[i] != buffer2[i]) {
return false;
}
}
}
} finally {
fis2.close();
}
} finally {
fis1.close();
}
return true;
}


+ 32
- 43
src/tests/junit/org/apache/tools/mail/MailMessageTest.java View File

@@ -69,12 +69,12 @@ public class MailMessageTest {
*/
@Test
public void testAPIExample() throws InterruptedException {
ServerThread testMailServer = new ServerThread();
final int port = TEST_PORT + 1;
ServerThread testMailServer = new ServerThread(port);
Thread server = new Thread(testMailServer);
server.start();

ClientThread testMailClient = new ClientThread();
ClientThread testMailClient = new ClientThread(port);

testMailClient.from("Mail Message <EmailTaskTest@ant.apache.org>");
testMailClient.to("to@you.com");
@@ -120,24 +120,6 @@ public class MailMessageTest {
"250\r\n" +
"QUIT\r\n" +
"221\r\n";
/*for (int icounter = 0; icounter<expectedResult.length(); icounter++) {
if (icounter < result.length()) {
if (expectedResult.charAt(icounter) != result.charAt(icounter)) {
System.out.println("posit " + icounter + " expected "
+ expectedResult.charAt(icounter)
+ " result " + result.charAt(icounter));
}
}
}
if (expectedResult.length()>result.length()) {
System.out.println("excedent of expected result "
+ expectedResult.substring(result.length()));
}
if (expectedResult.length()<result.length()) {
System.out.println("excedent of result "
+ result.substring(expectedResult.length()));
}*/
assertEquals(expectedResult.length(), result.length());
assertEquals(expectedResult, result); // order of headers cannot be guaranteed
assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed());
}
@@ -148,11 +130,12 @@ public class MailMessageTest {
*/
@Test
public void testToOnly() throws InterruptedException {
ServerThread testMailServer = new ServerThread();
final int port = TEST_PORT + 2;
ServerThread testMailServer = new ServerThread(port);
Thread server = new Thread(testMailServer);
server.start();

ClientThread testMailClient = new ClientThread();
ClientThread testMailClient = new ClientThread(port);

testMailClient.from("Mail Message <EmailTaskTest@ant.apache.org>");
testMailClient.to("to@you.com");
@@ -188,7 +171,6 @@ public class MailMessageTest {
"250\r\n" +
"QUIT\r\n" +
"221\r\n";
assertEquals(expectedResult.length(), result.length());
assertEquals(expectedResult, result); // order of headers cannot be guaranteed
assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed());
}
@@ -200,11 +182,12 @@ public class MailMessageTest {
*/
@Test
public void testCcOnly() throws InterruptedException {
ServerThread testMailServer = new ServerThread();
final int port = TEST_PORT + 3;
ServerThread testMailServer = new ServerThread(port);
Thread server = new Thread(testMailServer);
server.start();

ClientThread testMailClient = new ClientThread();
ClientThread testMailClient = new ClientThread(port);

testMailClient.from("Mail Message <EmailTaskTest@ant.apache.org>");
testMailClient.cc("cc@you.com");
@@ -240,7 +223,6 @@ public class MailMessageTest {
"250\r\n" +
"QUIT\r\n" +
"221\r\n";
assertEquals(expectedResult.length(), result.length());
assertEquals(expectedResult, result);
assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed());
}
@@ -252,11 +234,12 @@ public class MailMessageTest {
*/
@Test
public void testBccOnly() throws InterruptedException {
ServerThread testMailServer = new ServerThread();
final int port = TEST_PORT + 4;
ServerThread testMailServer = new ServerThread(port);
Thread server = new Thread(testMailServer);
server.start();

ClientThread testMailClient = new ClientThread();
ClientThread testMailClient = new ClientThread(port);

testMailClient.from("Mail Message <EmailTaskTest@ant.apache.org>");
testMailClient.bcc("bcc@you.com");
@@ -291,7 +274,6 @@ public class MailMessageTest {
"250\r\n" +
"QUIT\r\n" +
"221\r\n";
assertEquals(expectedResult.length(), result.length());
assertEquals(expectedResult, result);
assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed());
}
@@ -304,11 +286,12 @@ public class MailMessageTest {
*/
@Test
public void testNoSubject() throws InterruptedException {
ServerThread testMailServer = new ServerThread();
final int port = TEST_PORT + 5;
ServerThread testMailServer = new ServerThread(port);
Thread server = new Thread(testMailServer);
server.start();

ClientThread testMailClient = new ClientThread();
ClientThread testMailClient = new ClientThread(port);

testMailClient.from("Mail Message <EmailTaskTest@ant.apache.org>");
testMailClient.to("to@you.com");
@@ -342,7 +325,6 @@ public class MailMessageTest {
"250\r\n" +
"QUIT\r\n" +
"221\r\n";
assertEquals(expectedResult.length(), result.length());
assertEquals(expectedResult, result);
assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed());
}
@@ -354,11 +336,12 @@ public class MailMessageTest {
*/
@Test
public void testEmptyBody() throws InterruptedException {
ServerThread testMailServer = new ServerThread();
final int port = TEST_PORT + 6;
ServerThread testMailServer = new ServerThread(port);
Thread server = new Thread(testMailServer);
server.start();

ClientThread testMailClient = new ClientThread();
ClientThread testMailClient = new ClientThread(port);

testMailClient.from("Mail Message <EmailTaskTest@ant.apache.org>");
testMailClient.to("to@you.com");
@@ -392,7 +375,6 @@ public class MailMessageTest {
"250\r\n" +
"QUIT\r\n" +
"221\r\n";
assertEquals(expectedResult.length(), result.length());
assertEquals(expectedResult, result);
assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed());
}
@@ -406,12 +388,12 @@ public class MailMessageTest {
*/
@Test
public void testAsciiCharset() throws InterruptedException {
ServerThread testMailServer = new ServerThread();
final int port = TEST_PORT + 7;
ServerThread testMailServer = new ServerThread(port);
Thread server = new Thread(testMailServer);
server.start();

ClientThread testMailClient = new ClientThread();
ClientThread testMailClient = new ClientThread(port);

testMailClient.from("Mail Message <EmailTaskTest@ant.apache.org>");
testMailClient.to("Ceki G\u00fclc\u00fc <abuse@mail-abuse.org>");
@@ -453,8 +435,6 @@ public class MailMessageTest {
bos1.print(expectedResult);
bos2.print(result);

assertEquals("expected message length != actual message length "
+ "in testAsciiCharset()", expectedResult.length(), result.length());
assertEquals("baos1 and baos2 should be the same in testAsciiCharset()",
baos1.toString(), baos2.toString()); // order of headers cannot be guaranteed
assertFalse(testMailClient.getFailMessage(), testMailClient.isFailed());
@@ -466,6 +446,7 @@ public class MailMessageTest {
*/
private class ServerThread implements Runnable {

private final int port;
private StringBuilder sb = null;
private boolean loop = false;
ServerSocket ssock = null;
@@ -474,10 +455,14 @@ public class MailMessageTest {
BufferedReader in = null;
private boolean data = false; // state engine: false=envelope, true=message

ServerThread(int port) {
this.port = port;
}

public void run() {

try {
ssock = new ServerSocket(TEST_PORT);
ssock = new ServerSocket(port);
sock = ssock.accept(); // wait for connection
in = new BufferedReader(new InputStreamReader(
sock.getInputStream()));
@@ -582,6 +567,7 @@ public class MailMessageTest {
*/
private class ClientThread implements Runnable {

private final int port;
private MailMessage msg;
private boolean fail = false;
private String failMessage = null;
@@ -595,11 +581,14 @@ public class MailMessageTest {
protected Vector ccList = new Vector();
protected Vector bccList = new Vector();

ClientThread(int port) {
this.port = port;
}

public void run() {
for (int i = 9; i > 0; i--) {
try {
msg = new MailMessage("localhost", TEST_PORT);
msg = new MailMessage("localhost", port);
} catch (java.net.ConnectException ce) {
try {
Thread.sleep(10 * 1000);


Write Preview
Loading…
Cancel
Save
Please read the following content carefully:

Dear OpenI User

Thank you for your continuous support to the Openl Qizhi Community AI Collaboration Platform. In order to protect your usage rights and ensure network security, we updated the Openl Qizhi Community AI Collaboration Platform Usage Agreement in January 2024. The updated agreement specifies that users are prohibited from using intranet penetration tools. After you click "Agree and continue", you can continue to use our services. Thank you for your cooperation and understanding.

For more agreement content, please refer to the《Openl Qizhi Community AI Collaboration Platform Usage Agreement》

Agree and continue
Disagree, exit