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.

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: 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

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..fe8a7594fd49938480b92f1fc0b56d501e96fb67 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() {

+// -*- mode: js2 -*-

dpapad 2011/11/03 16:14:34 Is this needed? If so what does it mean?

Sheridan Rawlins 2011/11/05 16:51:25 It was an emacs thing; not needed/desired. Remove

+// 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

+ */

+function PrintPreviewUtilsUnitTest () {}

+PrintPreviewUtilsUnitTest.prototype = {

+ __proto__: testing.Test.prototype,

+ /** @inheritDoc */

+ addLibraries: [

arv (Not doing code reviews) 2011/11/03 19:04:12 addLibraries is not the right name for this. addLi

Sheridan Rawlins 2011/11/05 16:51:25 How's |extraLibraries| ? Done. On 2011/11/03 19:

+ 'print_preview_utils.js',

+ ],

+};

+TEST_F('PrintPreviewUtilsUnitTest', 'testIsInteger', 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', 'testIsPositiveInteger', function() {

dpapad 2011/11/03 16:14:34 Nit: Shouldn't all the test names start with a cap

Sheridan Rawlins 2011/11/05 16:51:25 Done.

assertTrue(isPositiveInteger("100"));

assertTrue(isPositiveInteger("0055"));

assertFalse(isPositiveInteger("0"));

assertFalse(isPositiveInteger("-100"));

assertFalse(isPositiveInteger("sdfs"));

+});

-function testAreArraysEqual() {

+TEST_F('PrintPreviewUtilsUnitTest', 'testAreArraysEqual', 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', 'testRemoveDuplicates', 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', 'testIsPageRangeTextValid1', 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', 'testIsPageRangeTextValid2', 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', 'testPageRangeTextToPageList', 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', 'testPageListToPageSet', 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', 'testPageSetToPageRanges', 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>

+});

« no previous file with comments | « chrome/browser/resources/print_preview/print_preview_utils_test.html ('k') | chrome/chrome_tests.gypi » ('j') | chrome/test/base/js2gtest.js » ('J')