diff options
author | tonychun <tonychun@google.com> | 2015-08-05 21:03:12 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-06 04:04:12 +0000 |
commit | 29b709513f8907498383fe36cf06e1e234ef8566 (patch) | |
tree | e2c306f85639b2a394dcd334da00365c83017725 /remoting/test/chromoting_test_driver_environment.h | |
parent | 3ec0456f6641a6ae7b42c294ffc19b5cf88b7203 (diff) | |
download | chromium_src-29b709513f8907498383fe36cf06e1e234ef8566.zip chromium_src-29b709513f8907498383fe36cf06e1e234ef8566.tar.gz chromium_src-29b709513f8907498383fe36cf06e1e234ef8566.tar.bz2 |
Created the ConnectionPerformanceFixture and its respective tests.
The tests in chromoting_test_driver_tests.cc are able to measure the connection performance and also reconnect after disconnecting. Currently, the tests are disabled because the linux builder is currently not working for connecting to localhost. I've also added a test to check to see if the host exists in the host list.
BUG=
Review URL: https://codereview.chromium.org/1260973005
Cr-Commit-Position: refs/heads/master@{#342057}
Diffstat (limited to 'remoting/test/chromoting_test_driver_environment.h')
-rw-r--r-- | remoting/test/chromoting_test_driver_environment.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/remoting/test/chromoting_test_driver_environment.h b/remoting/test/chromoting_test_driver_environment.h index b8c1842..8981de2 100644 --- a/remoting/test/chromoting_test_driver_environment.h +++ b/remoting/test/chromoting_test_driver_environment.h @@ -11,6 +11,7 @@ #include "base/callback.h" #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" +#include "remoting/test/host_info.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { @@ -23,7 +24,6 @@ namespace test { class AccessTokenFetcher; class RefreshTokenStore; class HostListFetcher; -struct HostInfo; // Globally accessible to all test fixtures and cases and has its // lifetime managed by the GTest framework. It is responsible for managing @@ -61,8 +61,10 @@ class ChromotingTestDriverEnvironment : public testing::Environment { // Accessors for fields used by tests. const std::string& access_token() const { return access_token_; } const std::string& host_name() const { return host_name_; } + const std::string& pin() const { return pin_; } const std::string& user_name() const { return user_name_; } const std::vector<HostInfo>& host_list() const { return host_list_; } + const HostInfo& host_info() const { return host_info_; } private: // testing::Environment interface. @@ -108,6 +110,9 @@ class ChromotingTestDriverEnvironment : public testing::Environment { // List of remote hosts for the specified user/test-account. std::vector<HostInfo> host_list_; + // Used to generate connection setup information to connect to |host_name_|. + HostInfo host_info_; + // Access token fetcher used by TestDriverEnvironment tests. remoting::test::AccessTokenFetcher* test_access_token_fetcher_; |