refs #15 Refactor the way reading config

Author: ryu1kn

lib/config-store.js

@@ -7,11 +7,15 @@ class ConfigStore {
         this._workspace = params.workspace;
     }
 
+    get preComparisonTextNormalizationRules() {
+        return this._get('preComparisonTextNormalizationRules');
+    }
+
     get hasPreComparisonTextNormalizationRules() {
-        return this.get('preComparisonTextNormalizationRules').length !== 0;
+        return this.preComparisonTextNormalizationRules.length !== 0;
     }
 
-    get(configName) {
+    _get(configName) {
         const extensionConfig = this._workspace.getConfiguration(EXTENSION_ID);
         return extensionConfig.get(configName);
     }

lib/text-process-rule-applier.js

@@ -6,7 +6,7 @@ class TextProcessRuleApplier {
     }
 
     applyTo(text) {
-        const rules = this._configStore.get('preComparisonTextNormalizationRules');
+        const rules = this._configStore.preComparisonTextNormalizationRules;
         return rules.length !== 0 ? this._applyRulesToText(rules, text) : text;
     }
 

test/lib/config-store.test.js

@@ -3,10 +3,24 @@ const ConfigStore = require('../../lib/config-store');
 
 suite('ConfigStore', () => {
 
-    test('it returns the current config from vscode.workspace', () => {
-        const extensionConfig = {get: stubWithArgs(['CONFIG_NAME'], 'CONFIG_VALUE')};
+    test('it reads text normalisation rules from vscode.workspace', () => {
+        const extensionConfig = {get: stubWithArgs(['preComparisonTextNormalizationRules'], 'RULES')};
         const workspace = {getConfiguration: stubWithArgs(['partialDiff'], extensionConfig)};
         const configStore = new ConfigStore({workspace});
-        expect(configStore.get('CONFIG_NAME')).to.eql('CONFIG_VALUE');
+        expect(configStore.preComparisonTextNormalizationRules).to.eql('RULES');
+    });
+
+    test('it tells if text normalisation rules are specified', () => {
+        const extensionConfig = {get: stubWithArgs(['preComparisonTextNormalizationRules'], ['RULE1'])};
+        const workspace = {getConfiguration: stubWithArgs(['partialDiff'], extensionConfig)};
+        const configStore = new ConfigStore({workspace});
+        expect(configStore.hasPreComparisonTextNormalizationRules).to.be.true;
+    });
+
+    test('it tells if text normalisation rules are not specified', () => {
+        const extensionConfig = {get: stubWithArgs(['preComparisonTextNormalizationRules'], [])};
+        const workspace = {getConfiguration: stubWithArgs(['partialDiff'], extensionConfig)};
+        const configStore = new ConfigStore({workspace});
+        expect(configStore.hasPreComparisonTextNormalizationRules).to.be.false;
     });
 });

test/lib/content-provider.test.js

@@ -65,9 +65,7 @@ suite('ContentProvider', () => {
     function retrieveEditorContent({selectionInfoRegistry, preComparisonTextNormalizationRules, registeredText}) {
         const defaultSelectionInfoRegistry = {get: key => ({text: registeredText || `TEXT_${key}`})};
         const textResourceUtil = {getTextKey: uri => uri.replace('URI_', '')};
-        const configStore = {
-            get: key => key === 'preComparisonTextNormalizationRules' && (preComparisonTextNormalizationRules || [])
-        };
+        const configStore = {preComparisonTextNormalizationRules: preComparisonTextNormalizationRules || []};
         const contentProvider = new ContentProvider({
             selectionInfoRegistry: selectionInfoRegistry || defaultSelectionInfoRegistry,
             textResourceUtil,

test/lib/diff-presenter.test.js

@@ -5,15 +5,19 @@ suite('DiffPresenter', () => {
 
     test('it passes URI of 2 texts to compare', async () => {
         const commands = fakeCommands();
-        const selectionInfoRegistry = {get: () => {}};
-        const textTitleBuilder = {build: () => {}};
         const textResourceUtil = {
             getUri: stubWithArgs(
                 ['TEXT1'], 'URI_INSTANCE_1',
                 ['TEXT2'], 'URI_INSTANCE_2'
             )
         };
-        const diffPresenter = new DiffPresenter({commands, textTitleBuilder, selectionInfoRegistry, textResourceUtil});
+        const diffPresenter = new DiffPresenter({
+            commands,
+            configStore: {},
+            textTitleBuilder: {build: () => {}},
+            selectionInfoRegistry: {get: () => {}},
+            textResourceUtil
+        });
 
         await diffPresenter.takeDiff('TEXT1', 'TEXT2');
 
@@ -30,9 +34,13 @@ suite('DiffPresenter', () => {
                 ['TEXT2'], 'TEXT_INFO_2'
             )
         };
-        const textTitleBuilder = {build: textKey => `TITLE_${textKey}`};
-        const textResourceUtil = {getUri: () => {}};
-        const diffPresenter = new DiffPresenter({commands, textTitleBuilder, selectionInfoRegistry, textResourceUtil});
+        const diffPresenter = new DiffPresenter({
+            commands,
+            configStore: {},
+            textTitleBuilder: {build: textKey => `TITLE_${textKey}`},
+            selectionInfoRegistry,
+            textResourceUtil: {getUri: () => {}}
+        });
 
         await diffPresenter.takeDiff('TEXT1', 'TEXT2');