Bug 1299201 - TestStringUtils: Remove unneeded Assert prefix. r?grisha draft
authorSebastian Kaspari <s.kaspari@gmail.com>
Tue, 11 Oct 2016 11:25:50 +0200
changeset 423605 c6c82bb3dcf0205ab18883933936158b99ba969c
parent 423604 7ae377917236b7e6111146aa9fb4c073c0efc7f4
child 423606 fec309b0703e0ab8e0642c7365d0425dde43d211
child 424151 85128cd4e65dd029df7f6248149ebe8a522c0f05
push id31945
push users.kaspari@gmail.com
push dateTue, 11 Oct 2016 12:27:19 +0000
reviewersgrisha
bugs1299201
milestone52.0a1
Bug 1299201 - TestStringUtils: Remove unneeded Assert prefix. r?grisha MozReview-Commit-ID: LdxMX8cEU9e
mobile/android/tests/background/junit4/src/org/mozilla/gecko/util/TestStringUtils.java
--- 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");