From c67575decf6e20d5a59e527df4f7275c8e841b91 Mon Sep 17 00:00:00 2001
From: Matthieu Baechler <matthieu.baechler@gmail.com>
Date: Mon, 4 May 2015 15:45:54 +0200
Subject: [PATCH] JWC-132 put LSUB responses into an unordered SUB block

---
 .../org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java    | 4 ----
 .../java/org/apache/james/mpt/imapmailbox/suite/SelectedInbox.java    | 4 ----
 .../src/main/resources/org/apache/james/imap/scripts/Subscribe.test   | 4 ++++
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java b/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java
index 495ab39..469c2a2 100644
--- a/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java
+++ b/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java
@@ -26,7 +26,6 @@ import javax.inject.Inject;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.mpt.host.ImapHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseAuthenticatedState;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class AuthenticatedState extends BaseAuthenticatedState {
@@ -93,7 +92,6 @@ public class AuthenticatedState extends BaseAuthenticatedState {
         scriptTest("Status", Locale.US);
     }
 
-    @Ignore("JWC-132 : MPT subscription related test do not pass")
     @Test
     public void testSubscribeUS() throws Exception {
         scriptTest("Subscribe", Locale.US);
@@ -184,7 +182,6 @@ public class AuthenticatedState extends BaseAuthenticatedState {
         scriptTest("Status", Locale.ITALY);
     }
 
-    @Ignore("JWC-132 : MPT subscription related test do not pass")
     @Test
     public void testSubscribeITALY() throws Exception {
         scriptTest("Subscribe", Locale.ITALY);
@@ -275,7 +272,6 @@ public class AuthenticatedState extends BaseAuthenticatedState {
         scriptTest("Status", Locale.KOREA);
     }
 
-    @Ignore("JWC-132 : MPT subscription related test do not pass")
     @Test
     public void testSubscribeKOREA() throws Exception {
         scriptTest("Subscribe", Locale.KOREA);
diff --git a/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/SelectedInbox.java b/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/SelectedInbox.java
index d763032..c76d4be 100644
--- a/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/SelectedInbox.java
+++ b/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/suite/SelectedInbox.java
@@ -25,7 +25,6 @@ import javax.inject.Inject;
 
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedInbox;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class SelectedInbox extends BaseSelectedInbox {
@@ -92,7 +91,6 @@ public class SelectedInbox extends BaseSelectedInbox {
         scriptTest("StringArgs", Locale.US);
     }
 
-    @Ignore("JWC-132 : MPT subscription related test do not pass")
     @Test
     public void testSubscribeUS() throws Exception {
         scriptTest("Subscribe", Locale.US);
@@ -163,7 +161,6 @@ public class SelectedInbox extends BaseSelectedInbox {
         scriptTest("StringArgs", Locale.ITALY);
     }
 
-    @Ignore("JWC-132 : MPT subscription related test do not pass")
     @Test
     public void testSubscribeITALY() throws Exception {
         scriptTest("Subscribe", Locale.ITALY);
@@ -234,7 +231,6 @@ public class SelectedInbox extends BaseSelectedInbox {
         scriptTest("StringArgs", Locale.KOREA);
     }
 
-    @Ignore("JWC-132 : MPT subscription related test do not pass")
     @Test
     public void testSubscribeKOREA() throws Exception {
         scriptTest("Subscribe", Locale.KOREA);
diff --git a/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Subscribe.test b/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Subscribe.test
index 3c73f6b..86e9e6e 100644
--- a/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Subscribe.test
+++ b/impl/imap-mailbox/core/src/main/resources/org/apache/james/imap/scripts/Subscribe.test
@@ -61,13 +61,17 @@ C: a08 UNSUBSCRIBE subscribetest
 S: a08 OK UNSUBSCRIBE completed.
 
 C: a09 LSUB "" "sub*"
+SUB {
 S: \* LSUB \(\) \"\.\" \"subscribetest\.subfolder\"
 S: \* LSUB \(\) \"\.\" \"subscribetest1\.subfolder1\"
+}
 S: a09 OK LSUB completed.
 
 C: b01 LSUB "" "%"    
+SUB {
 S: \* LSUB \(\\Noselect\) \"\.\" \"subscribetest\"
 S: \* LSUB \(\\Noselect\) \"\.\" \"subscribetest1\"
+}
 S: b01 OK LSUB completed.
 
 
-- 
2.4.2