| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 package org.chromium.chrome.testshell; | 5 package org.chromium.chrome.testshell; |
| 6 | 6 |
| 7 import org.chromium.base.test.DisabledTest; | 7 import org.chromium.base.test.util.DisabledTest; |
| 8 | |
| 9 import org.chromium.chrome.testshell.ChromiumTestShellActivity; | |
| 10 import org.chromium.chrome.testshell.ChromiumTestShellTestBase; | |
| 11 | 8 |
| 12 // TODO(dtrainor): Once some other tests are integrated to this directory remove
this. | 9 // TODO(dtrainor): Once some other tests are integrated to this directory remove
this. |
| 13 public class DummyIntegrationTest extends ChromiumTestShellTestBase { | 10 public class DummyIntegrationTest extends ChromiumTestShellTestBase { |
| 14 // URL used for base tests. | 11 // URL used for base tests. |
| 15 private static final String URL = "data:text"; | 12 private static final String URL = "data:text"; |
| 16 | 13 |
| 17 @DisabledTest | 14 @DisabledTest |
| 18 public void testDummyChromiumTestShellStartup() throws Exception { | 15 public void testDummyChromiumTestShellStartup() throws Exception { |
| 19 ChromiumTestShellActivity activity = launchChromiumTestShellWithUrl(URL)
; | 16 ChromiumTestShellActivity activity = launchChromiumTestShellWithUrl(URL)
; |
| 20 | 17 |
| 21 // Make sure the activity was created as expected. | 18 // Make sure the activity was created as expected. |
| 22 assertNotNull(activity); | 19 assertNotNull(activity); |
| 23 } | 20 } |
| 24 } | 21 } |
| OLD | NEW |