rims 0.2.4 → 0.2.5

data/test/test_mail_store.rb

@@ -329,7 +329,7 @@ module RIMS::Test
 
     def test_mail_folder
       mbox_id = @mail_store.add_mbox('INBOX')
-      folder = @mail_store.select_mbox(mbox_id)
+      folder = @mail_store.open_folder(mbox_id)
       assert_equal(mbox_id, folder.mbox_id)
       assert_equal(false, folder.read_only)
       assert_equal(true, folder.updated?)
@@ -371,7 +371,7 @@ module RIMS::Test
       end
       @mail_store.expunge_mbox(mbox_id)
 
-      folder = @mail_store.select_mbox(mbox_id).reload
+      folder = @mail_store.open_folder(mbox_id).reload
 
       assert_equal([ 1 ].to_set, folder.parse_msg_set('1'))
       assert_equal([ 1 ].to_set, folder.parse_msg_set('1', uid: false))
@@ -398,7 +398,7 @@ module RIMS::Test
     def test_mail_folder_parse_msg_set_empty
       mbox_id = @mail_store.add_mbox('INBOX')
       assert_equal([], @mail_store.each_msg_uid(mbox_id).to_a)
-      folder = @mail_store.select_mbox(mbox_id).reload
+      folder = @mail_store.open_folder(mbox_id).reload
 
       assert_equal([ 1 ].to_set, folder.parse_msg_set('1'))
       assert_equal([ 1 ].to_set, folder.parse_msg_set('1', uid: false))
@@ -424,7 +424,7 @@ module RIMS::Test
       @mail_store.add_msg(mbox_id, 'g') # 7
       @mail_store.add_msg(mbox_id, 'h') # 8 deleted
 
-      folder = @mail_store.select_mbox(mbox_id).reload
+      folder = @mail_store.open_folder(mbox_id).reload
       assert_equal(8, folder.each_msg.count)
 
       client_msg_list = folder.each_msg.to_a
@@ -441,6 +441,25 @@ module RIMS::Test
       assert_equal(folder.each_msg.map(&:uid), client_msg_list.map(&:uid))
     end
 
+    def test_folder_alive?
+      mbox_id = @mail_store.add_mbox('INBOX')
+      folder = @mail_store.open_folder(mbox_id).reload
+      assert_equal(true, folder.alive?)
+
+      @mail_store.del_mbox(mbox_id)
+      assert_equal(false, folder.alive?)
+    end
+
+    def test_folder_should_be_alive
+      mbox_id = @mail_store.add_mbox('INBOX')
+      folder = @mail_store.open_folder(mbox_id).reload
+      folder.should_be_alive
+
+      @mail_store.del_mbox(mbox_id)
+      error = assert_raise(RuntimeError) { folder.should_be_alive }
+      assert_match(/deleted folder:/, error.message)
+    end
+
     def test_close_open
       mbox_id1 = @mail_store.add_mbox('INBOX')
       msg_uid1 = @mail_store.add_msg(mbox_id1, 'foo', Time.local(2014, 5, 6, 12, 34, 56))
@@ -625,139 +644,6 @@ module RIMS::Test
       mail_store.close
     end
   end
-
-  class MailStorePoolRefCountTest < Test::Unit::TestCase
-    def setup
-      @kvs = Hash.new{|h, k| h[k] = {} }
-      @kvs_open = proc{|mbox_version, unique_user_id, db_name|
-        RIMS::Hash_KeyValueStore.new(@kvs["#{mbox_version}/#{unique_user_id[0, 7]}/#{db_name}"])
-      }
-      @mail_store_pool = RIMS::MailStore.build_pool(@kvs_open, @kvs_open)
-    end
-
-    def teardown
-      pp @kvs if $DEBUG
-    end
-
-    def assert_call_hook
-      call_count = 0
-      yield(proc{ call_count += 1 })
-      assert_equal(1, call_count, 'a hook should be called once.')
-    end
-    private :assert_call_hook
-
-    def test_holder_object_key
-      unique_user_id = RIMS::Authentication.unique_user_id('foo')
-      holder = @mail_store_pool.get(unique_user_id)
-      assert_equal(unique_user_id, holder.object_key)
-      assert_equal(unique_user_id, holder.unique_user_id)
-    end
-
-    def test_get
-      unique_user_id = RIMS::Authentication.unique_user_id('foo')
-      assert_call_hook{|hook|
-        @mail_store_pool.get(unique_user_id) { hook.call }
-      }
-    end
-
-    def test_get2
-      unique_user_id = RIMS::Authentication.unique_user_id('foo')
-      @mail_store_pool.get(unique_user_id)
-      @mail_store_pool.get(unique_user_id) { flunk }
-    end
-
-    def test_get_multiuser
-      unique_user_id = RIMS::Authentication.unique_user_id('foo')
-      unique_user_id2 = RIMS::Authentication.unique_user_id('bar')
-
-      assert_call_hook{|hook|
-        @mail_store_pool.get(unique_user_id) { hook.call }
-      }
-      assert_call_hook{|hook|
-        @mail_store_pool.get(unique_user_id2) { hook.call }
-      }
-
-      @mail_store_pool.get(unique_user_id) { flunk }
-      @mail_store_pool.get(unique_user_id2) { flunk }
-    end
-
-    def test_return_pool
-      unique_user_id = RIMS::Authentication.unique_user_id('foo')
-
-      holder = @mail_store_pool.get(unique_user_id)
-      assert_call_hook{|hook|
-        holder.return_pool{ hook.call }
-      }
-    end
-
-    def test_return_pool2
-      unique_user_id = RIMS::Authentication.unique_user_id('foo')
-
-      holders = []
-      holders << @mail_store_pool.get(unique_user_id)
-      holders << @mail_store_pool.get(unique_user_id)
-      holders << @mail_store_pool.get(unique_user_id)
-
-      holders.pop.return_pool{ flunk }
-      holders.shift.return_pool{ flunk }
-      assert_call_hook{|hook|
-        holders.pop.return_pool{ hook.call }
-      }
-    end
-
-    def test_return_pool_multiuser
-      unique_user_id = RIMS::Authentication.unique_user_id('foo')
-      unique_user_id2 = RIMS::Authentication.unique_user_id('bar')
-
-      holders = []
-      holders << @mail_store_pool.get(unique_user_id)
-      holders << @mail_store_pool.get(unique_user_id)
-      holders << @mail_store_pool.get(unique_user_id)
-
-      holders2 = []
-      holders2 << @mail_store_pool.get(unique_user_id2)
-      holders2 << @mail_store_pool.get(unique_user_id2)
-      holders2 << @mail_store_pool.get(unique_user_id2)
-
-      holders.pop.return_pool{ flunk }
-      holders2.shift.return_pool{ flunk }
-      holders.pop.return_pool{ flunk }
-      holders2.shift.return_pool{ flunk }
-      assert_call_hook{|hook|
-        holders2.shift.return_pool{ hook.call }
-      }
-      assert_call_hook{|hook|
-        holders.pop.return_pool{ hook.call }
-      }
-    end
-
-    def test_cycle
-      unique_user_id = RIMS::Authentication.unique_user_id('foo')
-
-      holders = []
-      assert_call_hook{|hook|
-        holders << @mail_store_pool.get(unique_user_id) { hook.call }
-      }
-      holders << @mail_store_pool.get(unique_user_id) { flunk }
-      holders << @mail_store_pool.get(unique_user_id) { flunk }
-
-      holders.pop.return_pool{ flunk }
-      holders.pop.return_pool{ flunk }
-      assert_call_hook{|hook|
-        holders.pop.return_pool{ hook.call }
-      }
-
-      assert_call_hook{|hook|
-        holders << @mail_store_pool.get(unique_user_id) { hook.call }
-      }
-      holders << @mail_store_pool.get(unique_user_id) { flunk }
-
-      holders.shift.return_pool{ flunk }
-      assert_call_hook{|hook|
-        holders.shift.return_pool{ hook.call }
-      }
-    end
-  end
 end
 
 # Local Variables:

data/test/test_protocol_auth.rb

@@ -30,7 +30,14 @@ module RIMS::Test
       @logger = Logger.new(STDOUT)
       @logger.level = ($DEBUG) ? Logger::DEBUG : Logger::FATAL
 
-      @reader = RIMS::Protocol::AuthenticationReader.new(@auth, @input, @output, @logger)
+      input_gets = @input.method(:gets)
+      output_write = lambda{|res|
+        for line in res
+          @output << line
+        end
+      }
+
+      @reader = RIMS::Protocol::AuthenticationReader.new(@auth, input_gets, output_write, @logger)
     end
 
     def assert_input_output_stream(input_txt, expected_output_txt)

data/test/test_protocol_decoder.rb

@@ -133,7 +133,13 @@ module RIMS::Test
         if (client_input_text) then
           input = StringIO.new(client_input_text, 'r')
           output = StringIO.new('', 'w')
-          inout_args = [ input, output ]
+          input_gets = input.method(:gets)
+          output_write = lambda{|res|
+            for line in res
+              output << line
+            end
+          }
+          inout_args = [ input_gets, output_write ]
           inout_args << RIMS::Protocol::ConnectionTimer.new(@limits, input) if (cmd_id == :idle)
           cmd_args = inout_args + cmd_args
         end
@@ -236,21 +242,21 @@ module RIMS::Test
     extend Forwardable
 
     def open_mail_store
