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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/print_preview/print_preview_utils_unittest.gtestjs

Issue 8438063: Make it possible to include another file and port print_preview unit test to unit_tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Made cp.py script since it's fairly general. Created 9 years, 1 month 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
« build/cp.py ('K') | « chrome/browser/resources/print_preview/print_preview_utils_test.html ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/print_preview/print_preview_utils_unittest.gtestjs
diff --git a/chrome/browser/resources/print_preview/print_preview_utils_test.html b/chrome/browser/resources/print_preview/print_preview_utils_unittest.gtestjs
similarity index 74%
rename from chrome/browser/resources/print_preview/print_preview_utils_test.html
rename to chrome/browser/resources/print_preview/print_preview_utils_unittest.gtestjs
index 58994ed0ac04a0b423a427a5c2667a6341bcf125..620fcfbb02bf0fcaa590efaf8636df8867da2460 100644
--- a/chrome/browser/resources/print_preview/print_preview_utils_test.html
+++ b/chrome/browser/resources/print_preview/print_preview_utils_unittest.gtestjs
@@ -1,17 +1,24 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>print_preview_utils.js tests</title>
-<script src="http://closure-library.googlecode.com/svn/trunk/closure/goog/base.js"></script>
-<script src="print_preview_utils.js"></script>
-<script>
-goog.require('goog.testing.jsunit');
-</script>
-</head>
-<body>
-<script>
-
-function testIsInteger() {
+// Copyright (c) 2011 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.
+
+/**
+ * Test fixture for print preview utils.
+ * @constructor
+ * @extends {testing.Test}
+ */
+function PrintPreviewUtilsUnitTest () {}
+
+PrintPreviewUtilsUnitTest.prototype = {
+ __proto__: testing.Test.prototype,
+
+ /** @inheritDoc */
+ extraLibraries: [
+ 'print_preview_utils.js',
+ ],
+};
+
+TEST_F('PrintPreviewUtilsUnitTest', 'IsInteger', function() {
assertFalse(isInteger(" abc "));
assertFalse(isInteger("-7"));
assertFalse(isInteger("7.0"));
@@ -20,31 +27,31 @@ function testIsInteger() {
assertTrue(isInteger("0"));
assertTrue(isInteger(" 100 "));
assertTrue(isInteger("0055 "));
-}
+});
-function testIsPositiveInteger() {
+TEST_F('PrintPreviewUtilsUnitTest', 'IsPositiveInteger', function() {
assertTrue(isPositiveInteger("100"));
assertTrue(isPositiveInteger("0055"));
assertFalse(isPositiveInteger("0"));
assertFalse(isPositiveInteger("-100"));
assertFalse(isPositiveInteger("sdfs"));
-}
+});
-function testAreArraysEqual() {
+TEST_F('PrintPreviewUtilsUnitTest', 'AreArraysEqual', function() {
assertTrue(areArraysEqual([2,4,6,8,10], [2,4,6,8,10]));
assertTrue(areArraysEqual([], []));
assertFalse(areArraysEqual([2,4,6,8,10,12], [2,4,6,8,10]));
assertFalse(areArraysEqual([], [2,4,6,8,10]));
-}
+});
-function testRemoveDuplicates() {
+TEST_F('PrintPreviewUtilsUnitTest', 'RemoveDuplicates', function() {
var array1 = [1,2,2,3,6,6,6,7,9,10];
assertTrue(areArraysEqual(removeDuplicates(array1), [1,2,3,6,7,9,10]));
-}
+});
-function testIsPageRangeTextValid1() {
+TEST_F('PrintPreviewUtilsUnitTest', 'IsPageRangeTextValid1', function() {
var totalPageCount;
assertTrue(isPageRangeTextValid("1,2, 3,56,1000000", totalPageCount));
assertTrue(isPageRangeTextValid(", ,1,2,3,,1,, 56 ,", totalPageCount));
@@ -56,9 +63,9 @@ function testIsPageRangeTextValid1() {
assertFalse(isPageRangeTextValid("1,2,0,56,1000000", totalPageCount));
assertFalse(isPageRangeTextValid("-1,1,2,,56", totalPageCount));
assertFalse(isPageRangeTextValid("1,2,56-40", totalPageCount));
-}
+});
-function testIsPageRangeTextValid2() {
+TEST_F('PrintPreviewUtilsUnitTest', 'IsPageRangeTextValid2', function() {
var totalPageCount = 100;
assertTrue(isPageRangeTextValid(",,1,2,3,,1,,56,", totalPageCount));
assertTrue(isPageRangeTextValid(",1-3,,6-9,6-10,", totalPageCount));
@@ -70,9 +77,9 @@ function testIsPageRangeTextValid2() {
assertFalse(isPageRangeTextValid("-1,1,2,,56", totalPageCount));
assertFalse(isPageRangeTextValid("1,2,56-40", totalPageCount));
assertFalse(isPageRangeTextValid("101-110", totalPageCount));
-}
+});
-function testPageRangeTextToPageList() {
+TEST_F('PrintPreviewUtilsUnitTest', 'PageRangeTextToPageList', function() {
var totalPageCount = 10;
assertTrue(areArraysEqual([1,2,3,4],
pageRangeTextToPageList("1-4", totalPageCount)));
@@ -86,15 +93,15 @@ function testPageRangeTextToPageList() {
assertTrue(areArraysEqual([], pageRangeTextToPageList("1-4", undefined)));
assertTrue(areArraysEqual([],
pageRangeTextToPageList("1-abcd", totalPageCount)));
-}
+});
-function testPageListToPageSet() {
+TEST_F('PrintPreviewUtilsUnitTest', 'PageListToPageSet', function() {
assertTrue(areArraysEqual([1,2,3,4], pageListToPageSet([4,3,2,1,1,1])));
assertTrue(areArraysEqual([1,2,3,4], pageListToPageSet([1,2,2,3,4,1,1,1])));
assertTrue(areArraysEqual([], pageListToPageSet([])));
-}
+});
-function testPageSetToPageRanges() {
+TEST_F('PrintPreviewUtilsUnitTest', 'PageSetToPageRanges', function() {
var pageRanges = pageSetToPageRanges([1,2,3,7,8,9,11]);
assertEquals(pageRanges.length, 3);
assertEquals(pageRanges[0].from, 1);
@@ -103,8 +110,4 @@ function testPageSetToPageRanges() {
assertEquals(pageRanges[1].to, 9);
assertEquals(pageRanges[2].from, 11);
assertEquals(pageRanges[2].to, 11);
-}
-
-</script>
-</body>
-</html>
+});
« build/cp.py ('K') | « chrome/browser/resources/print_preview/print_preview_utils_test.html ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698