From 0f7d72f1279792b2e6875fdc57b4b70577ce50e2 Mon Sep 17 00:00:00 2001 From: Antoine Duprat Date: Wed, 22 Apr 2015 11:34:43 +0200 Subject: [PATCH] JWC-94 UidTo should be equal to MAX when creating MessageRange with from method --- .../apache/james/mailbox/model/MessageRange.java | 3 +- .../org/apache/james/mailbox/MessageRangeTest.java | 95 ----------------- .../james/mailbox/model/MessageRangeTest.java | 113 +++++++++++++++++++++ 3 files changed, 114 insertions(+), 97 deletions(-) delete mode 100644 api/src/test/java/org/apache/james/mailbox/MessageRangeTest.java create mode 100644 api/src/test/java/org/apache/james/mailbox/model/MessageRangeTest.java diff --git a/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java b/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java index 1de7de2..3e087e8 100644 --- a/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java +++ b/api/src/main/java/org/apache/james/mailbox/model/MessageRange.java @@ -102,8 +102,7 @@ public class MessageRange implements Iterable{ * @return not null */ public static MessageRange from(long from) { - final MessageRange result = new MessageRange(Type.FROM, from, NOT_A_UID); - return result; + return new MessageRange(Type.FROM, from, MAX_UID); } diff --git a/api/src/test/java/org/apache/james/mailbox/MessageRangeTest.java b/api/src/test/java/org/apache/james/mailbox/MessageRangeTest.java deleted file mode 100644 index 6207350..0000000 --- a/api/src/test/java/org/apache/james/mailbox/MessageRangeTest.java +++ /dev/null @@ -1,95 +0,0 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ -package org.apache.james.mailbox; - -import java.util.Arrays; -import java.util.List; - -import static org.junit.Assert.*; - -import org.apache.james.mailbox.model.MessageRange; -import org.junit.Test; - -public class MessageRangeTest { - - @Test - public void testToRanges() { - List ranges = MessageRange.toRanges(Arrays.asList(1L,2L,3L,5L,6L,9L)); - assertEquals(3, ranges.size()); - checkRange(1, 3, ranges.get(0)); - checkRange(5, 6, ranges.get(1)); - checkRange(9, 9, ranges.get(2)); - - } - - @Test - public void testOneUidToRange() { - List ranges = MessageRange.toRanges(Arrays.asList(1L)); - assertEquals(1, ranges.size()); - checkRange(1, 1, ranges.get(0)); - } - - // Test for MAILBOX-56 - @Test - public void testTwoSeqUidToRange() { - List ranges = MessageRange.toRanges(Arrays.asList(1L,2L)); - assertEquals(1, ranges.size()); - checkRange(1, 2, ranges.get(0)); - - } - - - private void checkRange(long from, long to, MessageRange range) { - assertEquals(from, range.getUidFrom()); - assertEquals(to, range.getUidTo()); - } - - @Test - public void testSplitOne() { - MessageRange one = MessageRange.one(1); - List ranges = one.split(2); - assertEquals(1, ranges.size()); - checkRange(1, 1, ranges.get(0)); - assertEquals(MessageRange.Type.ONE, ranges.get(0).getType()); - } - - @Test - public void testSplitFrom() { - MessageRange from = MessageRange.from(1); - List ranges = from.split(2); - assertEquals(1, ranges.size()); - checkRange(1, MessageRange.NOT_A_UID, ranges.get(0)); - assertEquals(MessageRange.Type.FROM, ranges.get(0).getType()); - } - - @Test - public void testSplitRange() { - MessageRange range = MessageRange.range(1,10); - List ranges = range.split(3); - assertEquals(4, ranges.size()); - checkRange(1, 3, ranges.get(0)); - assertEquals(MessageRange.Type.RANGE, ranges.get(0).getType()); - checkRange(4, 6, ranges.get(1)); - assertEquals(MessageRange.Type.RANGE, ranges.get(1).getType()); - checkRange(7, 9, ranges.get(2)); - assertEquals(MessageRange.Type.RANGE, ranges.get(2).getType()); - checkRange(10, 10, ranges.get(3)); - assertEquals(MessageRange.Type.ONE, ranges.get(3).getType()); - } -} diff --git a/api/src/test/java/org/apache/james/mailbox/model/MessageRangeTest.java b/api/src/test/java/org/apache/james/mailbox/model/MessageRangeTest.java new file mode 100644 index 0000000..dbab7e5 --- /dev/null +++ b/api/src/test/java/org/apache/james/mailbox/model/MessageRangeTest.java @@ -0,0 +1,113 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ +package org.apache.james.mailbox.model; + +import static org.junit.Assert.assertEquals; + +import java.util.Arrays; +import java.util.List; + +import org.junit.Test; + +public class MessageRangeTest { + + @Test + public void testToRanges() { + List ranges = MessageRange.toRanges(Arrays.asList(1L,2L,3L,5L,6L,9L)); + assertEquals(3, ranges.size()); + checkRange(1, 3, ranges.get(0)); + checkRange(5, 6, ranges.get(1)); + checkRange(9, 9, ranges.get(2)); + + } + + @Test + public void testOneUidToRange() { + List ranges = MessageRange.toRanges(Arrays.asList(1L)); + assertEquals(1, ranges.size()); + checkRange(1, 1, ranges.get(0)); + } + + // Test for MAILBOX-56 + @Test + public void testTwoSeqUidToRange() { + List ranges = MessageRange.toRanges(Arrays.asList(1L,2L)); + assertEquals(1, ranges.size()); + checkRange(1, 2, ranges.get(0)); + + } + + + private void checkRange(long from, long to, MessageRange range) { + assertEquals(from, range.getUidFrom()); + assertEquals(to, range.getUidTo()); + } + + @Test + public void testSplitOne() { + MessageRange one = MessageRange.one(1); + List ranges = one.split(2); + assertEquals(1, ranges.size()); + checkRange(1, 1, ranges.get(0)); + assertEquals(MessageRange.Type.ONE, ranges.get(0).getType()); + } + + @Test + public void testSplitFrom() { + MessageRange from = MessageRange.from(1); + List ranges = from.split(2); + assertEquals(1, ranges.size()); + checkRange(1, MessageRange.MAX_UID, ranges.get(0)); + assertEquals(MessageRange.Type.FROM, ranges.get(0).getType()); + } + + @Test + public void testSplitRange() { + MessageRange range = MessageRange.range(1,10); + List ranges = range.split(3); + assertEquals(4, ranges.size()); + checkRange(1, 3, ranges.get(0)); + assertEquals(MessageRange.Type.RANGE, ranges.get(0).getType()); + checkRange(4, 6, ranges.get(1)); + assertEquals(MessageRange.Type.RANGE, ranges.get(1).getType()); + checkRange(7, 9, ranges.get(2)); + assertEquals(MessageRange.Type.RANGE, ranges.get(2).getType()); + checkRange(10, 10, ranges.get(3)); + assertEquals(MessageRange.Type.ONE, ranges.get(3).getType()); + } + + @Test + public void fromShouldSetTypeToFrom() { + MessageRange messageRange = MessageRange.from(10); + assertEquals(messageRange.getType(), MessageRange.Type.FROM); + } + + @Test + public void fromShouldSetUidFromToGivenValue() { + int from = 10; + MessageRange messageRange = MessageRange.from(from); + assertEquals(messageRange.getUidFrom(), from); + } + + @Test + public void fromShouldSetUidToToMax() { + MessageRange messageRange = MessageRange.from(10); + assertEquals(messageRange.getUidTo(), MessageRange.MAX_UID); + } +} -- 2.1.4