-      mail_store_holder = @mail_store_pool.get(@unique_user_id)
-      begin
-        @mail_store = mail_store_holder.mail_store
-        @mail_store.write_synchronize{
-          yield
-        }
-      ensure
-        @mail_store = nil
-        mail_store_holder.return_pool
-      end
+      @services.call_service(:engine, @unique_user_id) {|engine|
+        begin
+          @mail_store = engine.mail_store
+          @mail_store.write_synchronize{
+            yield
+          }
+        ensure
+          @mail_store = nil
+        end
+      }
     end
     private :open_mail_store
 
     def make_decoder
-      RIMS::Protocol::Decoder.new_decoder(@mail_store_pool, @auth, @logger)
+      RIMS::Protocol::Decoder.new_decoder(@services, @auth, @logger)
     end
     private :make_decoder
 
@@ -273,13 +279,30 @@ module RIMS::Test
     private :command_test?
 
     def setup
+      @logger = Logger.new(STDOUT)
+      @logger.level = ($DEBUG) ? Logger::DEBUG : Logger::FATAL
+
       @kvs = Hash.new{|h, k| h[k] = {} }
       @kvs_open = proc{|mbox_version, unique_user_id, db_name|
         RIMS::Hash_KeyValueStore.new(@kvs["#{mbox_version}/#{unique_user_id[0, 7]}/#{db_name}"])
       }
       @unique_user_id = RIMS::Authentication.unique_user_id('foo')
 
-      @mail_store_pool = RIMS::MailStore.build_pool(@kvs_open, @kvs_open)
+      @services = Riser::DRbServices.new(0)
+      @services.add_sticky_process_service(:engine,
+                                           Riser::ResourceSet.build{|builder|
+                                             builder.at_create{|unique_user_id|
+                                               mail_store = RIMS::MailStore.build(unique_user_id, @kvs_open, @kvs_open)
+                                               RIMS::Protocol::Decoder::Engine.new(unique_user_id, mail_store, @logger)
+                                             }
+                                             builder.at_destroy{|engine|
+                                               engine.destroy
+                                             }
+                                             builder.alias_unref(:destroy)
+                                           })
+      @services.start_server
+      @services.start_client
+
       open_mail_store{
         @inbox_id = @mail_store.mbox_id('INBOX')
       }
@@ -297,9 +320,6 @@ module RIMS::Test
       @pw.entry('#postman', 'password_of_mail_delivery_user')
       @auth.add_plug_in(@pw)
 
-      @logger = Logger.new(STDOUT)
-      @logger.level = ($DEBUG) ? Logger::DEBUG : Logger::FATAL
-
       @limits = RIMS::Protocol::ConnectionLimits.new(0.001, 60 * 30)
       @decoder = make_decoder
       @tag = 'T000'
@@ -308,8 +328,8 @@ module RIMS::Test
     end
 
     def teardown
-      @decoder.cleanup
-      assert(@mail_store_pool.empty?)
+      assert_equal(0, @services.get_service(:engine, @unique_user_id).proxy_count)
+      @services.stop_server
       pp @kvs if $DEBUG
     end
 
@@ -554,7 +574,7 @@ module RIMS::Test
 
         assert_imap_command("AUTHENTICATE plain #{client_plain_response_base64('foo', 'detarame')}",
                             client_input_text: '') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/auth.* fail/)
         }
 
         assert_equal(false, @decoder.auth?) if command_test?
@@ -568,7 +588,7 @@ module RIMS::Test
 
         assert_imap_command("AUTHENTICATE plain #{client_plain_response_base64('foo', 'open_sesame')}",
                             client_input_text: '') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/dup.* auth/)
         }
 
         assert_equal(true, @decoder.auth?) if command_test?
@@ -599,13 +619,13 @@ module RIMS::Test
 
         assert_imap_command('AUTHENTICATE plain', client_input_text: "*\r\n") {|assert|
           assert.equal('+ ')
-          assert.match(/^#{tag} BAD /)
+          assert.match(/^#{tag} BAD AUTHENTICATE/, peek_next_line: true).match(/fail/)
         }
 
         assert_imap_command('AUTHENTICATE plain',
                             client_input_text: client_plain_response_base64('foo', 'detarame') + "\r\n") {|assert|
           assert.equal('+ ')
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/auth.* fail/)
         }
 
         assert_equal(false, @decoder.auth?) if command_test?
@@ -619,7 +639,7 @@ module RIMS::Test
         assert_equal(true, @decoder.auth?) if command_test?
 
         assert_imap_command('AUTHENTICATE plain', client_input_text: '') {|assert|
-          assert.match(/^#{tag} NO /, peek_next_line: true).match(/duplicated authentication/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/dup.* auth/)
         }
 
         assert_equal(true, @decoder.auth?) if command_test?
@@ -656,13 +676,13 @@ module RIMS::Test
 
         assert_imap_command('AUTHENTICATE cram-md5', client_input_text: "*\r\n") {|assert|
           assert.equal("+ #{server_client_data_base64_pair_list[0][0]}")
-          assert.match(/^#{tag} BAD /)
+          assert.match(/^#{tag} BAD AUTHENTICATE/, peek_next_line: true).match(/fail/)
         }
 
         assert_imap_command('AUTHENTICATE cram-md5',
                             client_input_text: server_client_data_base64_pair_list[1][1] + "\r\n") {|assert|
           assert.equal("+ #{server_client_data_base64_pair_list[1][0]}")
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/auth.* fail/)
         }
 
         assert_equal(false, @decoder.auth?) if command_test?
@@ -676,7 +696,7 @@ module RIMS::Test
         assert_equal(true, @decoder.auth?) if command_test?
 
         assert_imap_command('AUTHENTICATE cram-md5', client_input_text: '') {|assert|
-          assert.match(/^#{tag} NO /, peek_next_line: true).match(/duplicated authentication/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/dup.* auth/)
         }
 
         assert_imap_command('LOGOUT') {|assert|
@@ -704,7 +724,7 @@ module RIMS::Test
         assert_equal(false, @decoder.auth?) if command_test?
 
         assert_imap_command('LOGIN foo detarame') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/fail.* login/)
         }
 
         assert_equal(false, @decoder.auth?) if command_test?
@@ -716,7 +736,7 @@ module RIMS::Test
         assert_equal(true, @decoder.auth?) if command_test?
 
         assert_imap_command('LOGIN foo open_sesame') {|assert|
-          assert.match(/^#{tag} NO/)
+          assert.match(/^#{tag} NO/, peek_next_line: true).match(/dup.* login/)
         }
 
         assert_equal(true, @decoder.auth?) if command_test?
@@ -767,7 +787,7 @@ module RIMS::Test
         end
 
         assert_imap_command('SELECT INBOX') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         if (command_test?) then
@@ -898,7 +918,7 @@ module RIMS::Test
         end
 
         assert_imap_command('EXAMINE INBOX') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         if (command_test?) then
@@ -1008,7 +1028,7 @@ module RIMS::Test
         assert_equal(false, @decoder.auth?) if command_test?
 
         assert_imap_command('CREATE foo') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         assert_equal(false, @decoder.auth?) if command_test?
@@ -1031,7 +1051,7 @@ module RIMS::Test
         }
 
         assert_imap_command('CREATE inbox') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/dup.* mailbox/)
         }
 
         assert_imap_command('LOGOUT') {|assert|
@@ -1098,7 +1118,7 @@ module RIMS::Test
         assert_equal(false, @decoder.auth?) if command_test?
 
         assert_imap_command('DELETE foo') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         open_mail_store{
@@ -1124,7 +1144,7 @@ module RIMS::Test
         }
 
         assert_imap_command('DELETE bar') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not found.* mailbox/)
         }
 
         open_mail_store{
@@ -1133,7 +1153,7 @@ module RIMS::Test
         }
 
         assert_imap_command('DELETE inbox') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not delete.* [Ii][Nn][Bb][Oo][Xx]/)
         }
 
         if (command_test?) then
@@ -1211,7 +1231,7 @@ module RIMS::Test
         assert_equal(false, @decoder.auth?) if command_test?
 
         assert_imap_command('RENAME foo bar') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         open_mail_store{
@@ -1237,7 +1257,7 @@ module RIMS::Test
         }
 
         assert_imap_command('RENAME nobox baz') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not found.* mailbox/)
         }
 
         open_mail_store{
@@ -1245,7 +1265,7 @@ module RIMS::Test
         }
 
         assert_imap_command('RENAME INBOX baz') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not rename.* [Ii][Nn][Bb][Oo][Xx]/)
         }
 
         open_mail_store{
@@ -1254,7 +1274,7 @@ module RIMS::Test
         }
 
         assert_imap_command('RENAME bar inbox') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/dup.* mailbox/)
         }
 
         open_mail_store{
@@ -1331,7 +1351,7 @@ module RIMS::Test
         assert_equal(false, @decoder.auth?) if command_test?
 
         assert_imap_command('SUBSCRIBE INBOX') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         assert_equal(false, @decoder.auth?) if command_test?
@@ -1400,7 +1420,7 @@ module RIMS::Test
         assert_equal(false, @decoder.auth?) if command_test?
 
         assert_imap_command('UNSUBSCRIBE INBOX') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         assert_equal(false, @decoder.auth?) if command_test?
@@ -1412,7 +1432,7 @@ module RIMS::Test
         assert_equal(true, @decoder.auth?) if command_test?
 
         assert_imap_command('UNSUBSCRIBE INBOX') {|assert|
-          assert.equal("#{tag} NO not implemented subscribe/unsbscribe command")
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not implemented/)
         }
       }
     end
@@ -1433,7 +1453,7 @@ module RIMS::Test
         assert_equal(false, @decoder.auth?) if command_test?
 
         assert_imap_command('LIST "" ""') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         assert_equal(false, @decoder.auth?) if command_test?
