Improve tests for Mixed-Case JIDs.

remoting/protocol/fake_authenticator.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef REMOTING_PROTOCOL_FAKE_AUTHENTICATOR_H_
 #define REMOTING_PROTOCOL_FAKE_AUTHENTICATOR_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 38 matching lines @@
     HOST,
     CLIENT,
   };
 
   enum Action {
     ACCEPT,
     REJECT,
     REJECT_CHANNEL
   };
 
-  FakeAuthenticator(Type type, int round_trips, Action action, bool async);
+  struct Config {
+    Config();
+    Config(Action action);
+    Config(int round_trips, Action action, bool async);
+
+    int round_trips = 1;
+    Action action = Action::ACCEPT;
+    bool async = false;
+  };
+
+  FakeAuthenticator(Type type,
+                    Config config,
+                    const std::string& local_id,
+                    const std::string& remote_id);
+
+  // Special constructor for authenticators in ACCEPTED or REJECTED state that
+  // don't exchange any messages.
+  FakeAuthenticator(Action action);
 
   ~FakeAuthenticator() override;
 
   // Set the number of messages that the authenticator needs to process before
   // started() returns true.  Default to 0.
   void set_messages_till_started(int messages);
 
   // Sets auth key to be returned by GetAuthKey(). Must be called when
   // |round_trips| is set to 0.
   void set_auth_key(const std::string& auth_key) { auth_key_ = auth_key; }
@@ skipping 12 matching lines @@
   RejectionReason rejection_reason() const override;
   void ProcessMessage(const buzz::XmlElement* message,
                       const base::Closure& resume_callback) override;
   std::unique_ptr<buzz::XmlElement> GetNextMessage() override;
   const std::string& GetAuthKey() const override;
   std::unique_ptr<ChannelAuthenticator> CreateChannelAuthenticator()
       const override;
 
  protected:
   const Type type_;
-  const int round_trips_;
-  const Action action_;
-  const bool async_;
+  const Config config_;
+  const std::string local_id_;
+  const std::string remote_id_;
 
   // Total number of messages that have been processed.
   int messages_ = 0;
   // Number of messages that the authenticator needs to process before started()
   // returns true.  Default to 0.
   int messages_till_started_ = 0;
 
   int pause_message_index_ = -1;
   base::Closure resume_closure_;
 
   std::string auth_key_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeAuthenticator);
 };
 
 class FakeHostAuthenticatorFactory : public AuthenticatorFactory {
  public:
-  FakeHostAuthenticatorFactory(
-      int round_trips, int messages_till_start,
-      FakeAuthenticator::Action action, bool async);
+  FakeHostAuthenticatorFactory(int messages_till_start,
+                               FakeAuthenticator::Config config);

[joedow, 2017/04/11 16:20:34]

nit: Config struct passed by const ref?

[Sergey Ulanov, 2017/04/11 21:14:20]

That struct is only 12 bytes, not much bigger than a pointer, so I don't think
passing it by reference would make any difference.

   ~FakeHostAuthenticatorFactory() override;
 
   // AuthenticatorFactory interface.
   std::unique_ptr<Authenticator> CreateAuthenticator(
       const std::string& local_jid,
       const std::string& remote_jid) override;
 
  private:
-  const int round_trips_;
   const int messages_till_started_;
-  const FakeAuthenticator::Action action_;
-  const bool async_;
+  const FakeAuthenticator::Config config_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeHostAuthenticatorFactory);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_FAKE_AUTHENTICATOR_H_