| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "web/tests/WebUnitTests.h" | 32 #include "web/tests/WebUnitTests.h" |
| 33 | 33 |
| 34 // FIXME: Can we move this to webkit/support and fix the layering violation? | 34 // FIXME: Can we move this to webkit/support and fix the layering violation? |
| 35 #include <base/test/test_suite.h> | 35 #include <base/test/test_suite.h> |
| 36 #include <gmock/gmock.h> | |
| 37 | 36 |
| 38 static TestSuite* testSuite = 0; | 37 static TestSuite* testSuite = 0; |
| 39 | 38 |
| 40 namespace blink { | 39 namespace blink { |
| 41 | 40 |
| 42 void InitTestSuite(int argc, char** argv) | 41 void InitTestSuite(int argc, char** argv) |
| 43 { | 42 { |
| 44 ::testing::InitGoogleMock(&argc, argv); | |
| 45 testSuite = new TestSuite(argc, argv); | 43 testSuite = new TestSuite(argc, argv); |
| 46 } | 44 } |
| 47 | 45 |
| 48 int RunAllUnitTests() | 46 int RunAllUnitTests() |
| 49 { | 47 { |
| 50 int result = testSuite->Run(); | 48 int result = testSuite->Run(); |
| 51 | 49 |
| 52 return result; | 50 return result; |
| 53 } | 51 } |
| 54 | 52 |
| 55 void DeleteTestSuite() | 53 void DeleteTestSuite() |
| 56 { | 54 { |
| 57 delete testSuite; | 55 delete testSuite; |
| 58 testSuite = 0; | 56 testSuite = 0; |
| 59 } | 57 } |
| 60 | 58 |
| 61 } // namespace blink | 59 } // namespace blink |
| OLD | NEW |