Author: norman
Date: Mon Apr 11 05:32:52 2011
New Revision: 1090937
URL: http://svn.apache.org/viewvc?rev=1090937&view=rev
Log:
Fix SearchCommandParserTests to reflect rfc3501
Modified:
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
Modified:
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java?rev=1090937&r1=1090936&r2=1090937&view=diff
==============================================================================
---
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
(original)
+++
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
Mon Apr 11 05:32:52 2011
@@ -25,6 +25,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.apache.james.imap.api.ImapCommand;
@@ -71,16 +72,16 @@ public class SearchCommandParserAndParen
}
public static Input sequence() {
- IdRange[] range = { new IdRange(Long.MIN_VALUE, 100), new IdRange(110),
+ IdRange[] range = { new IdRange(100, Long.MAX_VALUE), new IdRange(110),
new IdRange(200, 201), new IdRange(400, Long.MAX_VALUE) };
- SearchKey key = SearchKey.buildSequenceSet(range);
+ SearchKey key =
SearchKey.buildSequenceSet(IdRange.mergeRanges(Arrays.asList(range)).toArray(new
IdRange[0]));
return new Input("*:100,110,200:201,400:*", key);
}
public static Input uid() {
- IdRange[] range = { new IdRange(Long.MIN_VALUE, 100), new IdRange(110),
+ IdRange[] range = { new IdRange(100, Long.MAX_VALUE), new IdRange(110),
new IdRange(200, 201), new IdRange(400, Long.MAX_VALUE) };
- SearchKey key = SearchKey.buildUidSet(range);
+ SearchKey key =
SearchKey.buildUidSet(IdRange.mergeRanges(Arrays.asList(range)).toArray(new
IdRange[0]));
return new Input("UID *:100,110,200:201,400:*", key);
}
Modified:
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java?rev=1090937&r1=1090936&r2=1090937&view=diff
==============================================================================
---
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
(original)
+++
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
Mon Apr 11 05:32:52 2011
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertEqu
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.util.Arrays;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
@@ -58,18 +59,18 @@ public class SearchCommandParserNotTest
@Test
public void testShouldParseNotSequence() throws Exception {
- IdRange[] range = { new IdRange(Long.MIN_VALUE, 100), new IdRange(110),
+ IdRange[] range = { new IdRange(100, Long.MAX_VALUE), new IdRange(110),
new IdRange(200, 201), new IdRange(400, Long.MAX_VALUE) };
- SearchKey notdKey = SearchKey.buildSequenceSet(range);
+ SearchKey notdKey =
SearchKey.buildSequenceSet(IdRange.mergeRanges(Arrays.asList(range)).toArray(new
IdRange[0]));
SearchKey key = SearchKey.buildNot(notdKey);
checkValid("NOT *:100,110,200:201,400:*\r\n", key);
}
@Test
public void testShouldParseNotUid() throws Exception {
- IdRange[] range = { new IdRange(Long.MIN_VALUE, 100), new IdRange(110),
+ IdRange[] range = { new IdRange(100, Long.MAX_VALUE), new IdRange(110),
new IdRange(200, 201), new IdRange(400, Long.MAX_VALUE) };
- SearchKey notdKey = SearchKey.buildUidSet(range);
+ SearchKey notdKey =
SearchKey.buildUidSet(IdRange.mergeRanges(Arrays.asList(range)).toArray(new
IdRange[0]));
SearchKey key = SearchKey.buildNot(notdKey);
checkValid("NOT UID *:100,110,200:201,400:*\r\n", key);
}
Modified:
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java?rev=1090937&r1=1090936&r2=1090937&view=diff
==============================================================================
---
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
(original)
+++
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
Mon Apr 11 05:32:52 2011
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertEqu
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.util.Arrays;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
@@ -56,16 +57,16 @@ public class SearchCommandParserOrTest {
}
public Input sequence() {
- IdRange[] range = { new IdRange(Long.MIN_VALUE, 100), new IdRange(110),
+ IdRange[] range = { new IdRange(100, Long.MAX_VALUE), new IdRange(110),
new IdRange(200, 201), new IdRange(400, Long.MAX_VALUE) };
- SearchKey key = SearchKey.buildSequenceSet(range);
+ SearchKey key =
SearchKey.buildSequenceSet(IdRange.mergeRanges(Arrays.asList(range)).toArray(new
IdRange[0]));
return new Input("*:100,110,200:201,400:*", key);
}
public Input uid() {
- IdRange[] range = { new IdRange(Long.MIN_VALUE, 100), new IdRange(110),
+ IdRange[] range = { new IdRange(100, Long.MAX_VALUE), new IdRange(110),
new IdRange(200, 201), new IdRange(400, Long.MAX_VALUE) };
- SearchKey key = SearchKey.buildUidSet(range);
+ SearchKey key =
SearchKey.buildUidSet(IdRange.mergeRanges(Arrays.asList(range)).toArray(new
IdRange[0]));
return new Input("UID *:100,110,200:201,400:*", key);
}
Modified:
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java?rev=1090937&r1=1090936&r2=1090937&view=diff
==============================================================================
---
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
(original)
+++
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
Mon Apr 11 05:32:52 2011
@@ -23,6 +23,7 @@ import static org.junit.Assert.*;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.util.Arrays;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
@@ -63,21 +64,21 @@ public class SearchCommandParserSearchKe
new IdRange(16), new IdRange(25), new IdRange(36),
new IdRange(49), new IdRange(64), new IdRange(81),
new IdRange(100) };
- check("2,4,9,16,25,36,49,64,81,100", range);
+ check("2,4,9,16,25,36,49,64,81,100",
IdRange.mergeRanges(Arrays.asList(range)).toArray(new IdRange[0]));
}
@Test
public void testEndStar() throws Exception {
IdRange[] range = { new IdRange(8), new IdRange(10,11),
new IdRange(17), new IdRange(100, Long.MAX_VALUE) };
- check("8,10:11,17,100:*", range);
+ check("8,10:11,17,100:*",
IdRange.mergeRanges(Arrays.asList(range)).toArray(new IdRange[0]));
}
@Test
public void testStartStar() throws Exception {
- IdRange[] range = { new IdRange(Long.MIN_VALUE, 9), new IdRange(15),
+ IdRange[] range = { new IdRange(9,Long.MAX_VALUE), new IdRange(15),
new IdRange(799, 820) };
- check("*:9,15,799:820", range);
+ check("*:9,15,799:820",
IdRange.mergeRanges(Arrays.asList(range)).toArray(new IdRange[0]));
}
private void check(String sequence, IdRange[] range) throws Exception {
Modified:
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java?rev=1090937&r1=1090936&r2=1090937&view=diff
==============================================================================
---
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
(original)
+++
james/imap/trunk/message/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
Mon Apr 11 05:32:52 2011
@@ -25,6 +25,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.apache.james.imap.api.ImapCommand;
@@ -55,16 +56,16 @@ public class SearchCommandParserTopLevel
on(), unanswered(), };
public static Input sequence() {
- IdRange[] range = { new IdRange(Long.MIN_VALUE, 100), new IdRange(110),
+ IdRange[] range = { new IdRange(100, Long.MAX_VALUE), new IdRange(110),
new IdRange(200, 201), new IdRange(400, Long.MAX_VALUE) };
- SearchKey key = SearchKey.buildSequenceSet(range);
+ SearchKey key =
SearchKey.buildSequenceSet(IdRange.mergeRanges(Arrays.asList(range)).toArray(new
IdRange[0]));
return new Input("*:100,110,200:201,400:*", key);
}
public static Input uid() {
- IdRange[] range = { new IdRange(Long.MIN_VALUE, 100), new IdRange(110),
+ IdRange[] range = { new IdRange(100, Long.MAX_VALUE), new IdRange(110),
new IdRange(200, 201), new IdRange(400, Long.MAX_VALUE) };
- SearchKey key = SearchKey.buildUidSet(range);
+ SearchKey key =
SearchKey.buildUidSet(IdRange.mergeRanges(Arrays.asList(range)).toArray(new
IdRange[0]));
return new Input("UID *:100,110,200:201,400:*", key);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
