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

Unified Diff: javatests/org/chromium/distiller/PageParameterDetectorTest.java

Issue 1029593003: implement validations of pagination URLs (Closed) Base URL: https://github.com/chromium/dom-distiller.git@master
Patch Set: copyright 2016 -> 2015 Created 5 years, 8 months 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
Index: javatests/org/chromium/distiller/PageParameterDetectorTest.java
diff --git a/javatests/org/chromium/distiller/PageParameterDetectorTest.java b/javatests/org/chromium/distiller/PageParameterDetectorTest.java
index e545ff07fe2080f52d36473c908b9628cac95525..e31cf0cf37028713793b7613d7e21fddbb1c1d0d 100644
--- a/javatests/org/chromium/distiller/PageParameterDetectorTest.java
+++ b/javatests/org/chromium/distiller/PageParameterDetectorTest.java
@@ -1,60 +1,100 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.distiller;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
public class PageParameterDetectorTest extends DomDistillerJsTestCase {
- public void testIsLastNumericPathComponentBad() {
- // Path component is not numeric i.e. contains non-digits.
- String url = "http://www.foo.com/a2";
- int digitStart = url.indexOf("2");
- assertFalse(PageParameterDetector.isLastNumericPathComponentBad(url, 18, digitStart,
- digitStart + 1));
-
- // Numeric path component is first.
- url = "http://www.foo.com/2";
- digitStart = url.indexOf("2");
- assertFalse(PageParameterDetector.isLastNumericPathComponentBad(url, 18, digitStart,
- digitStart + 1));
-
- // Numeric path component follows a path component that is not a bad page param name.
- url = "http://www.foo.com/good/2";
- digitStart = url.indexOf("2");
- assertFalse(PageParameterDetector.isLastNumericPathComponentBad(url, 18, digitStart,
- digitStart + 1));
-
- // Numeric path component follows a path component that is a bad page param name.
- url = "http://www.foo.com/wiki/2";
- digitStart = url.indexOf("2");
- assertTrue(PageParameterDetector.isLastNumericPathComponentBad(url, 18, digitStart,
- digitStart + 1));
-
- // (s)htm(l) extension doesn't follow digit.
- url = "http://www.foo.com/2a";
- digitStart = url.indexOf("2");
- assertFalse(PageParameterDetector.isLastNumericPathComponentBad(url, 18, digitStart,
- digitStart + 1));
-
- // .htm follows digit, previous path component is not a bad page param name.
- url = "http://www.foo.com/good/2.htm";
- digitStart = url.indexOf("2");
- assertFalse(PageParameterDetector.isLastNumericPathComponentBad(url, 18, digitStart,
- digitStart + 1));
-
- // .html follows digit, previous path component is a bad page param name.
- url = "http://www.foo.com/wiki/2.html";
- digitStart = url.indexOf("2");
- assertTrue(PageParameterDetector.isLastNumericPathComponentBad(url, 18, digitStart,
- digitStart + 1));
-
- // .shtml follows digit, previous path component is not a bad page param name, but the one
- // before that is.
- url = "http://www.foo.com/wiki/good/2.shtml";
- digitStart = url.indexOf("2");
- assertFalse(PageParameterDetector.isLastNumericPathComponentBad(url, 18, digitStart,
- digitStart + 1));
+ public void testArePageNumsAdjacentAndConsecutive() {
+ {
+ final int[] allNums = { 1, 2 };
+ final int[] selectedNums = { 1, 2 };
+ int result = arePageNumsAdjacentAndConsecutive(selectedNums, allNums);
+ assertTrue(isAdjacent(result));
+ assertTrue(isConsecutive(result));
+ }
+ {
+ final int[] allNums = { 1, 2, 3 };
+ final int[] selectedNums = { 2, 3 };
+ int result = arePageNumsAdjacentAndConsecutive(selectedNums, allNums);
+ assertTrue(isAdjacent(result));
+ assertTrue(isConsecutive(result));
+ }
+ {
+ final int[] allNums = { 1, 5, 6, 7, 10 };
+ final int[] selectedNums = { 1, 5, 7, 10 };
+ int result = arePageNumsAdjacentAndConsecutive(selectedNums, allNums);
+ assertTrue(isAdjacent(result));
+ assertTrue(isConsecutive(result));
+ }
+ {
+ final int[] allNums = { 10, 25, 50 };
+ final int[] selectedNums = { 10, 25, 50 }; // No consecutive pairs.
+ int result = arePageNumsAdjacentAndConsecutive(selectedNums, allNums);
+ assertTrue(isAdjacent(result));
+ assertFalse(isConsecutive(result));
+ }
+ {
+ final int[] allNums = { 23, 24, 30 };
+ // This list doesn't satisfy consecutive rule. There should be "22" on the left of "23",
+ // or "25" on the right of "24", or "29" on the left of "30".
+ final int[] selectedNums = { 23, 24, 30 };
+ int result = arePageNumsAdjacentAndConsecutive(selectedNums, allNums);
+ assertTrue(isAdjacent(result));
+ assertFalse(isConsecutive(result));
+ }
+ {
+ final int[] allNums = { 1, 2, 3, 4, 5 };
+ final int[] selectedNums = { 1, 3, 5 }; // Two gaps.
+ int result = arePageNumsAdjacentAndConsecutive(selectedNums, allNums);
+ assertFalse(isAdjacent(result));
+ assertFalse(isConsecutive(result));
+ }
+ {
+ final int[] allNums = { 2, 3, 4, 5 };
+ final int[] selectedNums = { 2, 5 }; // A gap of 2 numbers.
+ int result = arePageNumsAdjacentAndConsecutive(selectedNums, allNums);
+ assertFalse(isAdjacent(result));
+ assertFalse(isConsecutive(result));
+ }
+ }
+
+ private static int arePageNumsAdjacentAndConsecutive(int[] selectedNums, int[] allNums) {
+ List<PageParamInfo.PageInfo> ascendingNumbers = new ArrayList<PageParamInfo.PageInfo>();
+ Map<Integer, Integer> numberToPos = new HashMap<Integer, Integer>();
+
+ for (int i = 0; i < allNums.length; i++) {
+ final int number = allNums[i];
+ numberToPos.put(number, i);
+ ascendingNumbers.add(new PageParamInfo.PageInfo(number, ""));
+ }
+
+ List<PageParameterDetector.LinkInfo> allLinkInfo =
+ new ArrayList<PageParameterDetector.LinkInfo>();
+ for (int i = 0; i < selectedNums.length; i++) {
+ final int number = selectedNums[i];
+ allLinkInfo.add(new PageParameterDetector.LinkInfo(number, number,
+ numberToPos.get(number)));
+ }
+
+ return PageParameterDetector.arePageNumsAdjacentAndConsecutive(allLinkInfo,
+ ascendingNumbers);
+ }
+
+ private static boolean isAdjacent(int result) {
+ return (result & PageParameterDetector.PAGE_NUM_ADJACENT_MASK) ==
+ PageParameterDetector.PAGE_NUM_ADJACENT_MASK;
+ }
+
+ private static boolean isConsecutive(int result) {
+ return (result & PageParameterDetector.PAGE_NUM_CONSECUTIVE_MASK) ==
+ PageParameterDetector.PAGE_NUM_CONSECUTIVE_MASK;
}
}

Powered by Google App Engine
This is Rietveld 408576698