Bug 1299201 - TestStringUtils: Remove unneeded Assert prefix. r?grisha
MozReview-Commit-ID: LdxMX8cEU9e
--- a/mobile/android/tests/background/junit4/src/org/mozilla/gecko/util/TestStringUtils.java
+++ b/mobile/android/tests/background/junit4/src/org/mozilla/gecko/util/TestStringUtils.java
@@ -1,53 +1,51 @@
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko.util;
-import junit.framework.Assert;
-
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mozilla.gecko.background.testhelpers.TestRunner;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@RunWith(TestRunner.class)
public class TestStringUtils {
@Test
public void testIsHttpOrHttps() {
// No value
- Assert.assertFalse(StringUtils.isHttpOrHttps(null));
- Assert.assertFalse(StringUtils.isHttpOrHttps(""));
+ assertFalse(StringUtils.isHttpOrHttps(null));
+ assertFalse(StringUtils.isHttpOrHttps(""));
// Garbage
- Assert.assertFalse(StringUtils.isHttpOrHttps("lksdjflasuf"));
+ assertFalse(StringUtils.isHttpOrHttps("lksdjflasuf"));
// URLs with http/https
assertTrue(StringUtils.isHttpOrHttps("https://www.google.com"));
assertTrue(StringUtils.isHttpOrHttps("http://www.facebook.com"));
assertTrue(StringUtils.isHttpOrHttps("https://mozilla.org/en-US/firefox/products/"));
// IP addresses
assertTrue(StringUtils.isHttpOrHttps("https://192.168.0.1"));
assertTrue(StringUtils.isHttpOrHttps("http://63.245.215.20/en-US/firefox/products"));
// Other protocols
- Assert.assertFalse(StringUtils.isHttpOrHttps("ftp://people.mozilla.org"));
- Assert.assertFalse(StringUtils.isHttpOrHttps("javascript:window.google.com"));
- Assert.assertFalse(StringUtils.isHttpOrHttps("tel://1234567890"));
+ assertFalse(StringUtils.isHttpOrHttps("ftp://people.mozilla.org"));
+ assertFalse(StringUtils.isHttpOrHttps("javascript:window.google.com"));
+ assertFalse(StringUtils.isHttpOrHttps("tel://1234567890"));
// No scheme
- Assert.assertFalse(StringUtils.isHttpOrHttps("google.com"));
- Assert.assertFalse(StringUtils.isHttpOrHttps("git@github.com:mozilla/gecko-dev.git"));
+ assertFalse(StringUtils.isHttpOrHttps("google.com"));
+ assertFalse(StringUtils.isHttpOrHttps("git@github.com:mozilla/gecko-dev.git"));
}
@Test
public void testStripRef() {
assertEquals(StringUtils.stripRef(null), null);
assertEquals(StringUtils.stripRef(""), "");
assertEquals(StringUtils.stripRef("??AAABBBCCC"), "??AAABBBCCC");