tools/grit/grit/format/resource_map_unittest.py - Issue 1549263002: Switch to standard integer types in tools/grit/.

Unified Diff: tools/grit/grit/format/resource_map_unittest.py

Issue 1549263002: Switch to standard integer types in tools/grit/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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

Index: tools/grit/grit/format/resource_map_unittest.py

diff --git a/tools/grit/grit/format/resource_map_unittest.py b/tools/grit/grit/format/resource_map_unittest.py

index 55de504b9442aefb48900e86961eea25b05371d9..f0eb72d55152f97c862f64ea68994d21b49a3400 100755

--- a/tools/grit/grit/format/resource_map_unittest.py

+++ b/tools/grit/grit/format/resource_map_unittest.py

@@ -68,7 +68,8 @@ extern const size_t kTheRcHeaderSize;''', output)

resource_map.GetFormatter('resource_map_source')(grd, 'en', '.')))

self.assertEqual('''\

#include "the_resource_map_header.h"

-#include "base/basictypes.h"

+#include <stddef.h>

+#include "base/macros.h"

#include "the_rc_header.h"

const GritResourceMap kTheRcHeader[] = {

{"IDC_KLONKMENU", IDC_KLONKMENU},

@@ -82,7 +83,8 @@ const size_t kTheRcHeaderSize = arraysize(kTheRcHeader);''', output)

resource_map.GetFormatter('resource_file_map_source')(grd, 'en', '.')))

self.assertEqual('''\

#include "the_resource_map_header.h"

-#include "base/basictypes.h"

+#include <stddef.h>

+#include "base/macros.h"

#include "the_rc_header.h"

const GritResourceMap kTheRcHeader[] = {

{"grit/testdata/klonk.rc", IDC_KLONKMENU},

@@ -136,7 +138,8 @@ extern const size_t kTheRcHeaderSize;''', output)

resource_map.GetFormatter('resource_map_source')(grd, 'en', '.')))

self.assertEqual('''\

#include "the_resource_map_header.h"

-#include "base/basictypes.h"

+#include <stddef.h>

+#include "base/macros.h"

#include "the_rc_header.h"

const GritResourceMap kTheRcHeader[] = {

{"IDR_KLONKMENU", IDR_KLONKMENU},

@@ -146,7 +149,8 @@ const size_t kTheRcHeaderSize = arraysize(kTheRcHeader);''', output)

resource_map.GetFormatter('resource_map_source')(grd, 'en', '.')))

self.assertEqual('''\

#include "the_resource_map_header.h"

-#include "base/basictypes.h"

+#include <stddef.h>

+#include "base/macros.h"

#include "the_rc_header.h"

const GritResourceMap kTheRcHeader[] = {

{"IDR_KLONKMENU", IDR_KLONKMENU},

@@ -196,7 +200,8 @@ extern const size_t kTheRcHeaderSize;''', output)

resource_map.GetFormatter('resource_map_source')(grd, 'en', '.')))

self.assertEqual('''\

#include "the_resource_map_header.h"

-#include "base/basictypes.h"

+#include <stddef.h>

+#include "base/macros.h"

#include "the_rc_header.h"

const GritResourceMap kTheRcHeader[] = {

{"IDC_KLONKMENU", IDC_KLONKMENU},

@@ -208,7 +213,8 @@ const size_t kTheRcHeaderSize = arraysize(kTheRcHeader);''', output)

resource_map.GetFormatter('resource_file_map_source')(grd, 'en', '.')))

self.assertEqual('''\

#include "the_resource_map_header.h"

-#include "base/basictypes.h"

+#include <stddef.h>

+#include "base/macros.h"

#include "the_rc_header.h"

const GritResourceMap kTheRcHeader[] = {

{"grit/testdata/klonk.rc", IDC_KLONKMENU},

@@ -266,7 +272,8 @@ extern const size_t kTheRcHeaderSize;''', output)

resource_map.GetFormatter('resource_map_source')(grd, 'en', '.')))

self.assertEqual('''\

#include "the_rc_map_header.h"

-#include "base/basictypes.h"

+#include <stddef.h>

+#include "base/macros.h"

#include "the_rc_header.h"

const GritResourceMap kTheRcHeader[] = {

{"IDS_PRODUCT_NAME", IDS_PRODUCT_NAME},

« no previous file with comments | « tools/grit/grit/format/resource_map.py ('k') | no next file » | no next file with comments »