OLD | NEW |
---|---|
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 // Browser test for basic Chrome OS file manager functionality: | 5 // Browser test for basic Chrome OS file manager functionality: |
6 // - The file list is updated when a file is added externally to the Downloads | 6 // - The file list is updated when a file is added externally to the Downloads |
7 // folder. | 7 // folder. |
8 // - Selecting a file and copy-pasting it with the keyboard copies the file. | 8 // - Selecting a file and copy-pasting it with the keyboard copies the file. |
9 // - Selecting a file and pressing delete deletes it. | 9 // - Selecting a file and pressing delete deletes it. |
10 | 10 |
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
740 public FileManagerBrowserTestBase, | 740 public FileManagerBrowserTestBase, |
741 public ::testing::WithParamInterface<TestParameter> { | 741 public ::testing::WithParamInterface<TestParameter> { |
742 virtual GuestMode GetGuestModeParam() const OVERRIDE { | 742 virtual GuestMode GetGuestModeParam() const OVERRIDE { |
743 return std::tr1::get<0>(GetParam()); | 743 return std::tr1::get<0>(GetParam()); |
744 } | 744 } |
745 virtual const char* GetTestCaseNameParam() const OVERRIDE { | 745 virtual const char* GetTestCaseNameParam() const OVERRIDE { |
746 return std::tr1::get<1>(GetParam()); | 746 return std::tr1::get<1>(GetParam()); |
747 } | 747 } |
748 }; | 748 }; |
749 | 749 |
750 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTest, Test) { | 750 |
robliao
2014/08/05 22:18:52
Remove extra space.
Ryan Hamilton
2014/08/05 22:21:25
Done. Thanks!
| |
751 // http://crbug.com/400892 | |
752 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTest, DISABLED_Test) { | |
751 StartTest(); | 753 StartTest(); |
752 } | 754 } |
753 | 755 |
754 // Unlike TEST/TEST_F, which are macros that expand to further macros, | 756 // Unlike TEST/TEST_F, which are macros that expand to further macros, |
755 // INSTANTIATE_TEST_CASE_P is a macro that expands directly to code that | 757 // INSTANTIATE_TEST_CASE_P is a macro that expands directly to code that |
756 // stringizes the arguments. As a result, macros passed as parameters (such as | 758 // stringizes the arguments. As a result, macros passed as parameters (such as |
757 // prefix or test_case_name) will not be expanded by the preprocessor. To work | 759 // prefix or test_case_name) will not be expanded by the preprocessor. To work |
758 // around this, indirect the macro for INSTANTIATE_TEST_CASE_P, so that the | 760 // around this, indirect the macro for INSTANTIATE_TEST_CASE_P, so that the |
759 // pre-processor will expand macros such as MAYBE_test_name before | 761 // pre-processor will expand macros such as MAYBE_test_name before |
760 // instantiating the test. | 762 // instantiating the test. |
(...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1464 } | 1466 } |
1465 | 1467 |
1466 IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, ExposureImageOnDrive) { | 1468 IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, ExposureImageOnDrive) { |
1467 AddScript("gallery/photo_editor.js"); | 1469 AddScript("gallery/photo_editor.js"); |
1468 set_test_case_name("exposureImageOnDrive"); | 1470 set_test_case_name("exposureImageOnDrive"); |
1469 StartTest(); | 1471 StartTest(); |
1470 } | 1472 } |
1471 | 1473 |
1472 } // namespace | 1474 } // namespace |
1473 } // namespace file_manager | 1475 } // namespace file_manager |
OLD | NEW |