Fix test

material-extensions · Feb 25, 2020 · fd1b62e · fd1b62e
1 parent 5cae039
commit fd1b62e
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 32 deletions.
diff --git a/src/test/suite/icons/fileIcons.test.ts b/src/test/suite/icons/fileIcons.test.ts
@@ -1,5 +1,6 @@
 import * as assert from 'assert';
-import { getDefaultIconOptions, getFileIconDefinitions } from '../../../icons/index';
+import * as merge from 'lodash.merge';
+import { getDefaultIconOptions, loadFileIconDefinitions } from '../../../icons/index';
 import { FileIcons, IconConfiguration, IconPack } from '../../../models/index';
 
 suite('file icons', () => {
@@ -11,33 +12,33 @@ suite('file icons', () => {
                 { name: 'javascript', fileNames: ['filename.js'], fileExtensions: ['js'] }
             ]
         };
-        const iconConfig = new IconConfiguration();
         const options = getDefaultIconOptions();
-        const def = getFileIconDefinitions(fileIcons, iconConfig, options);
-        const value = new IconConfiguration();
+        const iconConfig = merge({}, new IconConfiguration(), { options });
+        const iconDefinitions = loadFileIconDefinitions(fileIcons, iconConfig, options);
+        const expectedConfig = merge({}, new IconConfiguration(), { options });
 
-        value.iconDefinitions = {
-            'file': {
-                'iconPath': './../icons/file.svg'
+        expectedConfig.iconDefinitions = {
+            'angular': {
+                'iconPath': './../icons/angular.svg'
             },
             'javascript': {
                 'iconPath': './../icons/javascript.svg'
             },
-            'angular': {
-                'iconPath': './../icons/angular.svg'
-            }
+            'file': {
+                'iconPath': './../icons/file.svg'
+            },
         };
-        value.file = 'file';
-        value.fileExtensions = {
+        expectedConfig.file = 'file';
+        expectedConfig.fileExtensions = {
             'js': 'javascript'
         };
-        value.fileNames = {
+        expectedConfig.fileNames = {
             '.angular-cli.json': 'angular',
             'angular-cli.json': 'angular',
             'filename.js': 'javascript'
         };
 
-        assert.deepEqual(def, value);
+        assert.equal(JSON.stringify(iconDefinitions), JSON.stringify(expectedConfig));
     });
 
     test('should disable icon packs', () => {
@@ -48,10 +49,10 @@ suite('file icons', () => {
                 { name: 'javascript', fileNames: ['filename.js'], fileExtensions: ['js'] }
             ]
         };
-        const iconConfig = new IconConfiguration();
         const options = getDefaultIconOptions();
         options.activeIconPack = '';
-        const def = getFileIconDefinitions(fileIcons, iconConfig, options);
+        const iconConfig = merge({}, new IconConfiguration(), { options });
+        const def = loadFileIconDefinitions(fileIcons, iconConfig, options);
         const value = new IconConfiguration();
 
         value.iconDefinitions = {
@@ -87,7 +88,7 @@ suite('file icons', () => {
             '*.sample.ts': 'angular',
             'sample.js': 'javascript'
         };
-        const def = getFileIconDefinitions(fileIcons, iconConfig, options);
+        const def = loadFileIconDefinitions(fileIcons, iconConfig, options);
         const value = new IconConfiguration();
 
         value.iconDefinitions = {
@@ -126,7 +127,7 @@ suite('file icons', () => {
         };
         const iconConfig = new IconConfiguration();
         const options = getDefaultIconOptions();
-        const def = getFileIconDefinitions(fileIcons, iconConfig, options);
+        const def = loadFileIconDefinitions(fileIcons, iconConfig, options);
         const value = new IconConfiguration();
 
         value.iconDefinitions = {

diff --git a/src/test/suite/icons/folderIcons.test.ts b/src/test/suite/icons/folderIcons.test.ts
@@ -1,5 +1,5 @@
 import * as assert from 'assert';
-import { getDefaultIconOptions, getFolderIconDefinitions } from '../../../icons/index';
+import { getDefaultIconOptions, loadFolderIconDefinitions } from '../../../icons/index';
 import { FolderTheme, IconConfiguration, IconPack } from '../../../models/index';
 
 suite('folder icons', () => {
@@ -27,7 +27,7 @@ suite('folder icons', () => {
 
     test('should configure icon definitions', () => {
         const options = getDefaultIconOptions();
-        const def = getFolderIconDefinitions(folderIcons, iconConfig, options);
+        const def = loadFolderIconDefinitions(folderIcons, iconConfig, options);
         const value = new IconConfiguration();
         value.iconDefinitions = {
             'folder': {
@@ -79,7 +79,7 @@ suite('folder icons', () => {
     test('should deactivate folder icons', () => {
         const options = getDefaultIconOptions();
         options.folders.theme = 'none';
-        const def = getFolderIconDefinitions(folderIcons, iconConfig, options);
+        const def = loadFolderIconDefinitions(folderIcons, iconConfig, options);
         const value = new IconConfiguration();
 
         value.iconDefinitions = {};
@@ -93,7 +93,7 @@ suite('folder icons', () => {
     test('should enable folder theme', () => {
         const options = getDefaultIconOptions();
         options.folders.theme = 'blue';
-        const def = getFolderIconDefinitions(folderIcons, iconConfig, options);
+        const def = loadFolderIconDefinitions(folderIcons, iconConfig, options);
         const value = new IconConfiguration();
 
         value.iconDefinitions = {
@@ -133,7 +133,7 @@ suite('folder icons', () => {
         options.folders.associations = {
             'sample': 'src'
         };
-        const def = getFolderIconDefinitions(folderIcons, iconConfig, options);
+        const def = loadFolderIconDefinitions(folderIcons, iconConfig, options);
         const value = new IconConfiguration();
         value.iconDefinitions = {
             'folder': {
@@ -187,7 +187,7 @@ suite('folder icons', () => {
     test('should disable icon packs', () => {
         const options = getDefaultIconOptions();
         options.activeIconPack = '';
-        const def = getFolderIconDefinitions(folderIcons, iconConfig, options);
+        const def = loadFolderIconDefinitions(folderIcons, iconConfig, options);
         const value = new IconConfiguration();
         value.iconDefinitions = {
             'folder': {
@@ -238,7 +238,7 @@ suite('folder icons', () => {
                 ]
             }
         ];
-        const def = getFolderIconDefinitions(lightHighContrastFolderIcons, iconConfig, options);
+        const def = loadFolderIconDefinitions(lightHighContrastFolderIcons, iconConfig, options);
         const value = new IconConfiguration();
 
         value.iconDefinitions = {
@@ -349,7 +349,7 @@ suite('folder icons', () => {
     test('should hide explorer arrows', () => {
         const options = getDefaultIconOptions();
         options.hidesExplorerArrows = true;
-        const def = getFolderIconDefinitions(folderIcons, iconConfig, options);
+        const def = loadFolderIconDefinitions(folderIcons, iconConfig, options);
 
         assert.deepEqual(def.hidesExplorerArrows, true);
     });

diff --git a/src/test/suite/icons/languageIcons.test.ts b/src/test/suite/icons/languageIcons.test.ts
@@ -1,5 +1,5 @@
 import * as assert from 'assert';
-import { getDefaultIconOptions, getLanguageIconDefinitions } from '../../../icons/index';
+import { getDefaultIconOptions, loadLanguageIconDefinitions } from '../../../icons/index';
 import { IconConfiguration, IconPack, LanguageIcon } from '../../../models/index';
 
 suite('language icons', () => {
@@ -12,7 +12,7 @@ suite('language icons', () => {
             { icon: { name: 'b' }, ids: ['b'] },
             { icon: { name: 'c' }, ids: ['c', 'd'], },
         ];
-        const def = getLanguageIconDefinitions(languageIcons, iconConfig, options);
+        const def = loadLanguageIconDefinitions(languageIcons, iconConfig, options);
         const value = new IconConfiguration();
         value.iconDefinitions = {
             'a': {
@@ -39,7 +39,7 @@ suite('language icons', () => {
             { icon: { name: 'a' }, ids: ['a'] },
             { icon: { name: 'c' }, ids: ['c', 'd'], disabled: true },
         ];
-        const def = getLanguageIconDefinitions(languageIcons, iconConfig, options);
+        const def = loadLanguageIconDefinitions(languageIcons, iconConfig, options);
         const value = new IconConfiguration();
         value.iconDefinitions = {
             'a': {
@@ -57,7 +57,7 @@ suite('language icons', () => {
             { icon: { name: 'a' }, ids: ['a'], enabledFor: [IconPack.Angular] },
             { icon: { name: 'c' }, ids: ['c', 'd'], disabled: true },
         ];
-        const def = getLanguageIconDefinitions(languageIcons, iconConfig, { ...options, activeIconPack: '' });
+        const def = loadLanguageIconDefinitions(languageIcons, iconConfig, { ...options, activeIconPack: '' });
         const value = new IconConfiguration();
         value.iconDefinitions = {};
         value.languageIds = {};
@@ -69,7 +69,7 @@ suite('language icons', () => {
             { icon: { name: 'a', light: true, highContrast: true }, ids: ['a'] },
             { icon: { name: 'b', light: true, highContrast: true }, ids: ['b'] },
         ];
-        const def = getLanguageIconDefinitions(languageIcons, iconConfig, options);
+        const def = loadLanguageIconDefinitions(languageIcons, iconConfig, options);
         const value = new IconConfiguration();
         value.iconDefinitions = {
             'a': {
@@ -122,7 +122,7 @@ suite('language icons', () => {
         options.languages.associations = {
             'xml': 'json'
         };
-        const def = getLanguageIconDefinitions(languageIcons, iconConfig, options);
+        const def = loadLanguageIconDefinitions(languageIcons, iconConfig, options);
         const value = new IconConfiguration();
         value.iconDefinitions = {
             'json': {