Clovis: update resource sack to use new dependency graph.

tools/android/loading/resource_sack_unittest.py

 # Copyright 2016 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.
 
 import unittest
 
 import resource_sack
 from test_utils import (MakeRequest,
-                        TestResourceGraph)
+                        TestDependencyGraph)
 
 
 class ResourceSackTestCase(unittest.TestCase):
   def SimpleGraph(self, node_names):
     """Create a simple graph from a list of nodes."""
     requests = [MakeRequest(node_names[0], 'null')]
     for n in node_names[1:]:
       requests.append(MakeRequest(n, node_names[0]))
-    return TestResourceGraph.FromRequestList(requests)
+    return TestDependencyGraph(requests)
 
   def test_NodeMerge(self):
-    g1 = TestResourceGraph.FromRequestList([
+    g1 = TestDependencyGraph([
         MakeRequest(0, 'null'),
         MakeRequest(1, 0),
         MakeRequest(2, 0),
         MakeRequest(3, 1)])
-    g2 = TestResourceGraph.FromRequestList([
+    g2 = TestDependencyGraph([
         MakeRequest(0, 'null'),
         MakeRequest(1, 0),
         MakeRequest(2, 0),
         MakeRequest(4, 2)])
     sack = resource_sack.GraphSack()
     sack.ConsumeGraph(g1)
     sack.ConsumeGraph(g2)
     self.assertEqual(5, len(sack.bags))
     for bag in sack.bags:
       if bag.label not in ('3/', '4/'):
         self.assertEqual(2, bag.num_nodes)
       else:
         self.assertEqual(1, bag.num_nodes)
 
   def test_MultiParents(self):
-    g1 = TestResourceGraph.FromRequestList([
+    g1 = TestDependencyGraph([
         MakeRequest(0, 'null'),
         MakeRequest(2, 0)])
-    g2 = TestResourceGraph.FromRequestList([
+    g2 = TestDependencyGraph([
         MakeRequest(1, 'null'),
         MakeRequest(2, 1)])
     sack = resource_sack.GraphSack()
     sack.ConsumeGraph(g1)
     sack.ConsumeGraph(g2)
     self.assertEqual(3, len(sack.bags))
     labels = {bag.label: bag for bag in sack.bags}
+    def Predecessors(label):
+      bag = labels['%s/' % label]
+      return [e.from_node
+              for e in bag._sack._graph.InEdges(bag)]
     self.assertEqual(
         set(['0/', '1/']),
-        set([bag.label for bag in labels['2/'].Predecessors()]))
-    self.assertFalse(labels['0/'].Predecessors())
-    self.assertFalse(labels['1/'].Predecessors())
+        set([bag.label for bag in Predecessors(2)]))
+    self.assertFalse(Predecessors(0))
+    self.assertFalse(Predecessors(1))
 
   def test_Shortname(self):
     root = MakeRequest(0, 'null')
     shortname = MakeRequest(1, 0)
     shortname.url = 'data:fake/content;' + 'lotsand' * 50 + 'lotsofdata'
-    g1 = TestResourceGraph.FromRequestList([root, shortname])
+    g1 = TestDependencyGraph([root, shortname])
     sack = resource_sack.GraphSack()
     sack.ConsumeGraph(g1)
     self.assertEqual(set(['0/', 'data:fake/content']),
                      set([bag.label for bag in sack.bags]))
 
   def test_Core(self):
     # We will use a core threshold of 0.5 to make it easier to define
     # graphs. Resources 0 and 1 are core and others are not.
     graphs = [self.SimpleGraph([0, 1, 2]),
               self.SimpleGraph([0, 1, 3]),
@@ skipping 28 matching lines @@
     self.assertAlmostEqual(
         0.5,
         resource_sack.GraphSack.CoreSimilarity(
             set([1, 2, 3]), set([1, 3, 4])))
     self.assertEqual(
         0, resource_sack.GraphSack.CoreSimilarity(set(), set()))
 
 
 if __name__ == '__main__':
   unittest.main()