Docserver manifest follow up (rewrite)

chrome/common/extensions/docs/server2/manifest_data_source_test.py

Index: chrome/common/extensions/docs/server2/manifest_data_source_test.py
diff --git a/chrome/common/extensions/docs/server2/manifest_data_source_test.py b/chrome/common/extensions/docs/server2/manifest_data_source_test.py
index 3a4f754f18dd809d3f651196971d2bbf4d7e697e..04fd8260546a9a6d476fc604714e3701f07705a7 100755
--- a/chrome/common/extensions/docs/server2/manifest_data_source_test.py
+++ b/chrome/common/extensions/docs/server2/manifest_data_source_test.py
@@ -6,95 +6,96 @@
 from copy import deepcopy
 import unittest
 
+from features_model import Feature
 import manifest_data_source
 
 convert_and_annotate_docs = {
-  'name': {
+  'name': Feature({
     'example': "My {{title}}",
     'name': 'name',
     'level': 'required'
-  },
-  'doc2': {
+  }),
+  'doc2': Feature({
     'level': 'required',
     'name': 'doc2'
-  },
-  'doc1': {
+  }),
+  'doc1': Feature({
     'level': 'required',
     'name': 'doc1',
     'children': {
-      'sub1': {
+      'sub1': Feature({
         'annotations': ['not so important'],
         'level': 'optional',
         'name': 'sub1'
-      },
-      'sub2': {
+      }),
+      'sub2': Feature({
         'level': 'required',
         'name': 'sub2'
-      }
+      })
     }
-  },
-  'doc3': {
+  }),
+  'doc3': Feature({
     'level':  'only_one',
     'name': 'doc3'
-  },
-  'doc4': {
+  }),
+  'doc4': Feature({
     'level': 'recommended',
     'name': 'doc4'
-  },
-  'doc5': {
+  }),
+  'doc5': Feature({
     'level': 'only_one',
     'name': 'doc5'
-  },
-  'doc6': {
+  }),
+  'doc6': Feature({
     'level': 'optional',
     'name': 'doc6'
-  }
+  })
 }
 
 class ManifestDataSourceTest(unittest.TestCase):
   def testConvertAndSortDocs(self):
     expected_docs = [
-      {
+      Feature({
         'level': 'required',
         'name': 'doc1',
         'children': [
-          {
+          Feature({
             'level': 'required',
             'name': 'sub2'
-          },
-          {
+          }),
+          Feature({
             'annotations': ['not so important'],
             'level': 'optional',
             'name': 'sub1'
-          }
+          })
         ]
-      },
-      {
+      }),
+      Feature({
         'level': 'required',
         'name': 'doc2'
-      },
-      {
+      }),
+      Feature({
         'level': 'required',
         'example': '"My App"',
         'has_example': True,
         'name': 'name'
-      },
-      {
+      }),
+      Feature({
         'level': 'recommended',
         'name': 'doc4'
-      },
-      {
+      }),
+      Feature({
         'level': 'only_one',
         'name': 'doc3'
-      },
-      {
+      }),
+      Feature({
         'level': 'only_one',
         'name': 'doc5'
-      },
-      {
+      }),
+      Feature({
         'level': 'optional',
         'name': 'doc6'
-      }
+      })
     ]
 
     self.assertEqual(expected_docs, manifest_data_source._ListifyAndSortDocs(
@@ -102,52 +103,52 @@ class ManifestDataSourceTest(unittest.TestCase):
 
   def testAnnotate(self):
     expected_docs = [
-      {
+      Feature({
         'level': 'required',
         'name': 'doc1',
         'children': [
-          {
+          Feature({
             'level': 'required',
             'name': 'sub2'
-          },
-          {
+          }),
+          Feature({
             'annotations': ['Optional', 'not so important'],
             'level': 'optional',
             'name': 'sub1',
             'is_last': True
-          }
+          })
         ]
-      },
-      {
+      }),
+      Feature({
         'level': 'required',
         'name': 'doc2'
-      },
-      {
+      }),
+      Feature({
         'name': 'name',
         'level': 'required',
         'example': '"My App"',
         'has_example': True
-      },
-      {
+      }),
+      Feature({
         'annotations': ['Recommended'],
         'level': 'recommended',
         'name': 'doc4'
-      },
-      {
+      }),
+      Feature({
         'annotations': ['Pick one (or none)'],
         'level': 'only_one',
         'name': 'doc3'
-      },
-      {
+      }),
+      Feature({
         'level': 'only_one',
         'name': 'doc5'
-      },
-      {
+      }),
+      Feature({
         'annotations': ['Optional'],
         'level': 'optional',
         'name': 'doc6',
         'is_last': True
-      }
+      })
     ]
 
     annotated = manifest_data_source._ListifyAndSortDocs(
@@ -157,43 +158,43 @@ class ManifestDataSourceTest(unittest.TestCase):
 
   def testRestructureChildren(self):
     docs = {
-      'doc1.sub2': {
+      'doc1.sub2': Feature({
         'name': 'doc1.sub2'
-      },
-      'doc1': {
+      }),
+      'doc1': Feature({
         'name': 'doc1'
-      },
-      'doc2': {
+      }),
+      'doc2': Feature({
         'name': 'doc2'
-      },
-      'doc1.sub1.subsub1': {
+      }),
+      'doc1.sub1.subsub1': Feature({
         'name': 'doc1.sub1.subsub1'
-      },
-      'doc1.sub1': {
+      }),
+      'doc1.sub1': Feature({
         'name': 'doc1.sub1'
-      }
+      })
     }
 
     expected_docs = {
-      'doc1': {
+      'doc1': Feature({
         'name': 'doc1',
         'children': {
-          'sub1': {
+          'sub1': Feature({
             'name': 'sub1',
             'children': {
-              'subsub1': {
+              'subsub1': Feature({
                 'name' :'subsub1'
-              }
+              })
             }
-          },
-          'sub2': {
+          }),
+          'sub2': Feature({
             'name': 'sub2'
-          }
+          })
         }
-      },
-      'doc2': {
+      }),
+      'doc2': Feature({
         'name': 'doc2'
-      }
+      })
     }
 
     self.assertEqual(