change charm store data structures

test/test_charm_store.js

 'use strict';
 
 (function() {
 
   describe('juju charm store', function() {
     var Y, models, conn, env, app, container, charm_store, data, juju;
 
     before(function(done) {
       Y = YUI(GlobalConfig).use(
           'datasource-local', 'json-stringify', 'juju-charm-store',
-          'datasource-io', 'io', 'array-extras',
+          'datasource-io', 'io', 'array-extras', 'juju-charm-models',
           function(Y) {
             juju = Y.namespace('juju');
+            models = Y.namespace('juju.models');
             done();
           });
     });
 
     beforeEach(function() {
       data = [];
       charm_store = new juju.CharmStore(
           {datasource: new Y.DataSource.Local({source: data})});
     });
 
@@ skipping 77 matching lines @@
 
     it('processes and orders search text requests properly', function(done) {
       // This is data from
       // http://jujucharms.com/search/json?search_text=cassandra .
       data.push(Y.io('data/search_results.json', {sync: true}));
       charm_store.find('cassandra',
           { success: function(results) {
             results.length.should.equal(2);
             results[0].series.should.equal('precise');
             Y.Array.map(results[0].charms, function(charm) {
-              return charm.owner;
-            }).should.eql([null, 'jjo', 'ev', 'ev', 'ev']);
+              return charm.get('owner');
+            }).should.eql([undefined, 'jjo', 'ev', 'ev', 'ev']);
             Y.Array.map(results[0].charms, function(charm) {
-              return charm.baseId;
+              return charm.get('id');
             }).should.eql([
-              'cs:precise/cassandra',
-              'cs:~jjo/precise/cassandra',
-              'cs:~ev/precise/errors',
-              'cs:~ev/precise/daisy',
-              'cs:~ev/precise/daisy-retracer']);
+              'cs:precise/cassandra-2',
+              'cs:~jjo/precise/cassandra-12',
+              'cs:~ev/precise/errors-0',
+              'cs:~ev/precise/daisy-15',
+              'cs:~ev/precise/daisy-retracer-8']);
             done();
           },
-          failure: assert.fail
+          failure: assert.fail,
+          list: new models.CharmList()
           });
     });
 
     it('honors defaultSeries in sorting search results', function(done) {
       // This is data from
       // http://jujucharms.com/search/json?search_text=cassandra .
       data.push(Y.io('data/search_results.json', {sync: true}));
       charm_store.find('cassandra',
           { defaultSeries: 'oneiric',
             success: function(results) {
               results.length.should.equal(2);
               results[0].series.should.equal('oneiric');
               done();
             },
-            failure: assert.fail
+            failure: assert.fail,
+            list: new models.CharmList()
           });
     });
 
     it('processes and orders search series requests properly', function(done) {
       // This is data from
       // http://jujucharms.com/search/json [CONTINUED ON NEXT LINE]
       // ?search_text=series:quantal+owner:charmers .
       data.push(Y.io('data/series_search_results.json', {sync: true}));
       charm_store.find('cassandra',
           { success: function(results) {
             results.length.should.equal(1);
             results[0].series.should.equal('quantal');
             Y.Array.map(results[0].charms, function(charm) {
-              return charm.name;
+              return charm.get('package_name');
             }).should.eql([
               'glance',
               'nova-cloud-controller',
               'nova-compute',
               'nova-volume',
               'nyancat']);
             done();
           },
-          failure: assert.fail
+          failure: assert.fail,
+          list: new models.CharmList()
           });
     });
-
   });
 })();