| 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 728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 739 public FileManagerBrowserTestBase, | 739 public FileManagerBrowserTestBase, |
| 740 public ::testing::WithParamInterface<TestParameter> { | 740 public ::testing::WithParamInterface<TestParameter> { |
| 741 virtual GuestMode GetGuestModeParam() const OVERRIDE { | 741 virtual GuestMode GetGuestModeParam() const OVERRIDE { |
| 742 return std::tr1::get<0>(GetParam()); | 742 return std::tr1::get<0>(GetParam()); |
| 743 } | 743 } |
| 744 virtual const char* GetTestCaseNameParam() const OVERRIDE { | 744 virtual const char* GetTestCaseNameParam() const OVERRIDE { |
| 745 return std::tr1::get<1>(GetParam()); | 745 return std::tr1::get<1>(GetParam()); |
| 746 } | 746 } |
| 747 }; | 747 }; |
| 748 | 748 |
| 749 // http://crbug.com/327719 | 749 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTest, Test) { |
| 750 IN_PROC_BROWSER_TEST_P(FileManagerBrowserTest, DISABLED_Test) { | |
| 751 StartTest(); | 750 StartTest(); |
| 752 } | 751 } |
| 753 | 752 |
| 754 // Unlike TEST/TEST_F, which are macros that expand to further macros, | 753 // 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 | 754 // 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 | 755 // 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 | 756 // 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 | 757 // 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 | 758 // pre-processor will expand macros such as MAYBE_test_name before |
| 760 // instantiating the test. | 759 // instantiating the test. |
| (...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1464 } | 1463 } |
| 1465 | 1464 |
| 1466 IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, ExposureImageOnDrive) { | 1465 IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, ExposureImageOnDrive) { |
| 1467 AddScript("gallery/photo_editor.js"); | 1466 AddScript("gallery/photo_editor.js"); |
| 1468 set_test_case_name("exposureImageOnDrive"); | 1467 set_test_case_name("exposureImageOnDrive"); |
| 1469 StartTest(); | 1468 StartTest(); |
| 1470 } | 1469 } |
| 1471 | 1470 |
| 1472 } // namespace | 1471 } // namespace |
| 1473 } // namespace file_manager | 1472 } // namespace file_manager |
| OLD | NEW |