Removing Test and Staging environments from App Remoting Test Driver tool.

remoting/test/app_remoting_report_issue_request_unittest.cc

Index: remoting/test/app_remoting_report_issue_request_unittest.cc
diff --git a/remoting/test/app_remoting_report_issue_request_unittest.cc b/remoting/test/app_remoting_report_issue_request_unittest.cc
index 8a263221cd36072a6b24fea9a0d206ad7ecb3f7f..b83a70ab228da62c96f07b2188198e4755bb80ed 100644
--- a/remoting/test/app_remoting_report_issue_request_unittest.cc
+++ b/remoting/test/app_remoting_report_issue_request_unittest.cc
@@ -43,8 +43,6 @@ class AppRemotingReportIssueRequestTest : public ::testing::Test {
 
   // Used for result verification.
   std::string dev_service_environment_url_;
-  std::string test_service_environment_url_;
-  std::string staging_service_environment_url_;
 
   scoped_ptr<base::RunLoop> run_loop_;
   scoped_ptr<base::Timer> timer_;
@@ -73,16 +71,6 @@ void AppRemotingReportIssueRequestTest::SetUp() {
       GetReportIssueUrl(kTestApplicationId, kTestHostId, kDeveloperEnvironment);
   SetFakeResponse(GURL(dev_service_environment_url_), kReportIssueResponse,
                   net::HTTP_NOT_FOUND, net::URLRequestStatus::FAILED);
-
-  test_service_environment_url_ =
-      GetReportIssueUrl(kTestApplicationId, kTestHostId, kTestingEnvironment);
-  SetFakeResponse(GURL(test_service_environment_url_), kReportIssueResponse,
-                  net::HTTP_NOT_FOUND, net::URLRequestStatus::FAILED);
-
-  staging_service_environment_url_ =
-      GetReportIssueUrl(kTestApplicationId, kTestHostId, kStagingEnvironment);
-  SetFakeResponse(GURL(staging_service_environment_url_), kReportIssueResponse,
-                  net::HTTP_NOT_FOUND, net::URLRequestStatus::FAILED);
 }
 
 void AppRemotingReportIssueRequestTest::SetFakeResponse(
@@ -112,44 +100,6 @@ TEST_F(AppRemotingReportIssueRequestTest, ReportIssueFromDev) {
   timer_->Stop();
 }
 
-TEST_F(AppRemotingReportIssueRequestTest, ReportIssueFromTest) {
-  SetFakeResponse(GURL(test_service_environment_url_), kReportIssueResponse,
-                  net::HTTP_OK, net::URLRequestStatus::SUCCESS);
-
-  timer_->Start(FROM_HERE, base::TimeDelta::FromSeconds(1),
-                run_loop_->QuitClosure());
-
-  bool request_started = app_remoting_report_issue_request_.Start(
-      kTestApplicationId, kTestHostId, kAccessTokenValue, kTestingEnvironment,
-      true, run_loop_->QuitClosure());
-  EXPECT_TRUE(request_started);
-
-  run_loop_->Run();
-
-  // Verify we stopped because of the request completing and not the timer.
-  EXPECT_TRUE(timer_->IsRunning());
-  timer_->Stop();
-}
-
-TEST_F(AppRemotingReportIssueRequestTest, ReportIssueFromStaging) {
-  SetFakeResponse(GURL(staging_service_environment_url_), kReportIssueResponse,
-                  net::HTTP_OK, net::URLRequestStatus::SUCCESS);
-
-  timer_->Start(FROM_HERE, base::TimeDelta::FromSeconds(1),
-                run_loop_->QuitClosure());
-
-  bool request_started = app_remoting_report_issue_request_.Start(
-      kTestApplicationId, kTestHostId, kAccessTokenValue, kStagingEnvironment,
-      true, run_loop_->QuitClosure());
-  EXPECT_TRUE(request_started);
-
-  run_loop_->Run();
-
-  // Verify we stopped because of the request completing and not the timer.
-  EXPECT_TRUE(timer_->IsRunning());
-  timer_->Stop();
-}
-
 TEST_F(AppRemotingReportIssueRequestTest, ReportIssueFromInvalidEnvironment) {
   bool request_started = app_remoting_report_issue_request_.Start(
       kTestApplicationId, kTestHostId, kAccessTokenValue, kUnknownEnvironment,
@@ -163,7 +113,7 @@ TEST_F(AppRemotingReportIssueRequestTest, ReportIssueNetworkError) {
                 run_loop_->QuitClosure());
 
   bool request_started = app_remoting_report_issue_request_.Start(
-      kTestApplicationId, kTestHostId, kAccessTokenValue, kStagingEnvironment,
+      kTestApplicationId, kTestHostId, kAccessTokenValue, kDeveloperEnvironment,
       true, run_loop_->QuitClosure());
   EXPECT_TRUE(request_started);
 
@@ -175,14 +125,11 @@ TEST_F(AppRemotingReportIssueRequestTest, ReportIssueNetworkError) {
 }
 
 TEST_F(AppRemotingReportIssueRequestTest, MultipleRequestsCanBeIssued) {
-  SetFakeResponse(GURL(staging_service_environment_url_), kReportIssueResponse,

[garykac, 2015/09/21 23:11:04]

Not dev_service_environment_url_?

[joedow, 2015/09/21 23:41:34]

This specific test doesn't check the result (only that it is able to make
multiple requests in a row).  However I think it is a good idea to keep this
block and update it to override the dev response since it removes some
assumptions in the test.

-                  net::HTTP_OK, net::URLRequestStatus::SUCCESS);
-
   timer_->Start(FROM_HERE, base::TimeDelta::FromSeconds(1),
                 run_loop_->QuitClosure());
 
   bool request_started = app_remoting_report_issue_request_.Start(
-      kTestApplicationId, kTestHostId, kAccessTokenValue, kStagingEnvironment,
+      kTestApplicationId, kTestHostId, kAccessTokenValue, kDeveloperEnvironment,
       true, run_loop_->QuitClosure());
   EXPECT_TRUE(request_started);
 
@@ -197,7 +144,7 @@ TEST_F(AppRemotingReportIssueRequestTest, MultipleRequestsCanBeIssued) {
                 run_loop_->QuitClosure());
 
   request_started = app_remoting_report_issue_request_.Start(
-      kTestApplicationId, kTestHostId, kAccessTokenValue, kStagingEnvironment,
+      kTestApplicationId, kTestHostId, kAccessTokenValue, kDeveloperEnvironment,
       true, run_loop_->QuitClosure());
   EXPECT_TRUE(request_started);
 
@@ -212,7 +159,7 @@ TEST_F(AppRemotingReportIssueRequestTest, MultipleRequestsCanBeIssued) {
                 run_loop_->QuitClosure());
 
   request_started = app_remoting_report_issue_request_.Start(
-      kTestApplicationId, kTestHostId, kAccessTokenValue, kStagingEnvironment,
+      kTestApplicationId, kTestHostId, kAccessTokenValue, kDeveloperEnvironment,
       true, run_loop_->QuitClosure());
   EXPECT_TRUE(request_started);