Add support for unpacked extensions to crx_id tool.

tools/crx_id/crx_id_unittest.py

Index: tools/crx_id/crx_id_unittest.py
diff --git a/tools/crx_id/crx_id_unittest.py b/tools/crx_id/crx_id_unittest.py
index ce5d19705f338b059ee2b7d59fda13d1b43f0cdc..c9a729d82646fd8b1d111da4ebea3c98dd80d977 100755
--- a/tools/crx_id/crx_id_unittest.py
+++ b/tools/crx_id/crx_id_unittest.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 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.
 
@@ -9,28 +9,58 @@
 
 import crx_id
 import os
+import shutil
 import sys
 import unittest
+import tempfile
 
-CANNED_CRX = os.path.join(os.path.dirname(sys.argv[0]),
-                           'jebgalgnebhfojomionfpkfelancnnkf.crx')
-CRX_ID_SCRIPT = os.path.join(os.path.dirname(sys.argv[0]),
-                           'crx_id.py')
-EXPECTED_HASH_BYTES = \
-    '{0x94, 0x16, 0x0b, 0x6d, 0x41, 0x75, 0xe9, 0xec,' \
-    ' 0x8e, 0xd5, 0xfa, 0x54, 0xb0, 0xd2, 0xdd, 0xa5,' \
-    ' 0x6e, 0x05, 0x6b, 0xe8, 0x73, 0x47, 0xf6, 0xc4,' \
-    ' 0x11, 0x9f, 0xbc, 0xb3, 0x09, 0xb3, 0x5b, 0x40}'
-
-EXPECTED_APP_ID = 'jebgalgnebhfojomionfpkfelancnnkf'
+CRX_ID_DIR = os.path.dirname(sys.argv[0])
 
 class CrxIdUnittest(unittest.TestCase):
-  def testHashAppId(self):
-    """ Test that the output generated for a canned CRX. """
-    self.assertEqual(crx_id.GetCRXAppID(CANNED_CRX),
-                     EXPECTED_APP_ID)
-    self.assertEqual(crx_id.GetCRXHash(CANNED_CRX),
-                     EXPECTED_HASH_BYTES)
+
+  PACKED_CRX = os.path.join(CRX_ID_DIR,
+                            'jebgalgnebhfojomionfpkfelancnnkf.crx')
+
+  PACKED_APP_ID = 'jebgalgnebhfojomionfpkfelancnnkf'
+  PACKED_HASH_BYTES = \
+      '{0x94, 0x16, 0x0b, 0x6d, 0x41, 0x75, 0xe9, 0xec,' \
+      ' 0x8e, 0xd5, 0xfa, 0x54, 0xb0, 0xd2, 0xdd, 0xa5,' \
+      ' 0x6e, 0x05, 0x6b, 0xe8, 0x73, 0x47, 0xf6, 0xc4,' \
+      ' 0x11, 0x9f, 0xbc, 0xb3, 0x09, 0xb3, 0x5b, 0x40}'
+
+  def testPackedHashAppId(self):
+    """ Test the output generated for a canned, packed CRX. """
+    self.assertEqual(crx_id.GetCRXAppID(self.PACKED_CRX),
+                     self.PACKED_APP_ID)
+    self.assertEqual(crx_id.GetCRXHash(self.PACKED_CRX),
+                     self.PACKED_HASH_BYTES)
+
+
+  # ../../chrome/test/data/extensions/unpacked/manifest_with_key.json
+  BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(sys.argv[0])))
+  UNPACKED_TEST_DIR = os.path.join(
+      BASE_DIR,
+      'chrome', 'test', 'data', 'extensions', 'unpacked')
+  UNPACKED_APP_ID = 'cbcdidchbppangcjoddlpdjlenngjldk'
+  UNPACKED_HASH_BYTES = \
+      '{0x21, 0x23, 0x83, 0x27, 0x1f, 0xf0, 0xd6, 0x29,' \
+      ' 0xe3, 0x3b, 0xf3, 0x9b, 0x4d, 0xd6, 0x9b, 0x3a,' \
+      ' 0xff, 0x7d, 0x6b, 0xc4, 0x78, 0x30, 0x47, 0xa6,' \
+      ' 0x23, 0x12, 0x72, 0x84, 0x9b, 0x9a, 0xf6, 0x3c}'
+
+  def testUnpackedHashAppId(self):
+    """ Test the output generated for a canned, unpacked extension. """
+    temp_unpacked_crx = tempfile.mkdtemp()
+    shutil.copy2(os.path.join(self.UNPACKED_TEST_DIR,
+                              'manifest_with_key.json'),
+                 os.path.join(temp_unpacked_crx,
+                              'manifest.json'))
+    self.assertEqual(crx_id.GetCRXAppID(temp_unpacked_crx),
+                     self.UNPACKED_APP_ID)
+    self.assertEqual(crx_id.GetCRXHash(temp_unpacked_crx),
+                     self.UNPACKED_HASH_BYTES)
+    shutil.rmtree(temp_unpacked_crx)
+
 
 if __name__ == '__main__':
   unittest.main()