Remove DB.units list

test/test_model_handlers.js

 /*
 This file is part of the Juju GUI, which lets users view and manage Juju
 environments within a graphical interface (https://launchpad.net/juju-gui).
 Copyright (C) 2012-2013 Canonical Ltd.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU Affero General Public License version 3, as published by
 the Free Software Foundation.
 
 This program is distributed in the hope that it will be useful, but WITHOUT
@@ skipping 27 matching lines @@
 
 
     describe('pyDelta handler', function() {
       var pyDelta;
 
       before(function() {
         pyDelta = handlers.pyDelta;
       });
 
       it('replaces the attribute names when required', function() {
+        var django = db.services.add({id: 'django'});
         var change = {
           id: 'django/1',
           private_address: '10.0.0.1',
           'public-address': 'example.com',
           'is-subordinate': true,
           'hyphens-are-delicious': '42'
         };
         pyDelta(db, 'add', change, 'unit');
         // Retrieve the unit from the database.
-        var unit = db.units.getById('django/1');
+        var unit = django.get('units').getById('django/1');
         assert.strictEqual('10.0.0.1', unit.private_address);
         assert.strictEqual('example.com', unit.public_address);
         assert.isTrue(unit.is_subordinate);
         assert.strictEqual('42', unit.hyphens_are_delicious);
       });
 
       it('passes through environment annotations without changes', function() {
         pyDelta(db, 'change', {'hyphenated-key': 'peanut'}, 'annotations');
         assert.strictEqual(
             'peanut',
             db.environment.get('annotations')['hyphenated-key']);
       });
 
       it('automatically handles changes to different model lists', function() {
         pyDelta(db, 'add', {id: 'django'}, 'service');
         pyDelta(db, 'add', {id: 'django/1'}, 'unit');
         pyDelta(db, 'add', {id: '1'}, 'machine');
         assert.strictEqual(1, db.services.size());
-        assert.strictEqual(1, db.units.size());
         assert.strictEqual(1, db.machines.size());
-        assert.isNotNull(db.services.getById('django'));
-        assert.isNotNull(db.units.getById('django/1'));
+        var django = db.services.getById('django');
+        assert.isNotNull(django);
+        assert.isNotNull(django.get('units').getById('django/1'));
         assert.isNotNull(db.machines.getById('1'));
       });
 
       it('automatically handles removals of model lists', function() {
-        db.services.add({
+        var wordpress = db.services.add({
           id: 'wordpress',
           charm: 'cs:quantal/wordpress-11',
           exposed: true
         });
-        db.units.add({
+        wordpress.get('units').add({
           id: 'wordpress/1',
           agent_state: 'pending',
           public_address: 'example.com',
           private_address: '10.0.0.1'
         });
         pyDelta(db, 'remove', 'wordpress/1', 'unit');
         pyDelta(db, 'remove', 'wordpress', 'service');
         assert.strictEqual(0, db.services.size());
-        assert.strictEqual(0, db.units.size());
+        assert.strictEqual(0, wordpress.get('units').size());
       });
 
     });
 
 
     describe('unitInfo handler', function() {
       var unitInfo;
 
       before(function() {
         unitInfo = handlers.unitInfo;
       });
 
       it('creates a unit in the database', function() {
+        var django = db.services.add({id: 'django'});
         var change = {
           Name: 'django/1',
           Service: 'django',
           MachineId: '1',
           Status: 'pending',
           StatusInfo: 'info',
           PublicAddress: 'example.com',
           PrivateAddress: '10.0.0.1',
           Ports: [{Number: 80, Protocol: 'tcp'}, {Number: 42, Protocol: 'udp'}]
         };
         unitInfo(db, 'add', change);
-        assert.strictEqual(1, db.units.size());
         // Retrieve the unit from the database.
-        var unit = db.units.getById('django/1');
+        var unit = django.get('units').getById('django/1');
         assert.strictEqual('django', unit.service);
         assert.strictEqual('1', unit.machine);
         assert.strictEqual('pending', unit.agent_state);
         assert.strictEqual('info', unit.agent_state_info);
         assert.strictEqual('example.com', unit.public_address);
         assert.strictEqual('10.0.0.1', unit.private_address);
         assert.deepEqual(['80/tcp', '42/udp'], unit.open_ports);
       });
 
       it('updates a unit in the database', function() {
-        db.units.add({
+        var django = db.services.add({id: 'django'});
+        django.get('units').add({
           id: 'django/2',
           agent_state: 'pending',
           public_address: 'example.com',
           private_address: '10.0.0.1'
         });
         var change = {
           Name: 'django/2',
           Status: 'started',
           PublicAddress: 'example.com',
           PrivateAddress: '192.168.0.1'
         };
         unitInfo(db, 'change', change);
-        assert.strictEqual(1, db.units.size());
         // Retrieve the unit from the database.
-        var unit = db.units.getById('django/2');
+        var unit = django.get('units').getById('django/2');
         assert.strictEqual('started', unit.agent_state);
         assert.strictEqual('example.com', unit.public_address);
         assert.strictEqual('192.168.0.1', unit.private_address);
       });
 
       it('creates or updates the corresponding machine', function() {
         var machine;
+        db.services.add({id: 'django'});
         var change = {
           Name: 'django/2',
           MachineId: '1',
           Status: 'pending',
           PublicAddress: 'example.com'
         };
         unitInfo(db, 'add', change);
         assert.strictEqual(1, db.machines.size());
         // Retrieve the machine from the database.
         machine = db.machines.getById(1);
         assert.strictEqual('example.com', machine.public_address);
         // Update the machine.
         change.PublicAddress = 'example.com/foo';
         unitInfo(db, 'change', change);
         assert.strictEqual(1, db.machines.size());
         // Retrieve the machine from the database (again).
         machine = db.machines.getById('1');
         assert.strictEqual('example.com/foo', machine.public_address);
       });
 
       it('removes a unit from the database', function() {
-        db.units.add({
+        var django = db.services.add({id: 'django'});
+        var units = django.get('units');
+        units.add({
           id: 'django/2',
           agent_state: 'pending',
           public_address: 'example.com',
           private_address: '10.0.0.1'
         });
         var change = {
           Name: 'django/2',
           Status: 'started',
           PublicAddress: 'example.com',
           PrivateAddress: '192.168.0.1'
         };
         unitInfo(db, 'remove', change);
-        assert.strictEqual(0, db.units.size());
+        assert.strictEqual(0, units.size());
       });
 
     });
 
 
     describe('serviceInfo handler', function() {
       var serviceInfo, constraints, config;
 
       before(function() {
         serviceInfo = handlers.serviceInfo;
@@ skipping 59 matching lines @@
              CharmURL: 'cs:quantal/wordpress-11',
              Exposed: false
            };
            serviceInfo(db, 'change', change);
            assert.strictEqual(1, db.services.size());
            // Retrieve the service from the database.
            var service = db.services.getById('wordpress');
            assert.deepEqual({}, service.get('constraints'));
          });
 
-      it('if configs are not in the change stream they are {}',
-         function() {
-           db.services.add({
-             id: 'wordpress',
-             charm: 'cs:quantal/wordpress-11',
-             exposed: true
-           });
-           var change = {
-             Name: 'wordpress',
-             CharmURL: 'cs:quantal/wordpress-11',
-             Exposed: false
-           };
-           serviceInfo(db, 'change', change);
-           assert.strictEqual(1, db.services.size());
-           // Retrieve the service from the database.
-           var service = db.services.getById('wordpress');
-           assert.deepEqual({}, service.get('config'));
-         });
+      it('if configs are not in the change stream they are {}', function() {
+        db.services.add({
+          id: 'wordpress',
+          charm: 'cs:quantal/wordpress-11',
+          exposed: true
+        });
+        var change = {
+          Name: 'wordpress',
+          CharmURL: 'cs:quantal/wordpress-11',
+          Exposed: false
+        };
+        serviceInfo(db, 'change', change);
+        assert.strictEqual(1, db.services.size());
+        // Retrieve the service from the database.
+        var service = db.services.getById('wordpress');
+        assert.deepEqual({}, service.get('config'));
+      });
 
       it('handles constraint changes', function() {
         db.services.add({
           id: 'wordpress',
           charm: 'cs:quantal/wordpress-11',
           exposed: true,
           constraints: constraints
         });
         var changedConstraints = {'arch': 'i386'};
         var change = {
@@ skipping 212 matching lines @@
           Tag: 'service-django',
           Annotations: annotations
         };
         annotationInfo(db, 'add', change);
         // Retrieve the annotations from the database.
         var service = db.services.getById('django');
         assert.deepEqual(annotations, service.get('annotations'));
       });
 
       it('stores annotations on a unit', function() {
-        db.units.add({id: 'django/2'});
+        var django = db.services.add({id: 'django'});
+        var units = django.get('units');
+        units.add({id: 'django/2'});
         var annotations = {'foo': '42', 'bar': '47'};
         var change = {
           Tag: 'unit-django-2',
           Annotations: annotations
         };
         annotationInfo(db, 'add', change);
         // Retrieve the annotations from the database.
-        var unit = db.units.getById('django/2');
+        var unit = units.getById('django/2');
         assert.deepEqual(annotations, unit.annotations);
       });
 
       it('stores annotations on a machine', function() {
         db.machines.add({id: '1'});
         var annotations = {'foo': '42', 'bar': '47'};
         var change = {
           Tag: 'machine-1',
           Annotations: annotations
         };
@@ skipping 35 matching lines @@
           Tag: 'service-django',
           Annotations: annotations
         };
         annotationInfo(db, 'add', change);
         // Retrieve the annotations from the database.
         var service = db.services.getById('django');
         assert.isTrue(service.get('exposed'));
       });
 
       it('does not override the unit relation_errors attr', function() {
+        var django = db.services.add({id: 'django'});
+        var units = django.get('units');
         var relation_errors = {'cache': ['memcached']},
             annotations = {'foo': '42', 'bar': '47'};
-        db.units.add({id: 'django/2', relation_errors: relation_errors});
+        units.add({id: 'django/2', relation_errors: relation_errors});
         var change = {
           Tag: 'unit-django-2',
           Annotations: annotations
         };
         annotationInfo(db, 'add', change);
         // Retrieve the annotations from the database.
-        var unit = db.units.getById('django/2');
+        var unit = units.getById('django/2');
         assert.deepEqual(relation_errors, unit.relation_errors);
       });
 
       it('does not create new model instances', function() {
         var annotations = {'gui-x': '42', 'gui-y': '47'};
         var change = {
           Tag: 'service-django',
           Annotations: annotations
         };
         annotationInfo(db, 'add', change);
@@ skipping 115 matching lines @@
 
       it('returns an empty list if there are no endpoints', function() {
         assert.deepEqual([], createEndpoints([]));
       });
 
     });
 
   });
 
 })();