refactor(tests): Rename ZeroBasedPosition to NaturalEditorPosition

Chakroun-Anas · Chakroun-Anas · commit 09b0b5876dcd · 2024-01-10T12:55:21.000+01:00
diff --git a/src/test/integration/helpers/NaturalEditorPosition.ts b/src/test/integration/helpers/NaturalEditorPosition.ts
@@ -0,0 +1,7 @@
+import { Position } from 'vscode';
+
+export class NaturalEditorPosition extends Position {
+  constructor(editorDisplayedLine: number, editorDisplayedCharacter: number) {
+    super(editorDisplayedLine - 1, editorDisplayedCharacter - 1);
+  }
+}
diff --git a/src/test/integration/helpers/ZeroBasedPosition.ts b/src/test/integration/helpers/ZeroBasedPosition.ts
diff --git a/src/test/integration/helpers/index.ts b/src/test/integration/helpers/index.ts
@@ -1,11 +1,11 @@
 import { openDocument } from './openDocument';
-import { ZeroBasedPosition } from './ZeroBasedPosition';
+import { NaturalEditorPosition } from './NaturalEditorPosition';
 import { zeroBasedLine } from './zeroBasedLine';
 import { expectActiveTextEditorWithFile } from './expectActiveTextEditorWithFile';
 import { documentLinesChanged } from './documentLinesChanged';
 export {
   openDocument,
-  ZeroBasedPosition,
+  NaturalEditorPosition,
   zeroBasedLine,
   expectActiveTextEditorWithFile,
   documentLinesChanged,
diff --git a/src/test/integration/js/log-feature/class/classFunction.ts b/src/test/integration/js/log-feature/class/classFunction.ts
@@ -4,7 +4,7 @@ import { expect } from 'chai';
 import {
   openDocument,
   zeroBasedLine,
-  ZeroBasedPosition,
+  NaturalEditorPosition,
   expectActiveTextEditorWithFile,
   documentLinesChanged,
 } from '../../../helpers';
@@ -32,8 +32,8 @@ export default (): void => {
       if (activeTextEditor) {
         activeTextEditor.selections = [
           new vscode.Selection(
-            new ZeroBasedPosition(2, 12),
-            new ZeroBasedPosition(2, 20),
+            new NaturalEditorPosition(2, 12),
+            new NaturalEditorPosition(2, 20),
           ),
         ];
         await vscode.commands.executeCommand(
diff --git a/src/test/integration/js/log-feature/class/classNestedFunctions.ts b/src/test/integration/js/log-feature/class/classNestedFunctions.ts
@@ -3,7 +3,7 @@ import Mocha, { it, describe } from 'mocha';
 import { expect } from 'chai';
 import {
   openDocument,
-  ZeroBasedPosition,
+  NaturalEditorPosition,
   zeroBasedLine,
   expectActiveTextEditorWithFile,
   documentLinesChanged,
@@ -35,8 +35,8 @@ export default (): void => {
       if (activeTextEditor) {
         activeTextEditor.selections = [
           new vscode.Selection(
-            new ZeroBasedPosition(3, 30),
-            new ZeroBasedPosition(3, 42),
+            new NaturalEditorPosition(3, 30),
+            new NaturalEditorPosition(3, 42),
           ),
         ];
         await vscode.commands.executeCommand(
diff --git a/src/test/integration/js/log-feature/function/anonymousFunctions.ts b/src/test/integration/js/log-feature/function/anonymousFunctions.ts
@@ -4,7 +4,7 @@ import { expect } from 'chai';
 import {
   openDocument,
   zeroBasedLine,
-  ZeroBasedPosition,
+  NaturalEditorPosition,
   expectActiveTextEditorWithFile,
   documentLinesChanged,
 } from '../../../helpers';
@@ -36,8 +36,8 @@ export default (): void => {
           if (activeTextEditor) {
             activeTextEditor.selections = [
               new vscode.Selection(
-                new ZeroBasedPosition(3, 29),
-                new ZeroBasedPosition(3, 37),
+                new NaturalEditorPosition(3, 29),
+                new NaturalEditorPosition(3, 37),
               ),
             ];
             await vscode.commands.executeCommand(
@@ -74,8 +74,8 @@ export default (): void => {
           if (activeTextEditor) {
             activeTextEditor.selections = [
               new vscode.Selection(
-                new ZeroBasedPosition(5, 14),
-                new ZeroBasedPosition(5, 20),
+                new NaturalEditorPosition(5, 14),
+                new NaturalEditorPosition(5, 20),
               ),
             ];
             await vscode.commands.executeCommand(
@@ -117,8 +117,8 @@ export default (): void => {
           if (activeTextEditor) {
             activeTextEditor.selections = [
               new vscode.Selection(
-                new ZeroBasedPosition(8, 14),
-                new ZeroBasedPosition(8, 18),
+                new NaturalEditorPosition(8, 14),
+                new NaturalEditorPosition(8, 18),
               ),
             ];
             await vscode.commands.executeCommand(
@@ -163,8 +163,8 @@ export default (): void => {
         if (activeTextEditor) {
           activeTextEditor.selections = [
             new vscode.Selection(
-              new ZeroBasedPosition(12, 16),
-              new ZeroBasedPosition(12, 22),
+              new NaturalEditorPosition(12, 16),
+              new NaturalEditorPosition(12, 22),
             ),
           ];
           await vscode.commands.executeCommand(
@@ -206,8 +206,8 @@ export default (): void => {
         if (activeTextEditor) {
           activeTextEditor.selections = [
             new vscode.Selection(
-              new ZeroBasedPosition(19, 16),
-              new ZeroBasedPosition(19, 22),
+              new NaturalEditorPosition(19, 16),
+              new NaturalEditorPosition(19, 22),
             ),
           ];
           await vscode.commands.executeCommand(
@@ -249,8 +249,8 @@ export default (): void => {
         if (activeTextEditor) {
           activeTextEditor.selections = [
             new vscode.Selection(
-              new ZeroBasedPosition(27, 18),
-              new ZeroBasedPosition(27, 24),
+              new NaturalEditorPosition(27, 18),
+              new NaturalEditorPosition(27, 24),
             ),
           ];
           await vscode.commands.executeCommand(
@@ -292,8 +292,8 @@ export default (): void => {
         if (activeTextEditor) {
           activeTextEditor.selections = [
             new vscode.Selection(
-              new ZeroBasedPosition(35, 18),
-              new ZeroBasedPosition(35, 24),
+              new NaturalEditorPosition(35, 18),
+              new NaturalEditorPosition(35, 24),
             ),
           ];
           await vscode.commands.executeCommand(
diff --git a/src/test/integration/js/log-feature/function/emptyFunc.ts b/src/test/integration/js/log-feature/function/emptyFunc.ts
@@ -3,7 +3,7 @@ import Mocha, { describe, it } from 'mocha';
 import { expect } from 'chai';
 import {
   openDocument,
-  ZeroBasedPosition,
+  NaturalEditorPosition,
   zeroBasedLine,
   expectActiveTextEditorWithFile,
   documentLinesChanged,
@@ -31,8 +31,8 @@ export default (): void => {
       if (activeTextEditor) {
         activeTextEditor.selections = [
           new vscode.Selection(
-            new ZeroBasedPosition(5, 15),
-            new ZeroBasedPosition(5, 30),
+            new NaturalEditorPosition(5, 15),
+            new NaturalEditorPosition(5, 30),
           ),
         ];
         await vscode.commands.executeCommand(
@@ -62,8 +62,8 @@ export default (): void => {
       if (activeTextEditor) {
         activeTextEditor.selections = [
           new vscode.Selection(
-            new ZeroBasedPosition(14, 19),
-            new ZeroBasedPosition(14, 25),
+            new NaturalEditorPosition(14, 19),
+            new NaturalEditorPosition(14, 25),
           ),
         ];
         await vscode.commands.executeCommand(
diff --git a/src/test/integration/js/log-feature/function/functionAssignedToVariable.ts b/src/test/integration/js/log-feature/function/functionAssignedToVariable.ts
@@ -4,7 +4,7 @@ import { expect } from 'chai';
 import {
   openDocument,
   zeroBasedLine,
-  ZeroBasedPosition,
+  NaturalEditorPosition,
   expectActiveTextEditorWithFile,
   documentLinesChanged,
 } from '../../../helpers';
@@ -35,8 +35,8 @@ export default (): void => {
       if (activeTextEditor) {
         const textDocument = activeTextEditor.document;
         activeTextEditor.selection = new vscode.Selection(
-          new ZeroBasedPosition(3, 7),
-          new ZeroBasedPosition(3, 20),
+          new NaturalEditorPosition(3, 7),
+          new NaturalEditorPosition(3, 20),
         );
         await vscode.commands.executeCommand(
           'turboConsoleLog.displayLogMessage',
@@ -64,8 +64,8 @@ export default (): void => {
       if (activeTextEditor) {
         const textDocument = activeTextEditor.document;
         activeTextEditor.selection = new vscode.Selection(
-          new ZeroBasedPosition(7, 7),
-          new ZeroBasedPosition(7, 24),
+          new NaturalEditorPosition(7, 7),
+          new NaturalEditorPosition(7, 24),
         );
         await vscode.commands.executeCommand(
           'turboConsoleLog.displayLogMessage',
@@ -93,8 +93,8 @@ export default (): void => {
       if (activeTextEditor) {
         const textDocument = activeTextEditor.document;
         activeTextEditor.selection = new vscode.Selection(
-          new ZeroBasedPosition(11, 7),
-          new ZeroBasedPosition(11, 34),
+          new NaturalEditorPosition(11, 7),
+          new NaturalEditorPosition(11, 34),
         );
         await vscode.commands.executeCommand(
           'turboConsoleLog.displayLogMessage',
@@ -122,8 +122,8 @@ export default (): void => {
       if (activeTextEditor) {
         const textDocument = activeTextEditor.document;
         activeTextEditor.selection = new vscode.Selection(
-          new ZeroBasedPosition(18, 22),
-          new ZeroBasedPosition(18, 27),
+          new NaturalEditorPosition(18, 22),
+          new NaturalEditorPosition(18, 27),
         );
         await vscode.commands.executeCommand(
           'turboConsoleLog.displayLogMessage',
diff --git a/src/test/integration/js/log-feature/function/functionWithDecorators.ts b/src/test/integration/js/log-feature/function/functionWithDecorators.ts
@@ -3,7 +3,7 @@ import Mocha, { it, describe } from 'mocha';
 import { expect } from 'chai';
 import {
   openDocument,
-  ZeroBasedPosition,
+  NaturalEditorPosition,
   zeroBasedLine,
   expectActiveTextEditorWithFile,
   documentLinesChanged,
@@ -35,8 +35,8 @@ export default (): void => {
       if (activeTextEditor) {
         activeTextEditor.selections = [
           new vscode.Selection(
-            new ZeroBasedPosition(9, 20),
-            new ZeroBasedPosition(9, 24),
+            new NaturalEditorPosition(9, 20),
+            new NaturalEditorPosition(9, 24),
           ),
         ];
         await vscode.commands.executeCommand(
diff --git a/src/test/integration/js/log-feature/function/promiseAnonymousFunction.ts b/src/test/integration/js/log-feature/function/promiseAnonymousFunction.ts
@@ -3,7 +3,7 @@ import Mocha, { it, describe } from 'mocha';
 import { expect } from 'chai';
 import {
   openDocument,
-  ZeroBasedPosition,
+  NaturalEditorPosition,
   zeroBasedLine,
   expectActiveTextEditorWithFile,
   documentLinesChanged,
@@ -34,8 +34,8 @@ export default (): void => {
       if (activeTextEditor) {
         activeTextEditor.selections = [
           new vscode.Selection(
-            new ZeroBasedPosition(6, 9),
-            new ZeroBasedPosition(6, 21),
+            new NaturalEditorPosition(6, 9),
+            new NaturalEditorPosition(6, 21),
           ),
         ];
         await vscode.commands.executeCommand(
@@ -55,8 +55,8 @@ export default (): void => {
         ).to.equal(true);
         activeTextEditor.selections = [
           new vscode.Selection(
-            new ZeroBasedPosition(8, 9),
-            new ZeroBasedPosition(8, 29),
+            new NaturalEditorPosition(8, 9),
+            new NaturalEditorPosition(8, 29),
           ),
         ];
         await vscode.commands.executeCommand(
diff --git a/src/test/integration/js/log-feature/object/logObjectProperty.ts b/src/test/integration/js/log-feature/object/logObjectProperty.ts
@@ -3,7 +3,7 @@ import { expect } from 'chai';
 import * as vscode from 'vscode';
 import {
   openDocument,
-  ZeroBasedPosition,
+  NaturalEditorPosition,
   zeroBasedLine,
   expectActiveTextEditorWithFile,
   documentLinesChanged,
@@ -31,8 +31,8 @@ export default (): void => {
       if (activeTextEditor) {
         activeTextEditor.selections = [
           new vscode.Selection(
-            new ZeroBasedPosition(3, 5),
-            new ZeroBasedPosition(3, 8),
+            new NaturalEditorPosition(3, 5),
+            new NaturalEditorPosition(3, 8),
           ),
         ];
         await vscode.commands.executeCommand(
@@ -59,8 +59,8 @@ export default (): void => {
       if (activeTextEditor) {
         activeTextEditor.selections = [
           new vscode.Selection(
-            new ZeroBasedPosition(5, 9),
-            new ZeroBasedPosition(5, 15),
+            new NaturalEditorPosition(5, 9),
+            new NaturalEditorPosition(5, 15),
           ),
         ];
         await vscode.commands.executeCommand(
@@ -87,8 +87,8 @@ export default (): void => {
       if (activeTextEditor) {
         activeTextEditor.selections = [
           new vscode.Selection(
-            new ZeroBasedPosition(6, 13),
-            new ZeroBasedPosition(6, 22),
+            new NaturalEditorPosition(6, 13),
+            new NaturalEditorPosition(6, 22),
           ),
         ];
         await vscode.commands.executeCommand(
diff --git a/src/test/integration/js/log-feature/variable/logLastLine.ts b/src/test/integration/js/log-feature/variable/logLastLine.ts
@@ -3,7 +3,7 @@ import Mocha, { it, describe } from 'mocha';
 import { expect } from 'chai';
 import {
   openDocument,
-  ZeroBasedPosition,
+  NaturalEditorPosition,
   expectActiveTextEditorWithFile,
   documentLinesChanged,
 } from '../../../helpers';
@@ -30,8 +30,8 @@ export default (): void => {
       if (activeTextEditor) {
         activeTextEditor.selections = [
           new vscode.Selection(
-            new ZeroBasedPosition(1, 7),
-            new ZeroBasedPosition(1, 9),
+            new NaturalEditorPosition(1, 7),
+            new NaturalEditorPosition(1, 9),
           ),
         ];
         await vscode.commands.executeCommand(