@@ -1548,7 +1568,7 @@ module RIMS::Test
         assert_equal(false, @decoder.auth?) if command_test?
 
         assert_imap_command('STATUS nobox (MESSAGES)') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         assert_equal(false, @decoder.auth?) if command_test?
@@ -1560,7 +1580,7 @@ module RIMS::Test
         assert_equal(true, @decoder.auth?) if command_test?
 
         assert_imap_command('STATUS nobox (MESSAGES)') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not found.* mailbox/)
         }
 
         assert_imap_command('STATUS INBOX (MESSAGES)') {|assert|
@@ -1618,12 +1638,17 @@ module RIMS::Test
           assert.equal("#{tag} OK STATUS completed")
         }
 
+        assert_imap_command('STATUS INBOX ()') {|assert|
+          assert.equal('* STATUS "INBOX" ()')
+          assert.equal("#{tag} OK STATUS completed")
+        }
+
         assert_imap_command('STATUS INBOX MESSAGES') {|assert|
-          assert.match(/^#{tag} BAD /)
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
         }
 
         assert_imap_command('STATUS INBOX (DETARAME)') {|assert|
-          assert.match(/^#{tag} BAD /)
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
         }
 
         assert_imap_command('LOGOUT') {|assert|
@@ -1680,7 +1705,7 @@ module RIMS::Test
         assert_equal(false, @decoder.auth?) if command_test?
 
         assert_imap_command('LSUB "" *') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         assert_equal(false, @decoder.auth?) if command_test?
@@ -1747,7 +1772,7 @@ module RIMS::Test
         assert_equal(false, @decoder.auth?) if command_test?
 
         assert_imap_command('APPEND INBOX a') {|assert|
-          assert.match(/^#{tag} NO /, peek_next_line: true).no_match(/\[TRYCREATE\]/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/, peek_next_line: true).no_match(/\[TRYCREATE\]/)
         }
 
         open_mail_store{
@@ -1805,7 +1830,7 @@ module RIMS::Test
         }
 
         assert_imap_command('APPEND INBOX (\Answered \Flagged \Deleted \Seen \Draft) "19-Nov-1975 12:34:56 +0900" NIL x') {|assert|
-          assert.match(/^#{tag} BAD /)
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
         }
 
         open_mail_store{
@@ -1813,7 +1838,7 @@ module RIMS::Test
         }
 
         assert_imap_command('APPEND INBOX "19-Nov-1975 12:34:56 +0900" (\Answered \Flagged \Deleted \Seen \Draft) x') {|assert|
-          assert.match(/^#{tag} BAD /)
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
         }
 
         open_mail_store{
@@ -1821,7 +1846,7 @@ module RIMS::Test
         }
 
         assert_imap_command('APPEND INBOX (\Recent) x') {|assert|
-          assert.match(/^#{tag} BAD /)
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
         }
 
         open_mail_store{
@@ -1829,7 +1854,7 @@ module RIMS::Test
         }
 
         assert_imap_command('APPEND INBOX "bad date-time" x') {|assert|
-          assert.match(/^#{tag} BAD /)
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
         }
 
         open_mail_store{
@@ -1837,7 +1862,7 @@ module RIMS::Test
         }
 
         assert_imap_command('APPEND nobox x') {|assert|
-          assert.match(/^#{tag} NO \[TRYCREATE\]/)
+          assert.match(/^#{tag} NO \[TRYCREATE\]/, peek_next_line: true).match(/not found.* mailbox/)
         }
 
         open_mail_store{
@@ -1909,7 +1934,7 @@ module RIMS::Test
         end
 
         assert_imap_command('CHECK') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         if (command_test?) then
@@ -1927,7 +1952,7 @@ module RIMS::Test
         end
 
         assert_imap_command('CHECK') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not selected/)
         }
 
         assert_imap_command('SELECT INBOX') {|assert|
@@ -1988,7 +2013,7 @@ module RIMS::Test
         end
 
         assert_imap_command('CLOSE') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         if (command_test?) then
@@ -2006,7 +2031,7 @@ module RIMS::Test
         end
 
         assert_imap_command('CLOSE') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not selected/)
         }
 
         assert_imap_command('SELECT INBOX') {|assert|
@@ -2024,7 +2049,13 @@ module RIMS::Test
         end
 
         assert_imap_command('CLOSE') {|assert|
-          assert.equal("* 1 EXPUNGE")
+          # see: RFC 3501 / 6.4.2.  CLOSE Command
+          # <https://tools.ietf.org/html/rfc3501#section-6.4.2>
+          #
+          # The CLOSE command permanently removes all messages that have the
+          # \Deleted flag set from the currently selected mailbox, and returns
+          # to the authenticated state from the selected state.  No untagged
+          # EXPUNGE responses are sent.
           assert.equal("#{tag} OK CLOSE completed")
         }
 
@@ -2093,7 +2124,7 @@ module RIMS::Test
         end
 
         assert_imap_command('CLOSE') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         if (command_test?) then
@@ -2111,7 +2142,7 @@ module RIMS::Test
         end
 
         assert_imap_command('CLOSE') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not selected/)
         }
 
         assert_imap_command('EXAMINE INBOX') {|assert|
@@ -2179,7 +2210,7 @@ module RIMS::Test
         end
 
         assert_imap_command('EXPUNGE') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         if (command_test?) then
@@ -2197,7 +2228,7 @@ module RIMS::Test
         end
 
         assert_imap_command('EXPUNGE') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not selected/)
         }
 
         assert_imap_command('SELECT INBOX') {|assert|
@@ -2338,7 +2369,7 @@ module RIMS::Test
         end
 
         assert_imap_command('EXPUNGE') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         if (command_test?) then
@@ -2356,7 +2387,7 @@ module RIMS::Test
         end
 
         assert_imap_command('EXPUNGE') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not selected/)
         }
 
         assert_imap_command('EXAMINE INBOX') {|assert|
@@ -2370,7 +2401,7 @@ module RIMS::Test
         end
 
         assert_imap_command('EXPUNGE') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/cannot expunge.* read-only/)
         }
 
         open_mail_store{
@@ -2405,7 +2436,7 @@ module RIMS::Test
         end
 
         assert_imap_command('SEARCH ALL') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         if (command_test?) then
@@ -2423,7 +2454,7 @@ module RIMS::Test
         end
 
         assert_imap_command('SEARCH ALL') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not selected/)
         }
 
         assert_imap_command('SELECT INBOX') {|assert|
@@ -2506,11 +2537,11 @@ module RIMS::Test
         }
 
         assert_imap_command('SEARCH bad-search-command') {|assert|
-          assert.match(/^#{tag} BAD /)
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
         }
 
         assert_imap_command('SEARCH') {|assert|
-          assert.match(/^#{tag} BAD /)
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
         }
 
         assert_imap_command('LOGOUT') {|assert|
@@ -2561,7 +2592,7 @@ module RIMS::Test
         end
 
         assert_imap_command('SEARCH CHARSET utf-8 ALL') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         if (command_test?) then
@@ -2579,7 +2610,7 @@ module RIMS::Test
         end
 
         assert_imap_command('SEARCH CHARSET utf-8 ALL') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not selected/)
         }
 
         assert_imap_command('SELECT INBOX') {|assert|
@@ -2609,11 +2640,23 @@ module RIMS::Test
 
         utf8_msg = "\u306F\u306B\u307B"
         assert_imap_command("SEARCH CHARSET utf-8 BODY {#{utf8_msg.bytesize}}\r\n#{utf8_msg}".b) {|assert|
-          assert.equal('+ continue')
+          assert.match(/^\+ /)
           assert.equal("* SEARCH 4 5\r\n")
           assert.equal("#{tag} OK SEARCH completed\r\n")
         }
 
+        assert_imap_command('SEARCH CHARSET') {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
+        assert_imap_command('SEARCH CHARSET NIL') {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
+        assert_imap_command('SEARCH CHARSET utf-8') {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
         assert_imap_command('LOGOUT') {|assert|
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
@@ -2663,7 +2706,7 @@ module RIMS::Test
         end
 
         assert_imap_command('SEARCH CHARSET utf-8 ALL') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         if (command_test?) then
@@ -2681,7 +2724,7 @@ module RIMS::Test
         end
 
         assert_imap_command('SEARCH CHARSET utf-8 ALL') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not selected/)
         }
 
         assert_imap_command('SELECT INBOX') {|assert|
@@ -2716,11 +2759,23 @@ module RIMS::Test
 
         utf8_msg = "\u306F\u306B\u307B"
         assert_imap_command("SEARCH CHARSET utf-8 TEXT {#{utf8_msg.bytesize}}\r\n#{utf8_msg}".b) {|assert|
-          assert.equal('+ continue')
+          assert.match(/^\+ /)
           assert.equal("* SEARCH 4 5\r\n")
           assert.equal("#{tag} OK SEARCH completed\r\n")
         }
 
+        assert_imap_command('SEARCH CHARSET') {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
+        assert_imap_command('SEARCH CHARSET NIL') {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
+        assert_imap_command('SEARCH CHARSET utf-8') {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
         assert_imap_command('LOGOUT') {|assert|
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
@@ -2756,7 +2811,7 @@ module RIMS::Test
         end
 
         assert_imap_command('FETCH 1:* FAST') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         assert_imap_command('LOGIN foo open_sesame') {|assert|
@@ -2769,7 +2824,7 @@ module RIMS::Test
         end
 
         assert_imap_command('FETCH 1:* FAST') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not selected/)
         }
 
         assert_imap_command('SELECT INBOX') {|assert|
@@ -2815,6 +2870,18 @@ module RIMS::Test
           assert_msg_flags(3, seen: false, recent: true)
         }
 
+        assert(10 < @simple_mail.raw_source.bytesize)
+        assert(10 + 10 < @simple_mail.raw_source.bytesize)
+        assert_imap_command('FETCH 1 BODY[]<10.10>') {|assert|
+          assert.equal_lines("* 1 FETCH (BODY[]<10> #{literal(@simple_mail.raw_source[10, 10])})".b)
+          assert.equal("#{tag} OK FETCH completed")
+        }
+
+        open_mail_store{
+          assert_msg_flags(2, seen: true,  recent: true)
+          assert_msg_flags(3, seen: false, recent: true)
+        }
+
         assert_imap_command('FETCH 2 BODY.PEEK[1]') {|assert|
           assert.equal_lines(%Q'* 2 FETCH (BODY[1] "#{@mpart_mail.parts[0].body.raw_source}")'.b)
           assert.equal("#{tag} OK FETCH completed")
@@ -2835,6 +2902,18 @@ module RIMS::Test
           assert_msg_flags(3, seen: false, recent: true)
         }
 
+        assert(10 < @simple_mail.raw_source.bytesize)
+        assert(10 + 10 < @simple_mail.raw_source.bytesize)
+        assert_imap_command('FETCH 2 BODY[]<10.10>', uid: true) {|assert|
+          assert.equal_lines("* 1 FETCH (UID 2 BODY[]<10> #{literal(@simple_mail.raw_source[10, 10])})".b)
+          assert.equal("#{tag} OK FETCH completed")
+        }
+
+        open_mail_store{
+          assert_msg_flags(2, seen: true,  recent: true)
+          assert_msg_flags(3, seen: false, recent: true)
+        }
+
         assert_imap_command('FETCH 3 (UID BODY.PEEK[1])', uid: true) {|assert|
           assert.equal_lines(%Q'* 2 FETCH (UID 3 BODY[1] "#{@mpart_mail.parts[0].body.raw_source}")'.b)
           assert.equal("#{tag} OK FETCH completed")
@@ -2845,6 +2924,10 @@ module RIMS::Test
           assert_msg_flags(3, seen: false, recent: true)
         }
 
+        assert_imap_command('FETCH 1 bad-fetch-attr') {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
         assert_imap_command('LOGOUT') {|assert|
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
@@ -2880,7 +2963,7 @@ module RIMS::Test
         end
 
         assert_imap_command('FETCH 1:* FAST') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         assert_imap_command('LOGIN foo open_sesame') {|assert|
@@ -2893,7 +2976,7 @@ module RIMS::Test
         end
 
         assert_imap_command('FETCH 1:* FAST') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not selected/)
         }
 
         assert_imap_command('EXAMINE INBOX') {|assert|
@@ -2939,6 +3022,18 @@ module RIMS::Test
           assert_msg_flags(3, seen: false, recent: true)
         }
 
+        assert(10 < @simple_mail.raw_source.bytesize)
+        assert(10 + 10 < @simple_mail.raw_source.bytesize)
+        assert_imap_command('FETCH 1 BODY[]<10.10>') {|assert|
+          assert.equal_lines("* 1 FETCH (BODY[]<10> #{literal(@simple_mail.raw_source[10, 10])})".b)
+          assert.equal("#{tag} OK FETCH completed")
+        }
+
+        open_mail_store{
+          assert_msg_flags(2, seen: false, recent: true)
+          assert_msg_flags(3, seen: false, recent: true)
+        }
+
         assert_imap_command('FETCH 2 BODY.PEEK[1]') {|assert|
           assert.equal_lines(%Q'* 2 FETCH (BODY[1] "#{@mpart_mail.parts[0].body.raw_source}")'.b)
           assert.equal("#{tag} OK FETCH completed")
@@ -2959,6 +3054,18 @@ module RIMS::Test
           assert_msg_flags(3, seen: false, recent: true)
         }
 
+        assert(10 < @simple_mail.raw_source.bytesize)
+        assert(10 + 10 < @simple_mail.raw_source.bytesize)
+        assert_imap_command('FETCH 2 BODY[]<10.10>', uid: true) {|assert|
+          assert.equal_lines("* 1 FETCH (UID 2 BODY[]<10> #{literal(@simple_mail.raw_source[10, 10])})".b)
+          assert.equal("#{tag} OK FETCH completed")
+        }
+
+        open_mail_store{
+          assert_msg_flags(2, seen: false, recent: true)
+          assert_msg_flags(3, seen: false, recent: true)
+        }
+
         assert_imap_command('FETCH 3 (UID BODY.PEEK[1])', uid: true) {|assert|
           assert.equal_lines(%Q'* 2 FETCH (UID 3 BODY[1] "#{@mpart_mail.parts[0].body.raw_source}")'.b)
           assert.equal("#{tag} OK FETCH completed")
@@ -2969,6 +3076,10 @@ module RIMS::Test
           assert_msg_flags(3, seen: false, recent: true)
         }
 
+        assert_imap_command('FETCH 1 bad-fetch-attr') {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
         assert_imap_command('LOGOUT') {|assert|
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
@@ -3012,7 +3123,7 @@ module RIMS::Test
         end
 
         assert_imap_command('STORE 1 +FLAGS (\Answered)') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         assert_imap_command('LOGIN foo open_sesame') {|assert|
@@ -3025,7 +3136,7 @@ module RIMS::Test
         end
 
         assert_imap_command('STORE 1 +FLAGS (\Answered)') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not selected/)
         }
 
         assert_imap_command('SELECT INBOX') {|assert|
@@ -3249,6 +3360,78 @@ module RIMS::Test
           assert_mbox_flag_num(answered: 4, flagged: 3, deleted: 2, seen: 1, draft: 0, recent: 5)
         }
 
+        assert_imap_command('STORE 1:5 +FLAGS ()') {|assert|
+          assert.equal('* 1 FETCH (FLAGS (\Recent))')
+          assert.equal('* 2 FETCH (FLAGS (\Answered \Recent))')
+          assert.equal('* 3 FETCH (FLAGS (\Answered \Flagged \Recent))')
+          assert.equal('* 4 FETCH (FLAGS (\Answered \Flagged \Deleted \Recent))')
+          assert.equal('* 5 FETCH (FLAGS (\Answered \Flagged \Deleted \Seen \Recent))')
+          assert.equal("#{tag} OK STORE completed")
+        }
+
+        open_mail_store{
+          assert_msg_uid(                      1, 3, 5, 7, 9)
+          assert_flag_enabled_msgs('answered',    3, 5, 7, 9)
+          assert_flag_enabled_msgs('flagged' ,       5, 7, 9)
+          assert_flag_enabled_msgs('deleted' ,          7, 9)
+          assert_flag_enabled_msgs('seen'    ,             9)
+          assert_flag_enabled_msgs('draft'   ,              )
+          assert_flag_enabled_msgs('recent'  , 1, 3, 5, 7, 9)
+          assert_mbox_flag_num(answered: 4, flagged: 3, deleted: 2, seen: 1, draft: 0, recent: 5)
+        }
+
+        assert_imap_command('STORE 1:5 -FLAGS ()') {|assert|
+          assert.equal('* 1 FETCH (FLAGS (\Recent))')
+          assert.equal('* 2 FETCH (FLAGS (\Answered \Recent))')
+          assert.equal('* 3 FETCH (FLAGS (\Answered \Flagged \Recent))')
+          assert.equal('* 4 FETCH (FLAGS (\Answered \Flagged \Deleted \Recent))')
+          assert.equal('* 5 FETCH (FLAGS (\Answered \Flagged \Deleted \Seen \Recent))')
+          assert.equal("#{tag} OK STORE completed")
+        }
+
+        open_mail_store{
+          assert_msg_uid(                      1, 3, 5, 7, 9)
+          assert_flag_enabled_msgs('answered',    3, 5, 7, 9)
+          assert_flag_enabled_msgs('flagged' ,       5, 7, 9)
+          assert_flag_enabled_msgs('deleted' ,          7, 9)
+          assert_flag_enabled_msgs('seen'    ,             9)
+          assert_flag_enabled_msgs('draft'   ,              )
+          assert_flag_enabled_msgs('recent'  , 1, 3, 5, 7, 9)
+          assert_mbox_flag_num(answered: 4, flagged: 3, deleted: 2, seen: 1, draft: 0, recent: 5)
+        }
+
+        assert_imap_command('STORE 1:5 FLAGS ()') {|assert|
+          assert.equal('* 1 FETCH (FLAGS (\Recent))')
+          assert.equal('* 2 FETCH (FLAGS (\Recent))')
+          assert.equal('* 3 FETCH (FLAGS (\Recent))')
+          assert.equal('* 4 FETCH (FLAGS (\Recent))')
+          assert.equal('* 5 FETCH (FLAGS (\Recent))')
+          assert.equal("#{tag} OK STORE completed")
+        }
+
+        open_mail_store{
+          assert_msg_uid(                      1, 3, 5, 7, 9)
+          assert_flag_enabled_msgs('answered',              )
+          assert_flag_enabled_msgs('flagged' ,              )
+          assert_flag_enabled_msgs('deleted' ,              )
+          assert_flag_enabled_msgs('seen'    ,              )
+          assert_flag_enabled_msgs('draft'   ,              )
+          assert_flag_enabled_msgs('recent'  , 1, 3, 5, 7, 9)
+          assert_mbox_flag_num(answered: 0, flagged: 0, deleted: 0, seen: 0, draft: 0, recent: 5)
+        }
+
+        assert_imap_command('STORE 1 DETARAME (\Flagged)') {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
+        assert_imap_command('STORE 1 FLAGS (\Detarame)') {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
+        assert_imap_command('STORE 1 FLAGS NIL') {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
         assert_imap_command('LOGOUT') {|assert|
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
@@ -3292,7 +3475,7 @@ module RIMS::Test
         end
 
         assert_imap_command('STORE 1 +FLAGS.SILENT (\Answered)') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         assert_imap_command('LOGIN foo open_sesame') {|assert|
@@ -3305,7 +3488,7 @@ module RIMS::Test
         end
 
         assert_imap_command('STORE 1 +FLAGS.SILENT (\Answered)') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not selected/)
         }
 
         assert_imap_command('SELECT INBOX') {|assert|
@@ -3494,6 +3677,63 @@ module RIMS::Test
           assert_mbox_flag_num(answered: 4, flagged: 3, deleted: 2, seen: 1, draft: 0, recent: 5)
         }
 
+        assert_imap_command('STORE 1:5 +FLAGS.SILENT ()') {|assert|
+          assert.equal("#{tag} OK STORE completed")
+        }
+
+        open_mail_store{
+          assert_msg_uid(                      1, 3, 5, 7, 9)
+          assert_flag_enabled_msgs('answered',    3, 5, 7, 9)
+          assert_flag_enabled_msgs('flagged' ,       5, 7, 9)
+          assert_flag_enabled_msgs('deleted' ,          7, 9)
+          assert_flag_enabled_msgs('seen'    ,             9)
+          assert_flag_enabled_msgs('draft'   ,              )
+          assert_flag_enabled_msgs('recent'  , 1, 3, 5, 7, 9)
+          assert_mbox_flag_num(answered: 4, flagged: 3, deleted: 2, seen: 1, draft: 0, recent: 5)
+        }
+
+        assert_imap_command('STORE 1:5 -FLAGS.SILENT ()') {|assert|
+          assert.equal("#{tag} OK STORE completed")
+        }
+
+        open_mail_store{
+          assert_msg_uid(                      1, 3, 5, 7, 9)
+          assert_flag_enabled_msgs('answered',    3, 5, 7, 9)
+          assert_flag_enabled_msgs('flagged' ,       5, 7, 9)
+          assert_flag_enabled_msgs('deleted' ,          7, 9)
+          assert_flag_enabled_msgs('seen'    ,             9)
+          assert_flag_enabled_msgs('draft'   ,              )
+          assert_flag_enabled_msgs('recent'  , 1, 3, 5, 7, 9)
+          assert_mbox_flag_num(answered: 4, flagged: 3, deleted: 2, seen: 1, draft: 0, recent: 5)
+        }
+
+        assert_imap_command('STORE 1:5 FLAGS.SILENT ()') {|assert|
+          assert.equal("#{tag} OK STORE completed")
+        }
+
+        open_mail_store{
+          assert_msg_uid(                      1, 3, 5, 7, 9)
+          assert_flag_enabled_msgs('answered',              )
+          assert_flag_enabled_msgs('flagged' ,              )
+          assert_flag_enabled_msgs('deleted' ,              )
+          assert_flag_enabled_msgs('seen'    ,              )
+          assert_flag_enabled_msgs('draft'   ,              )
+          assert_flag_enabled_msgs('recent'  , 1, 3, 5, 7, 9)
+          assert_mbox_flag_num(answered: 0, flagged: 0, deleted: 0, seen: 0, draft: 0, recent: 5)
+        }
+
+        assert_imap_command('STORE 1 FLAGS.DETARAME (\Flagged)') {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
+        assert_imap_command('STORE 1 FLAGS.SILENT (\Detarame)') {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
+        assert_imap_command('STORE 1 FLAGS.SILENT NIL') {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
         assert_imap_command('LOGOUT') {|assert|
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
@@ -3537,7 +3777,7 @@ module RIMS::Test
         end
 
         assert_imap_command('STORE 1 +FLAGS (\Answered)', uid: true) {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         assert_imap_command('LOGIN foo open_sesame') {|assert|
@@ -3550,7 +3790,7 @@ module RIMS::Test
         end
 
         assert_imap_command('STORE 1 +FLAGS (\Answered)', uid: true) {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not selected/)
         }
 
         assert_imap_command('SELECT INBOX') {|assert|
@@ -3774,6 +4014,78 @@ module RIMS::Test
           assert_mbox_flag_num(answered: 4, flagged: 3, deleted: 2, seen: 1, draft: 0, recent: 5)
         }
 
+        assert_imap_command('STORE 1,3,5,7,9 +FLAGS ()', uid: true) {|assert|
+          assert.equal('* 1 FETCH (UID 1 FLAGS (\Recent))')
+          assert.equal('* 2 FETCH (UID 3 FLAGS (\Answered \Recent))')
+          assert.equal('* 3 FETCH (UID 5 FLAGS (\Answered \Flagged \Recent))')
+          assert.equal('* 4 FETCH (UID 7 FLAGS (\Answered \Flagged \Deleted \Recent))')
+          assert.equal('* 5 FETCH (UID 9 FLAGS (\Answered \Flagged \Deleted \Seen \Recent))')
+          assert.equal("#{tag} OK STORE completed")
+        }
+
+        open_mail_store{
+          assert_msg_uid(                      1, 3, 5, 7, 9)
+          assert_flag_enabled_msgs('answered',    3, 5, 7, 9)
+          assert_flag_enabled_msgs('flagged' ,       5, 7, 9)
+          assert_flag_enabled_msgs('deleted' ,          7, 9)
+          assert_flag_enabled_msgs('seen'    ,             9)
+          assert_flag_enabled_msgs('draft'   ,              )
+          assert_flag_enabled_msgs('recent'  , 1, 3, 5, 7, 9)
+          assert_mbox_flag_num(answered: 4, flagged: 3, deleted: 2, seen: 1, draft: 0, recent: 5)
+        }
+
+        assert_imap_command('STORE 1,3,5,7,9 -FLAGS ()', uid: true) {|assert|
+          assert.equal('* 1 FETCH (UID 1 FLAGS (\Recent))')
+          assert.equal('* 2 FETCH (UID 3 FLAGS (\Answered \Recent))')
+          assert.equal('* 3 FETCH (UID 5 FLAGS (\Answered \Flagged \Recent))')
+          assert.equal('* 4 FETCH (UID 7 FLAGS (\Answered \Flagged \Deleted \Recent))')
+          assert.equal('* 5 FETCH (UID 9 FLAGS (\Answered \Flagged \Deleted \Seen \Recent))')
+          assert.equal("#{tag} OK STORE completed")
+        }
+
+        open_mail_store{
+          assert_msg_uid(                      1, 3, 5, 7, 9)
+          assert_flag_enabled_msgs('answered',    3, 5, 7, 9)
+          assert_flag_enabled_msgs('flagged' ,       5, 7, 9)
+          assert_flag_enabled_msgs('deleted' ,          7, 9)
+          assert_flag_enabled_msgs('seen'    ,             9)
+          assert_flag_enabled_msgs('draft'   ,              )
+          assert_flag_enabled_msgs('recent'  , 1, 3, 5, 7, 9)
+          assert_mbox_flag_num(answered: 4, flagged: 3, deleted: 2, seen: 1, draft: 0, recent: 5)
+        }
+
+        assert_imap_command('STORE 1,3,5,7,9 FLAGS ()', uid: true) {|assert|
+          assert.equal('* 1 FETCH (UID 1 FLAGS (\Recent))')
+          assert.equal('* 2 FETCH (UID 3 FLAGS (\Recent))')
+          assert.equal('* 3 FETCH (UID 5 FLAGS (\Recent))')
+          assert.equal('* 4 FETCH (UID 7 FLAGS (\Recent))')
+          assert.equal('* 5 FETCH (UID 9 FLAGS (\Recent))')
+          assert.equal("#{tag} OK STORE completed")
+        }
+
+        open_mail_store{
+          assert_msg_uid(                      1, 3, 5, 7, 9)
+          assert_flag_enabled_msgs('answered',              )
+          assert_flag_enabled_msgs('flagged' ,              )
+          assert_flag_enabled_msgs('deleted' ,              )
+          assert_flag_enabled_msgs('seen'    ,              )
+          assert_flag_enabled_msgs('draft'   ,              )
+          assert_flag_enabled_msgs('recent'  , 1, 3, 5, 7, 9)
+          assert_mbox_flag_num(answered: 0, flagged: 0, deleted: 0, seen: 0, draft: 0, recent: 5)
+        }
+
+        assert_imap_command('STORE 1 DETARAME (\Flagged)', uid: true) {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
+        assert_imap_command('STORE 1 FLAGS (\Detarame)', uid: true) {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
+        assert_imap_command('STORE 1 FLAGS NIL', uid: true) {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
         assert_imap_command('LOGOUT') {|assert|
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
@@ -3817,7 +4129,7 @@ module RIMS::Test
         end
 
         assert_imap_command('STORE 1 +FLAGS.SILENT (\Answered)', uid: true) {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         assert_imap_command('LOGIN foo open_sesame') {|assert|
@@ -3830,7 +4142,7 @@ module RIMS::Test
         end
 
         assert_imap_command('STORE 1 +FLAGS.SILENT (\Answered)', uid: true) {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not selected/)
         }
 
         assert_imap_command('SELECT INBOX') {|assert|
@@ -4019,6 +4331,63 @@ module RIMS::Test
           assert_mbox_flag_num(answered: 4, flagged: 3, deleted: 2, seen: 1, draft: 0, recent: 5)
         }
 
+        assert_imap_command('STORE 1,3,5,7,9 +FLAGS.SILENT ()', uid: true) {|assert|
+          assert.equal("#{tag} OK STORE completed")
+        }
+
+        open_mail_store{
+          assert_msg_uid(                      1, 3, 5, 7, 9)
+          assert_flag_enabled_msgs('answered',    3, 5, 7, 9)
+          assert_flag_enabled_msgs('flagged' ,       5, 7, 9)
+          assert_flag_enabled_msgs('deleted' ,          7, 9)
+          assert_flag_enabled_msgs('seen'    ,             9)
+          assert_flag_enabled_msgs('draft'   ,              )
+          assert_flag_enabled_msgs('recent'  , 1, 3, 5, 7, 9)
+          assert_mbox_flag_num(answered: 4, flagged: 3, deleted: 2, seen: 1, draft: 0, recent: 5)
+        }
+
+        assert_imap_command('STORE 1,3,5,7,9 -FLAGS.SILENT ()', uid: true) {|assert|
+          assert.equal("#{tag} OK STORE completed")
+        }
+
+        open_mail_store{
+          assert_msg_uid(                      1, 3, 5, 7, 9)
+          assert_flag_enabled_msgs('answered',    3, 5, 7, 9)
+          assert_flag_enabled_msgs('flagged' ,       5, 7, 9)
+          assert_flag_enabled_msgs('deleted' ,          7, 9)
+          assert_flag_enabled_msgs('seen'    ,             9)
+          assert_flag_enabled_msgs('draft'   ,              )
+          assert_flag_enabled_msgs('recent'  , 1, 3, 5, 7, 9)
+          assert_mbox_flag_num(answered: 4, flagged: 3, deleted: 2, seen: 1, draft: 0, recent: 5)
+        }
+
+        assert_imap_command('STORE 1,3,5,7,9 FLAGS.SILENT ()', uid: true) {|assert|
+          assert.equal("#{tag} OK STORE completed")
+        }
+
+        open_mail_store{
+          assert_msg_uid(                      1, 3, 5, 7, 9)
+          assert_flag_enabled_msgs('answered',              )
+          assert_flag_enabled_msgs('flagged' ,              )
+          assert_flag_enabled_msgs('deleted' ,              )
+          assert_flag_enabled_msgs('seen'    ,              )
+          assert_flag_enabled_msgs('draft'   ,              )
+          assert_flag_enabled_msgs('recent'  , 1, 3, 5, 7, 9)
+          assert_mbox_flag_num(answered: 0, flagged: 0, deleted: 0, seen: 0, draft: 0, recent: 5)
+        }
+
+        assert_imap_command('STORE 1 FLAGS.DETARAME (\Flagged)', uid: true) {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
+        assert_imap_command('STORE 1 FLAGS.SILENT (\Detarame)', uid: true) {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
+        assert_imap_command('STORE 1 FLAGS.SILENT NIL', uid: true) {|assert|
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
         assert_imap_command('LOGOUT') {|assert|
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
@@ -4054,7 +4423,7 @@ module RIMS::Test
         end
 
         assert_imap_command('STORE 1 +FLAGS (\Answered \Flagged \Deleted \Seen \Draft)') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
         open_mail_store{
@@ -4075,7 +4444,7 @@ module RIMS::Test
         end
 
         assert_imap_command('STORE 1 +FLAGS (\Answered \Flagged \Deleted \Seen \Draft)') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not selected/)
         }
 
         open_mail_store{
@@ -4093,7 +4462,7 @@ module RIMS::Test
         end
 
         assert_imap_command('STORE 1 +FLAGS (\Answered \Flagged \Deleted \Seen \Draft)') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/cannot store.* read-only/)
         }
 
         open_mail_store{
@@ -4101,7 +4470,7 @@ module RIMS::Test
         }
 
         assert_imap_command('STORE 1 FLAGS (\Answered \Flagged \Deleted \Seen \Draft)') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/cannot store.* read-only/)
         }
 
         open_mail_store{
@@ -4109,7 +4478,7 @@ module RIMS::Test
         }
 
         assert_imap_command('STORE 1 -FLAGS (\Answered \Flagged \Deleted \Seen \Draft)') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/cannot store.* read-only/)
         }
 
         open_mail_store{
@@ -4117,7 +4486,7 @@ module RIMS::Test
         }
 
         assert_imap_command('STORE 1 +FLAGS.SILENT (\Answered \Flagged \Deleted \Seen \Draft)') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/cannot store.* read-only/)
         }
 
         open_mail_store{
@@ -4125,7 +4494,7 @@ module RIMS::Test
         }
 
         assert_imap_command('STORE 1 FLAGS.SILENT (\Answered \Flagged \Deleted \Seen \Draft)') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/cannot store.* read-only/)
         }
 
         open_mail_store{
@@ -4133,7 +4502,7 @@ module RIMS::Test
         }
 
         assert_imap_command('STORE 1 -FLAGS.SILENT (\Answered \Flagged \Deleted \Seen \Draft)') {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/cannot store.* read-only/)
         }
 
         open_mail_store{
@@ -4141,7 +4510,7 @@ module RIMS::Test
         }
 
         assert_imap_command('STORE 1 +FLAGS (\Answered \Flagged \Deleted \Seen \Draft)', uid: true) {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/cannot store.* read-only/)
         }
 
         open_mail_store{
@@ -4149,7 +4518,7 @@ module RIMS::Test
         }
 
         assert_imap_command('STORE 1 FLAGS (\Answered \Flagged \Deleted \Seen \Draft)', uid: true) {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/cannot store.* read-only/)
         }
 
         open_mail_store{
@@ -4157,7 +4526,7 @@ module RIMS::Test
         }
 
         assert_imap_command('STORE 1 -FLAGS (\Answered \Flagged \Deleted \Seen \Draft)', uid: true) {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/cannot store.* read-only/)
         }
 
         open_mail_store{
@@ -4165,7 +4534,7 @@ module RIMS::Test
         }
 
         assert_imap_command('STORE 1 +FLAGS.SILENT (\Answered \Flagged \Deleted \Seen \Draft)', uid: true) {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/cannot store.* read-only/)
         }
 
         open_mail_store{
@@ -4173,7 +4542,7 @@ module RIMS::Test
         }
 
         assert_imap_command('STORE 1 FLAGS.SILENT (\Answered \Flagged \Deleted \Seen \Draft)', uid: true) {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/cannot store.* read-only/)
         }
 
         open_mail_store{
@@ -4181,7 +4550,7 @@ module RIMS::Test
         }
 
         assert_imap_command('STORE 1 -FLAGS.SILENT (\Answered \Flagged \Deleted \Seen \Draft)', uid: true) {|assert|
-          assert.match(/^#{tag} NO /)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/cannot store.* read-only/)
         }
 
         open_mail_store{
@@ -4247,7 +4616,7 @@ module RIMS::Test
         end
 
         assert_imap_command('COPY 2:4 WORK') {|assert|
-          assert.match(/^#{tag} NO /, peek_next_line: true).no_match(/\[TRYCREATE\]/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/, peek_next_line: true).no_match(/\[TRYCREATE\]/)
         }
 
         if (command_test?) then
@@ -4265,7 +4634,7 @@ module RIMS::Test
         end
 
         assert_imap_command('COPY 2:4 WORK') {|assert|
-          assert.match(/^#{tag} NO /, peek_next_line: true).no_match(/\[TRYCREATE\]/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not selected/, peek_next_line: true).no_match(/\[TRYCREATE\]/)
         }
 
         assert_imap_command('SELECT INBOX') {|assert|
@@ -4389,7 +4758,7 @@ module RIMS::Test
         }
 
         assert_imap_command('COPY 1:* nobox') {|assert|
-          assert.match(/^#{tag} NO \[TRYCREATE\]/)
+          assert.match(/^#{tag} NO \[TRYCREATE\]/, peek_next_line: true).match(/not found.* mailbox/)
         }
 
         assert_imap_command('LOGOUT') {|assert|
@@ -4451,7 +4820,7 @@ module RIMS::Test
         end
 
         assert_imap_command('COPY 3,5,7 WORK', uid: true) {|assert|
-          assert.match(/^#{tag} NO /, peek_next_line: true).no_match(/\[TRYCREATE\]/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/, peek_next_line: true).no_match(/\[TRYCREATE\]/)
         }
 
         if (command_test?) then
@@ -4469,7 +4838,7 @@ module RIMS::Test
         end
 
         assert_imap_command('COPY 3,5,7 WORK', uid: true) {|assert|
-          assert.match(/^#{tag} NO /, peek_next_line: true).no_match(/\[TRYCREATE\]/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not selected/, peek_next_line: true).no_match(/\[TRYCREATE\]/)
         }
 
         assert_imap_command('SELECT INBOX') {|assert|
@@ -4593,7 +4962,7 @@ module RIMS::Test
         }
 
         assert_imap_command('COPY 1:* nobox', uid: true) {|assert|
-          assert.match(/^#{tag} NO \[TRYCREATE\]/)
+          assert.match(/^#{tag} NO \[TRYCREATE\]/, peek_next_line: true).match(/not found.* mailbox/)
         }
 
         assert_imap_command('LOGOUT') {|assert|
@@ -4794,24 +5163,24 @@ module RIMS::Test
         end
 
         assert_imap_command('IDLE', client_input_text: "DONE\r\n") {|assert|
-          assert.equal('+ continue')
+          assert.match(/^\+ /)
           assert.equal("#{tag} OK IDLE terminated")
         }
 
         assert_imap_command('IDLE', client_input_text: "done\r\n") {|assert|
-          assert.equal('+ continue')
+          assert.match(/^\+ /)
           assert.equal("#{tag} OK IDLE terminated")
         }
 
         assert_imap_command('IDLE', client_input_text: "detarame\r\n") {|assert|
-          assert.equal('+ continue')
+          assert.match(/^\+ /)
           assert.equal("#{tag} BAD unexpected client response")
         }
 
         if (command_test?) then
           # not be able to close client input in stream test
           assert_imap_command('IDLE', client_input_text: '') {|assert|
-            assert.equal('+ continue')
+            assert.match(/^\+ /)
             assert.equal("#{tag} BAD unexpected client connection close")
           }
         end
@@ -4840,7 +5209,7 @@ module RIMS::Test
         end
 
         assert_imap_command('IDLE', client_input_text: "DONE\r\n") {|assert|
-          assert.equal('+ continue')
+          assert.match(/^\+ /)
           assert.equal("#{tag} OK IDLE terminated")
         }
 
@@ -4950,71 +5319,71 @@ module RIMS::Test
         }
 
         assert_imap_command('SELECT INBOX') {|assert|
-          assert.match(/#{tag} NO not allowed command/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not allowed/)
         }
 
         assert_imap_command('EXAMINE INBOX') {|assert|
-          assert.match(/#{tag} NO not allowed command/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not allowed/)
         }
 
         assert_imap_command('CREATE foo') {|assert|
-          assert.match(/#{tag} NO not allowed command/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not allowed/)
         }
 
         assert_imap_command('DELETE foo') {|assert|
-          assert.match(/#{tag} NO not allowed command/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not allowed/)
         }
 
         assert_imap_command('RENAME foo bar') {|assert|
-          assert.match(/#{tag} NO not allowed command/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not allowed/)
         }
 
         assert_imap_command('SUBSCRIBE foo') {|assert|
-          assert.match(/#{tag} NO not allowed command/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not allowed/)
         }
 
         assert_imap_command('UNSUBSCRIBE foo') {|assert|
-          assert.match(/#{tag} NO not allowed command/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not allowed/)
         }
 
         assert_imap_command('LIST "" *') {|assert|
-          assert.match(/#{tag} NO not allowed command/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not allowed/)
         }
 
         assert_imap_command('LSUB "" *') {|assert|
-          assert.match(/#{tag} NO not allowed command/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not allowed/)
         }
 
         assert_imap_command('STATUS INBOX (MESSAGES RECENT UIDNEXT UIDVALIDITY UNSEEN)') {|assert|
-          assert.match(/#{tag} NO not allowed command/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not allowed/)
         }
 
         assert_imap_command('CHECK') {|assert|
-          assert.match(/#{tag} NO not allowed command/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not allowed/)
         }
 
         assert_imap_command('CLOSE') {|assert|
-          assert.match(/#{tag} NO not allowed command/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not allowed/)
         }
 
         assert_imap_command('EXPUNGE') {|assert|
-          assert.match(/#{tag} NO not allowed command/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not allowed/)
         }
 
         assert_imap_command('SEARCH *') {|assert|
-          assert.match(/#{tag} NO not allowed command/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not allowed/)
         }
 
         assert_imap_command('FETCH * RFC822') {|assert|
-          assert.match(/#{tag} NO not allowed command/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not allowed/)
         }
 
         assert_imap_command('STORE 1 +FLAGS (\Answered \Flagged \Deleted \Seen \Draft)') {|assert|
-          assert.match(/#{tag} NO not allowed command/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not allowed/)
         }
 
         assert_imap_command('COPY * foo') {|assert|
-          assert.match(/#{tag} NO not allowed command/)
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not allowed/)
         }
 
         base64_foo = RIMS::Protocol.encode_base64('foo')
@@ -5042,7 +5411,7 @@ module RIMS::Test
         }
 
         assert_imap_command(%Q'APPEND "b64user-mbox #{base64_foo} nobox" x') {|assert|
-          assert.match(/^#{tag} NO \[TRYCREATE\]/)
+          assert.match(/^#{tag} NO \[TRYCREATE\]/, peek_next_line: true).match(/not found.* mailbox/)
         }
 
         open_mail_store{
@@ -5050,7 +5419,7 @@ module RIMS::Test
         }
 
         assert_imap_command(%Q'APPEND "b64user-mbox #{base64_nouser} INBOX" x') {|assert|
-          assert.match(/^#{tag} NO not found a user/)
+          assert.match(/^#{tag} NO/, peek_next_line: true).match(/not found.* user/)
         }
 
         open_mail_store{
@@ -5058,7 +5427,7 @@ module RIMS::Test
         }
 
         assert_imap_command(%Q'APPEND "unknown-encode-type #{base64_foo} INBOX" x') {|assert|
-          assert.match(/^#{tag} BAD /)
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
         }
 
         open_mail_store{
@@ -5264,7 +5633,7 @@ module RIMS::Test
         }
 
         assert_imap_command('IDLE', client_input_text: '') {|assert|
-          assert.equal('+ continue')
+          assert.match(/^\+ /)
         }
 
         @limits.command_wait_timeout_seconds = 0.1
@@ -5292,7 +5661,7 @@ module RIMS::Test
         }
 
         assert_imap_command('IDLE', client_input_text: '') {|assert|
-          assert.equal('+ continue')
+          assert.match(/^\+ /)
         }
 
         @limits.command_wait_timeout_seconds = 0
@@ -5334,67 +5703,70 @@ module RIMS::Test
         another_decoder = another_decoder.next_decoder
         assert_equal(true, another_decoder.selected?)
 
+        n = 1
         another_decoder.append('tag', 'INBOX', [ :group, '\Deleted' ], 'test', &another_writer)
         assert_imap_command('NOOP') {|assert|
-          assert.equal('* 1 EXISTS')
-          assert.equal('* 1 RECENT')
+          assert.equal("* #{n} EXISTS")
+          assert.equal("* #{n} RECENT")
           assert.equal("#{tag} OK NOOP completed")
         }
 
+        n += 1
         another_decoder.copy('tag', '1', 'INBOX', &another_writer)
         assert_imap_command('NOOP') {|assert|
-          assert.equal('* 2 EXISTS')
-          assert.equal('* 2 RECENT')
+          assert.equal("* #{n} EXISTS")
+          assert.equal("* #{n} RECENT")
           assert.equal("#{tag} OK NOOP completed")
         }
 
+        n -= 1
         another_decoder.expunge('tag', &another_writer)
         assert_imap_command('NOOP') {|assert|
           assert.equal('* 1 EXPUNGE')
           assert.equal("#{tag} OK NOOP completed")
         }
-        n = 2
 
+        n += 1
         another_decoder.append('tag', 'INBOX', 'test', &another_writer)
         assert_imap_command('CREATE foo') {|assert|
           assert.equal("* #{n} EXISTS")
           assert.equal("* #{n} RECENT")
           assert.equal("#{tag} OK CREATE completed")
         }
-        n += 1
 
+        n += 1
         another_decoder.append('tag', 'INBOX', 'test', &another_writer)
         assert_imap_command('RENAME foo bar') {|assert|
           assert.equal("* #{n} EXISTS")
           assert.equal("* #{n} RECENT")
           assert.equal("#{tag} OK RENAME completed")
         }
-        n += 1
 
+        n += 1
         another_decoder.append('tag', 'INBOX', 'test', &another_writer)
         assert_imap_command('DELETE bar') {|assert|
           assert.equal("* #{n} EXISTS")
           assert.equal("* #{n} RECENT")
           assert.equal("#{tag} OK DELETE completed")
         }
-        n += 1
 
+        n += 1
         another_decoder.append('tag', 'INBOX', 'test', &another_writer)
         assert_imap_command('SUBSCRIBE INBOX') {|assert|
           assert.equal("* #{n} EXISTS")
           assert.equal("* #{n} RECENT")
           assert.equal("#{tag} OK SUBSCRIBE completed")
         }
-        n += 1
 
+        n += 1
         another_decoder.append('tag', 'INBOX', 'test', &another_writer)
         assert_imap_command('UNSUBSCRIBE INBOX') {|assert|
           assert.equal("* #{n} EXISTS")
           assert.equal("* #{n} RECENT")
-          assert.equal("#{tag} NO not implemented subscribe/unsbscribe command")
+          assert.match(/^#{tag} NO /, peek_next_line: true).match(/not implemented/)
         }
-        n += 1
 
+        n += 1
         another_decoder.append('tag', 'INBOX', 'test', &another_writer)
         assert_imap_command('LIST "" *') {|assert|
           assert.equal("* #{n} EXISTS")
@@ -5402,8 +5774,8 @@ module RIMS::Test
           assert.equal('* LIST (\Noinferiors \Marked) NIL "INBOX"')
           assert.equal("#{tag} OK LIST completed")
         }
-        n += 1
 
+        n += 1
         another_decoder.append('tag', 'INBOX', 'test', &another_writer)
         assert_imap_command('LSUB "" *') {|assert|
           assert.equal("* #{n} EXISTS")
@@ -5411,8 +5783,8 @@ module RIMS::Test
           assert.equal('* LSUB (\Noinferiors \Marked) NIL "INBOX"')
           assert.equal("#{tag} OK LSUB completed")
         }
-        n += 1
 
+        n += 1
         another_decoder.append('tag', 'INBOX', 'test', &another_writer)
         assert_imap_command('STATUS INBOX (MESSAGES RECENT UIDNEXT UIDVALIDITY UNSEEN)') {|assert|
           assert.equal("* #{n} EXISTS")
@@ -5420,34 +5792,35 @@ module RIMS::Test
           assert.equal("* STATUS \"INBOX\" (MESSAGES #{n} RECENT #{n} UIDNEXT #{(n+1).succ} UIDVALIDITY #{@inbox_id} UNSEEN #{n})")
           assert.equal("#{tag} OK STATUS completed")
         }
-        n += 1
 
+        n += 1
         another_decoder.append('tag', 'INBOX', 'test', &another_writer)
+        n += 1
         assert_imap_command('APPEND INBOX test') {|assert|
+          assert.equal("* #{n-1} EXISTS")
+          assert.equal("* #{n-1} RECENT")
           assert.equal("* #{n} EXISTS")
           assert.equal("* #{n} RECENT")
-          assert.equal("* #{n+1} EXISTS")
-          assert.equal("* #{n+1} RECENT")
-          assert.equal("#{tag} OK [APPENDUID 1 #{n+2}] APPEND completed")
+          assert.equal("#{tag} OK [APPENDUID 1 #{n+1}] APPEND completed")
         }
-        n += 2
 
+        n += 1
         another_decoder.append('tag', 'INBOX', 'test', &another_writer)
         assert_imap_command('CHECK') {|assert|
           assert.equal("* #{n} EXISTS")
           assert.equal("* #{n} RECENT")
           assert.equal("#{tag} OK CHECK completed")
         }
-        n += 1
 
+        n += 1
         another_decoder.append('tag', 'INBOX', 'test', &another_writer)
         assert_imap_command('EXPUNGE') {|assert|
           assert.equal("* #{n} EXISTS")
           assert.equal("* #{n} RECENT")
           assert.equal("#{tag} OK EXPUNGE completed")
         }
-        n += 1
 
+        n += 1
         another_decoder.append('tag', 'INBOX', 'test', &another_writer)
         assert_imap_command('SEARCH *') {|assert|
           assert.equal("* #{n} EXISTS\r\n")
@@ -5455,8 +5828,8 @@ module RIMS::Test
           assert.equal("* SEARCH #{n}\r\n")
           assert.equal("#{tag} OK SEARCH completed\r\n")
         }
-        n += 1
 
+        n += 1
         another_decoder.append('tag', 'INBOX', 'test', &another_writer)
         assert_imap_command('FETCH 1 BODY.PEEK[]') {|assert|
           assert.equal("* #{n} EXISTS")
@@ -5464,8 +5837,8 @@ module RIMS::Test
           assert.equal(%Q'* 1 FETCH (BODY[] "test")')
           assert.equal("#{tag} OK FETCH completed")
         }
-        n += 1
 
+        n += 1
         another_decoder.append('tag', 'INBOX', 'test', &another_writer)
         assert_imap_command('STORE 1 +FLAGS (\Flagged)') {|assert|
           assert.equal("* #{n} EXISTS")
@@ -5473,20 +5846,19 @@ module RIMS::Test
           assert.equal('* 1 FETCH (FLAGS (\Flagged \Recent))')
           assert.equal("#{tag} OK STORE completed")
         }
-        n += 1
 
+        n += 2
         another_decoder.append('tag', 'INBOX', 'test', &another_writer)
         assert_imap_command('COPY 1 INBOX') {|assert|
+          assert.equal("* #{n-1} EXISTS")
+          assert.equal("* #{n-1} RECENT")
           assert.equal("* #{n} EXISTS")
           assert.equal("* #{n} RECENT")
-          assert.equal("* #{n+1} EXISTS")
-          assert.equal("* #{n+1} RECENT")
-          assert.equal("#{tag} OK [COPYUID 1 2 #{n+2}] COPY completed")
+          assert.equal("#{tag} OK [COPYUID 1 2 #{n+1}] COPY completed")
         }
-        n += 2
 
         open_mail_store{
-          f = @mail_store.examine_mbox(@inbox_id)
+          f = @mail_store.open_folder(@inbox_id, read_only: true)
           begin
             uid_list = @mail_store.each_msg_uid(@inbox_id).to_a
             last_uid = uid_list.min
@@ -5496,13 +5868,80 @@ module RIMS::Test
           end
         }
 
+        n -= 1
         another_decoder.close('tag', &another_writer)
         assert_imap_command('NOOP') {|assert|
           assert.equal("* 1 EXPUNGE")
+          assert.equal("* 0 RECENT")
           assert.equal("#{tag} OK NOOP completed")
         }
 
-        another_decoder.cleanup
+        open_mail_store{
+          f = @mail_store.open_folder(@inbox_id, read_only: true)
+          begin
+            uid_list = @mail_store.each_msg_uid(@inbox_id).to_a
+            last_uid = uid_list.min
+            @mail_store.set_msg_flag(@inbox_id, last_uid, 'deleted', true)
+          ensure
+            f.close
+          end
+        }
+
+        another_decoder.create('tag', 'foo', &another_writer)
+        another_decoder.examine('tag', 'INBOX', &another_writer)
+        another_decoder.examine('tag', 'foo', &another_writer) # closed INBOX implicitly
+        another_decoder.close('tag', 'foo', &another_writer)
+        assert_imap_command('NOOP') {|assert|
+          # no untagged responses on implicit INBOX close because
+          # INBOX is opened as read-only.
+          assert.equal("#{tag} OK NOOP completed")
+        }
+
+        n -= 1
+        another_decoder.select('tag', 'INBOX', &another_writer)
+        another_decoder.select('tag', 'foo', &another_writer) # closed INBOX implicitly
+        another_decoder.close('tag', 'foo', &another_writer)
+        assert_imap_command('NOOP') {|assert|
+          assert.equal("* 1 EXPUNGE")
+          assert.equal("#{tag} OK NOOP completed")
+        }
+
+        n += 1
+        another_decoder.append('tag', 'INBOX', 'test', &another_writer)
+        assert_imap_command('CLOSE') {|assert|
+          # IMAP CLOSE command releases a mailbox that has a status to
+          # be notified, and it will not send untagged responses
+          # notified from other connections.
+          assert.equal("#{tag} OK CLOSE completed")
+        }
+
+        assert_imap_command('EXAMINE INBOX') {|assert|
+          assert.equal("* #{n} EXISTS")
+          assert.equal('* 0 RECENT')
+          assert.equal("* OK [UNSEEN #{n}]")
+          assert.equal('* OK [UIDVALIDITY 1]')
+          assert.equal('* FLAGS (\Answered \Flagged \Deleted \Seen \Draft)')
+          assert.equal("#{tag} OK [READ-ONLY] EXAMINE completed")
+        }
+
+        open_mail_store{
+          f = @mail_store.open_folder(@inbox_id, read_only: true)
+          begin
+            uid_list = @mail_store.each_msg_uid(@inbox_id).to_a
+            last_uid = uid_list.min
+            @mail_store.set_msg_flag(@inbox_id, last_uid, 'deleted', true)
+          ensure
+            f.close
+          end
+        }
+
+        n -= 1
+        another_decoder.select('tag', 'INBOX', &another_writer)
+        another_decoder.cleanup # closed INBOX implicitly
+        assert_imap_command('NOOP') {|assert|
+          assert.equal("* 1 EXPUNGE")
+          assert.equal("#{tag} OK NOOP completed")
+        }
       }
     end
 
@@ -5544,29 +5983,29 @@ module RIMS::Test
 
         another_decoder.append('tag', 'INBOX', [ :group, '\Deleted' ], 'test', &another_writer)
         assert_imap_command('IDLE', client_input_text: "DONE\r\n") {|assert|
-          assert.equal_lines("+ continue\r\n" +
-                             "* 1 EXISTS\r\n" +
-                             "* 1 RECENT\r\n")
+          assert.match(/^\+ /)
+          assert.equal('* 1 EXISTS')
+          assert.equal('* 1 RECENT')
           assert.equal("#{tag} OK IDLE terminated")
         }
 
         another_decoder.copy('tag', '1', 'INBOX', &another_writer)
         assert_imap_command('IDLE', client_input_text: "DONE\r\n") {|assert|
-          assert.equal_lines("+ continue\r\n" +
-                             "* 2 EXISTS\r\n" +
-                             "* 2 RECENT\r\n")
+          assert.match(/^\+ /)
+          assert.equal('* 2 EXISTS')
+          assert.equal('* 2 RECENT')
           assert.equal("#{tag} OK IDLE terminated")
         }
 
         another_decoder.expunge('tag', &another_writer)
         assert_imap_command('IDLE', client_input_text: "DONE\r\n") {|assert|
-          assert.equal_lines("+ continue\r\n" +
-                             "* 1 EXPUNGE\r\n")
+          assert.match(/^\+ /)
+          assert.equal('* 1 EXPUNGE')
           assert.equal("#{tag} OK IDLE terminated")
         }
 
         open_mail_store{
-          f = @mail_store.examine_mbox(@inbox_id)
+          f = @mail_store.open_folder(@inbox_id, read_only: true)
           begin
             uid_list = @mail_store.each_msg_uid(@inbox_id).to_a
             last_uid = uid_list.min
@@ -5578,8 +6017,9 @@ module RIMS::Test
 
         another_decoder.close('tag', &another_writer)
         assert_imap_command('IDLE', client_input_text: "DONE\r\n") {|assert|
-          assert.equal_lines("+ continue\r\n" +
-                             "* 1 EXPUNGE\r\n")
+          assert.match(/^\+ /)
+          assert.equal('* 1 EXPUNGE')
+          assert.equal('* 0 RECENT')
           assert.equal("#{tag} OK IDLE terminated")
         }