test improvements

Author: RINO767

src/app/services/cloud-data.service.spec.ts

@@ -1,4 +1,4 @@
-import {TestBed, inject} from '@angular/core/testing';
+import {TestBed, inject, async} from '@angular/core/testing';
 
 import {CloudDataService} from './cloud-data.service';
 import {ApiModule, CloudService} from 'cloudiator-rest-api';
@@ -45,14 +45,16 @@ describe('CloudDataService', () => {
     expect(service).toBeTruthy();
   }));
 
-  it('should find correct cloud', inject([CloudDataService], (service: CloudDataService) => {
+  it('should find correct cloud', async(inject([CloudDataService], (service: CloudDataService) => {
 
-    service.findCloud(testData.cloudOne.id).toPromise().then(cloud => {
-      // expect(cloud.id).not.toBe(testData.cloudOne.id);
-      expect(true).toBeTruthy();
+    return service.findCloud(testData.cloudOne.id).toPromise().then(cloud => {
+      console.log(cloud)
+      expect(cloud.id).toEqual(testData.cloudOne.id);
+      expect(cloud.id).not.toEqual(testData.cloudOne.id);
+      // expect(true).toBeTruthy();
     });
 
-  }));
+  })));
 
   it('filterHardware should not error', inject([CloudDataService], (service: CloudDataService) => {
     expect(service.filterHardware(null, '')).toBeNull();
@@ -117,6 +119,17 @@ describe('CloudDataService', () => {
   }));
 
   it('filterHardware should find parameter greater than', inject([CloudDataService], (service: CloudDataService) => {
+    expect(service.filterHardware(testData.allHardware, `cloud`)).toEqual([]);
+    expect(service.filterHardware(testData.allHardware, `cloud=`)).toEqual([]);
+    expect(service.filterHardware(testData.allHardware, `cloud=222`)).toEqual([]);
+    expect(service.filterHardware(testData.allHardware, `cloud=${testData.cloudTwo.id}`)).toEqual(testData.allHardware);
+
+    expect(service.filterHardware(testData.allHardware, `id`)).toEqual([]);
+    expect(service.filterHardware(testData.allHardware, `id=`)).toEqual([]);
+    expect(service.filterHardware(testData.allHardware, `id=222`)).toEqual([]);
+    expect(service.filterHardware(testData.allHardware, `id=${testData.cloudTwo.id}`)).toEqual([]);
+    expect(service.filterHardware(testData.allHardware, `id=${testData.hardwareOne.id}`)).toEqual([testData.hardwareOne]);
+
     expect(service.filterHardware(testData.allHardware, `name>`)).toEqual([]);
     expect(service.filterHardware(testData.allHardware, `name> `)).toEqual([]);
     expect(service.filterHardware(testData.allHardware, `name>1`)).toEqual([]);
@@ -275,11 +288,27 @@ describe('CloudDataService', () => {
   }));
 
   it('filterImages should find basic searches', inject([CloudDataService], (service: CloudDataService) => {
+    expect(service.filterImages(testData.allImages, `cloud`)).toEqual([]);
+    expect(service.filterImages(testData.allImages, `cloud=`)).toEqual([]);
+    expect(service.filterImages(testData.allImages, `cloud=222`)).toEqual([]);
+    expect(service.filterImages(testData.allImages, `cloud=${testData.cloudTwo.id}`)).toEqual(testData.allImages);
+
+    expect(service.filterImages(testData.allImages, `id`)).toEqual([]);
+    expect(service.filterImages(testData.allImages, `id=`)).toEqual([]);
+    expect(service.filterImages(testData.allImages, `id=222`)).toEqual([]);
+    expect(service.filterImages(testData.allImages, `id=${testData.cloudTwo.id}`)).toEqual([]);
+    expect(service.filterImages(testData.allImages, `id=${testData.imageOne.id}`)).toEqual([testData.imageOne]);
+
     expect(service.filterImages(testData.allImages, ' ')).toEqual(testData.allImages);
     expect(service.filterImages(testData.allImages, testData.imageOne.name)).toEqual([testData.imageOne]);
     expect(service.filterImages(testData.allImages, '10sab')).toEqual([]);
     expect(service.filterImages(testData.allImages, 'not a valid search')).toEqual([]);
     expect(service.filterImages(testData.allImages, `${testData.imageOne.name.slice(1, 10)} ${testData.imageOne.name.slice(15, 17)}`))
       .toEqual([testData.imageOne]);
+
+    expect(service.filterImages(testData.allImages, `os=`)).toEqual([]);
+    expect(service.filterImages(testData.allImages, `os=222`)).toEqual([]);
+    expect(service.filterImages(testData.allImages, `os=${testData.imageThree.operatingSystem.operatingSystemFamily}`))
+      .toEqual([testData.imageThree]);
   }));
 });

src/app/services/cloud-data.service.ts

@@ -200,6 +200,7 @@ export class CloudDataService {
           return (curr: Hardware) => this.compareNumbers(curr.disk, operator, term);
         default:
           // default case is used when no operator is found in the search term
+          // id is specifically excluded from this as it would cause a lot of clutter
           return (curr: Hardware) => {
             return curr.name.toLowerCase().includes(term.toLowerCase()) ||
               curr.cores.toString().toLowerCase().includes(term.toLowerCase()) ||
@@ -311,7 +312,7 @@ export class CloudDataService {
 
       // special filter for cloud id and normal id
       if (terms[0] === 'cloud') {
-        return objArray.filter(obj => !obj.id.includes(terms[1]));
+        return objArray.filter(obj => this.findCloudId(obj.id) !== terms[1]);
       }
       if (terms[0] === 'id') {
         return objArray.filter(obj => obj.id !== terms[1]);

testing/test-data.ts

@@ -19,7 +19,7 @@ export const allClouds: Cloud[] = [
     }
   },
   {
-    id: '1a79a4d60de6718e8e5b326e338ae533',
+    id: '02f7f6ab33e4a94d0f441947972668ef',
     endpoint: 'https://endpoint.example.com',
     cloudType: 'PRIVATE',
     api: <Api>{
@@ -61,6 +61,25 @@ export const cloudOne: Cloud = <Cloud>{
   }
 };
 
+export const cloudTwo: Cloud = <Cloud>{
+  id: '02f7f6ab33e4a94d0f441947972668ef',
+  endpoint: 'https://endpoint.example.com',
+  cloudType: 'PRIVATE',
+  api: <Api>{
+    providerName: 'openstack-nova'
+  },
+  credential: <CloudCredential>{
+    user: 'tenant:username',
+    secret: 'MeltdownVictim'
+  },
+  cloudConfiguration: {
+    nodeGroup: 'cloudiator',
+    properties: {
+      'sword.regions': 'RegionOne, RegionTwo'
+    }
+  }
+}
+
 export const hardwareOne: Hardware = <Hardware>{
   id: '02f7f6ab33e4a94d0f441947972668ef~RegionOne/931b887e-e747-4a66-b643-0cc5c0caa1cd',
   name: 'small',