Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4733)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java

Issue 771903003: Updated the omnibox on Android to color URLs correctly (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@url_coloring_unittests
Patch Set: Fixed small bug in testShortSecureHTTPSUrlWithLightColors Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
index bfaf8c8faa2822398d9170fb64ebddbb6974e9f2..a4909e3e8803b48981031e3f8372fe4cb9d68f31 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
@@ -92,20 +92,24 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
assertEquals("Unexpected span contents:", contents, getContents());
assertEquals("Unexpected starting index for '" + contents + "' span:", startIndex,
getStartIndex());
- assertEquals("Unexpected ending index for scheme span:", startIndex + contents.length(),
+ assertEquals("Unexpected ending index for '" + contents + "' span:",
+ startIndex + contents.length(),
getEndIndex());
- assertEquals("Unexpected class for scheme span:", "UrlEmphasisColorSpan",
+ assertEquals("Unexpected class for '" + contents + "' span:", "UrlEmphasisColorSpan",
getClassName());
- assertEquals("Unexpected color for scheme span:", color, getColorForColoredSpan());
+ assertEquals("Unexpected color for '" + contents + "' span:", color,
+ getColorForColoredSpan());
}
public void assertIsStrikethroughSpan(String contents, int startIndex) {
assertEquals("Unexpected span contents:", contents, getContents());
assertEquals("Unexpected starting index for '" + contents + "' span:", startIndex,
getStartIndex());
- assertEquals("Unexpected ending index for scheme span:", startIndex + contents.length(),
+ assertEquals("Unexpected ending index for '" + contents + "' span:",
+ startIndex + contents.length(),
getEndIndex());
- assertEquals("Unexpected class for scheme span:", "UrlEmphasisSecurityErrorSpan",
+ assertEquals("Unexpected class for '" + contents + "' span:",
+ "UrlEmphasisSecurityErrorSpan",
getClassName());
}
}
@@ -128,11 +132,11 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
spans[0].assertIsColoredSpan("https", 0,
mResources.getColor(R.color.url_emphasis_start_scheme_secure));
spans[1].assertIsColoredSpan("://", 5,
- mResources.getColor(R.color.url_emphasis_scheme_to_domain));
+ mResources.getColor(R.color.url_emphasis_non_emphasized_text));
spans[2].assertIsColoredSpan("www.google.com", 8,
mResources.getColor(R.color.url_emphasis_domain_and_registry));
spans[3].assertIsColoredSpan("/", 22,
- mResources.getColor(R.color.url_emphasis_trailing_url));
+ mResources.getColor(R.color.url_emphasis_non_emphasized_text));
}
/**
@@ -153,11 +157,11 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
spans[0].assertIsColoredSpan("https", 0,
mResources.getColor(R.color.url_emphasis_start_scheme_secure));
spans[1].assertIsColoredSpan("://", 5,
- mResources.getColor(R.color.url_emphasis_scheme_to_domain));
+ mResources.getColor(R.color.url_emphasis_light_non_emphasized_text));
spans[2].assertIsColoredSpan("www.google.com", 8,
mResources.getColor(R.color.url_emphasis_light_domain_and_registry));
spans[3].assertIsColoredSpan("/", 22,
- mResources.getColor(R.color.url_emphasis_trailing_url));
+ mResources.getColor(R.color.url_emphasis_light_non_emphasized_text));
}
/**
@@ -180,11 +184,11 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
spans[1].assertIsColoredSpan("https", 0,
mResources.getColor(R.color.url_emphasis_start_scheme_security_error));
spans[2].assertIsColoredSpan("://", 5,
- mResources.getColor(R.color.url_emphasis_scheme_to_domain));
+ mResources.getColor(R.color.url_emphasis_non_emphasized_text));
spans[3].assertIsColoredSpan("www.google.com", 8,
mResources.getColor(R.color.url_emphasis_domain_and_registry));
spans[4].assertIsColoredSpan("/q?query=abc123&results=1", 22,
- mResources.getColor(R.color.url_emphasis_trailing_url));
+ mResources.getColor(R.color.url_emphasis_non_emphasized_text));
}
/**
@@ -205,7 +209,7 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
spans[0].assertIsColoredSpan("https", 0,
mResources.getColor(R.color.url_emphasis_start_scheme_security_warning));
spans[1].assertIsColoredSpan("://", 5,
- mResources.getColor(R.color.url_emphasis_scheme_to_domain));
+ mResources.getColor(R.color.url_emphasis_non_emphasized_text));
spans[2].assertIsColoredSpan("www.dodgysite.com", 8,
mResources.getColor(R.color.url_emphasis_domain_and_registry));
}
@@ -226,9 +230,9 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
assertEquals("Unexpected number of spans:", 3, spans.length);
spans[0].assertIsColoredSpan("about", 0,
- mResources.getColor(R.color.url_emphasis_trailing_url));
+ mResources.getColor(R.color.url_emphasis_non_emphasized_text));
spans[1].assertIsColoredSpan(":", 5,
- mResources.getColor(R.color.url_emphasis_scheme_to_domain));
+ mResources.getColor(R.color.url_emphasis_non_emphasized_text));
spans[2].assertIsColoredSpan("blank", 6,
mResources.getColor(R.color.url_emphasis_domain_and_registry));
}
@@ -250,7 +254,7 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
assertEquals("Unexpected number of spans:", 1, spans.length);
spans[0].assertIsColoredSpan("data", 0,
- mResources.getColor(R.color.url_emphasis_trailing_url));
+ mResources.getColor(R.color.url_emphasis_non_emphasized_text));
}
/**
@@ -269,9 +273,9 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
assertEquals("Unexpected number of spans:", 3, spans.length);
spans[0].assertIsColoredSpan("chrome", 0,
- mResources.getColor(R.color.url_emphasis_scheme_to_domain));
+ mResources.getColor(R.color.url_emphasis_non_emphasized_text));
spans[1].assertIsColoredSpan("://", 6,
- mResources.getColor(R.color.url_emphasis_scheme_to_domain));
+ mResources.getColor(R.color.url_emphasis_non_emphasized_text));
spans[2].assertIsColoredSpan("bookmarks", 9,
mResources.getColor(R.color.url_emphasis_domain_and_registry));
}
@@ -292,9 +296,9 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
assertEquals("Unexpected number of spans:", 3, spans.length);
spans[0].assertIsColoredSpan("chrome-native", 0,
- mResources.getColor(R.color.url_emphasis_scheme_to_domain));
+ mResources.getColor(R.color.url_emphasis_non_emphasized_text));
spans[1].assertIsColoredSpan("://", 13,
- mResources.getColor(R.color.url_emphasis_scheme_to_domain));
+ mResources.getColor(R.color.url_emphasis_non_emphasized_text));
spans[2].assertIsColoredSpan("bookmarks", 16,
mResources.getColor(R.color.url_emphasis_domain_and_registry));
}
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698