test

tzAcee · Mar 22, 2024 · cb6baad · cb6baad
1 parent c9316e9
commit cb6baad
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 47 deletions.
diff --git a/src/test/ui-test/invalid-cases.test.ts b/src/test/ui-test/invalid-cases.test.ts
@@ -17,6 +17,8 @@ describe('Negative-cases test suite', () => {
   });
 
   after(async ()=>{
+    await ext_settings.setSetPath(undefined);
+    await ext_settings.setCreateFolder(false);
   })
 
   beforeEach(async ()=>{

diff --git a/src/test/ui-test/replacement-commands.test.ts b/src/test/ui-test/replacement-commands.test.ts
@@ -11,17 +11,31 @@ describe('Text teplacement test suite', () => {
     let vsController = new VSController();
     let cppCreatorExt = new CppCreatorExtHelper();
     let ext_settings = new ExtensionSettings();
+
+    let defaultHeaderFileNamePreset = "";
+    let defaultSourceFileNamePreset = "";
+    let defaultSourceContentPreset = "";
+    let defaultHeaderContentPreset = "";
 
   before(async () => {
     await vsController.openWorkspace(workSpaceDir);
+
+    defaultHeaderFileNamePreset = await ext_settings.getHeaderFileContentPreset();
+    defaultSourceFileNamePreset = await ext_settings.getSourceFileContentPreset();
+    defaultSourceContentPreset = await ext_settings.getSourceFileContentPreset();
+    defaultHeaderContentPreset = await ext_settings.getHeaderFileContentPreset();
+
+    assert (defaultHeaderContentPreset != "" && defaultHeaderFileNamePreset != "" && defaultSourceContentPreset != "" && defaultSourceFileNamePreset != "");
   });
 
   after(async ()=>{
-    await ext_settings.resetPreset();
+    await ext_settings.setHeaderFileContentPreset(defaultHeaderContentPreset)
+    await ext_settings.setSourceFileContentPreset(defaultSourceContentPreset);
+    await ext_settings.setSourceFileNamePreset(defaultSourceFileNamePreset);
+    await ext_settings.setHeaderFileNamePreset(defaultHeaderFileNamePreset);
   })
 
   beforeEach(async ()=>{
-    await ext_settings.resetPreset();
   })
 
   it('Test', async () => {

diff --git a/src/test/ui-test/utils/extension-settings-helper.ts b/src/test/ui-test/utils/extension-settings-helper.ts
@@ -3,14 +3,6 @@ import { EditorView, LinkSetting, Workbench, TextEditor, Setting, By, VSBrowser,
 
 export class ExtensionSettings
 {
-    async resetPreset()
-    {
-    //    await this.resetHeaderFileNamePreset();
-       // await this.resetSourceFileContentPreset();
-       await this.resetSourceFileNamePreset();
-    //    await this.resetHeaderFileContentPreset();
-    }
-
     async getSettingById(id: string): Promise<Setting>
     {
         const settingsEditor = await new Workbench().openSettings();
@@ -49,11 +41,6 @@ export class ExtensionSettings
         await setting.setValue(val);
     }
 
-    async resetHeaderFileContentPreset()
-    {
-        const setting = await this.getSettingById("cpp.creator.headerFileContentPreset");
-    }
-
     // SourceFileContentPreset
     async getSourceFileContentPreset() : Promise<string>
     {
@@ -69,11 +56,6 @@ export class ExtensionSettings
         await setting.setValue(val)
     }
 
-    async resetSourceFileContentPreset()
-    {
-        const setting = await this.getSettingById("cpp.creator.sourceFileContentPreset");
-    }
-
     // HeaderFileNamePreset
     async getHeaderFileNamePreset() : Promise<string>
     {
@@ -89,11 +71,6 @@ export class ExtensionSettings
         await setting.setValue(val)
     }
 
-    async resetHeaderFileNamePreset()
-    {
-        const setting = await this.getSettingById("cpp.creator.headerFileNamePreset");
-    }
-
     // SourceFileNamePreset
     async getSourceFileNamePreset() : Promise<string>
     {
@@ -109,28 +86,6 @@ export class ExtensionSettings
         await setting.setValue(val)
     }
 
-    async resetSourceFileNamePreset()
-    {
-        const setting = await this.getSettingById("cpp.creator.sourceFileNamePreset");
-        await setting.click();
-
-        console.log("here");
-
-        // Open the drop down
-        const resetElem = await setting.findElement(By.css("a.action-label"))
-        assert(resetElem != undefined);
-        await resetElem.click(); 
-
-        // find the Reset Setting Button
-        const resetSettingButton = await setting.findElement(By.xpath("//*[contains(text(), 'Reset Setting')]"));
-        assert(resetSettingButton != undefined);
-        await resetSettingButton.click();
-
-        console.log(await setting.takeScreenshot())
-
-        // <a class="action-label codicon codicon-settings-more-action" />
-    }
-
     // SetPath
     async isSetPath() : Promise<boolean | undefined | string>
     {