diff --git a/.gitignore b/.gitignore
index f061ef97..e0514848 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,8 @@ vs code extension/**/node_modules
vs code extension/**/client/server
vs code extension/**/.vscode-test
vs code extension/**/Jenkinsfile
+vs code extension/Cobol-check/output/testResults.html
+# Below is made bu ./gradlew prepareDistribution!vs code extension/Cobol-check/bin/*
vs-code-extension/**/package-lock.json
vs-code-extension/**/out
@@ -40,7 +42,9 @@ vs-code-extension/**/node_modules
vs-code-extension/**/client/server
vs-code-extension/**/.vscode-test
vs-code-extension/**/Jenkinsfile
-
+vs-code-extension/Cobol-check/output/testResults.html
+# Below is made bu ./gradlew prepareDistribution
+!vs-code-extension/Cobol-check/bin/*
# Java-related gitignore entries from: https://gist.github.com/dedunumax/54e82214715e35439227
##############################
@@ -73,7 +77,6 @@ buildNumber.properties
## Gradle
##############################
bin/*
-!vs code extension/Cobol-check/bin/*
build/*
!build/distributions/
.gradle
diff --git a/build/distributions/cobol-check-0.2.8.zip b/build/distributions/cobol-check-0.2.8.zip
index 84e0150e..97b14695 100644
Binary files a/build/distributions/cobol-check-0.2.8.zip and b/build/distributions/cobol-check-0.2.8.zip differ
diff --git a/vs-code-extension/Cobol-check/output/testResults.html b/vs-code-extension/Cobol-check/output/testResults.html
deleted file mode 100755
index fc41f118..00000000
--- a/vs-code-extension/Cobol-check/output/testResults.html
+++ /dev/null
@@ -1,278 +0,0 @@
-
-
-
-
-
-
-
-
-Test report for ALPHA
-Run from: 2023/08/25 17:24:48
-
-
- Suites (1) |
- Tests (15) |
-
-
- 1 passed |
- 15 passed |
-
-
- 0 failed |
- 0 failed |
-
-
-
-
-
- Equality with an alphanumeric literal using TO BE |
- passed |
-
-
-
- null
- |
-
-
-
-
-
- Equality with an alphanumeric literal using TO EQUAL |
- passed |
-
-
-
- null
- |
-
-
-
-
-
- Equality with an alphanumeric literal using '=' |
- passed |
-
-
-
- null
- |
-
-
-
-
-
- Equality with an alphanumeric literal and reference modification |
- passed |
-
-
-
- null
- |
-
-
-
-
-
- Non-equality with an alphanumeric literal using TO BE |
- passed |
-
-
-
- null
- |
-
-
-
-
-
- Non-equality with an alphanumeric literal using TO EQUAL |
- passed |
-
-
-
- null
- |
-
-
-
-
-
- Non-equality with an alphanumeric literal using '!=' |
- passed |
-
-
-
- null
- |
-
-
-
-
-
- Non-equality with an alphanumeric literal and reference modification |
- passed |
-
-
-
- null
- |
-
-
-
-
-
- Greater-than sign with an alphanumeric literal |
- passed |
-
-
-
- null
- |
-
-
-
-
-
- Less-than sign with an alphanumeric literal |
- passed |
-
-
-
- null
- |
-
-
-
-
-
- Not greater-than sign with an alphanumeric literal |
- passed |
-
-
-
- null
- |
-
-
-
-
-
- Not less-than sign with an alphanumeric literal |
- passed |
-
-
-
- null
- |
-
-
-
-
-
- Display numeric |
- passed |
-
-
-
- null
- |
-
-
-
-
-
- Variable must be SPACE |
- passed |
-
-
-
- null
- |
-
-
-
-
-
- Variable must be SPACES |
- passed |
-
-
-
- null
- |
-
-
-
-
-
\ No newline at end of file
diff --git a/vs-code-extension/client/src/Helpers/ExtensionHelper.ts b/vs-code-extension/client/src/Helpers/ExtensionHelper.ts
index 416f3af5..7f23e06a 100644
--- a/vs-code-extension/client/src/Helpers/ExtensionHelper.ts
+++ b/vs-code-extension/client/src/Helpers/ExtensionHelper.ts
@@ -23,7 +23,7 @@ export async function handleCobolCheckOut(output : CobParser.CobolCheckOutputPar
break;
case CobParser.OutputState.TestFailed:
- console.log("TEST FAILES")
+ console.log("TEST FAILED")
testResultFile = appendPath(vsCodeInstallDir, await getConfigurationValueFor(configPath, 'test.results.file'));
htmlResult = await getTextFromFile(testResultFile + '.html');
showWebWiev('Test Results - ' + getCurrentProgramName(), htmlResult)
diff --git a/vs-code-extension/client/src/extension.ts b/vs-code-extension/client/src/extension.ts
index ff7e9226..feb44c84 100644
--- a/vs-code-extension/client/src/extension.ts
+++ b/vs-code-extension/client/src/extension.ts
@@ -273,7 +273,14 @@ async function createDirectoryItems( controller:vscode.TestController, uri: vsco
tmpDir = tmpDir + '/' + dirArr[i]
const existing = prevFile.children.get(tmpDir);
- if(!existing){
+ if(existing){
+ const tmpData = testData.get(existing)
+ if(tmpData instanceof TestFile && tmpData.getIsTestSuiteDirectory()){
+ isInsideTestSuite=false
+ }
+ prevFile = existing;
+ }
+ else{
tmpUri = vscode.Uri.file(tmpDir);
tmpFile = controller.createTestItem(tmpDir, dirArr[i], tmpUri);
tmpData = new TestFile();
@@ -292,12 +299,6 @@ async function createDirectoryItems( controller:vscode.TestController, uri: vsco
}
}
prevFile=tmpFile;
- }else{
- const tmpData = testData.get(existing)
- if(tmpData instanceof TestFile && tmpData.getIsTestSuiteDirectory()){
- isInsideTestSuite=false
- }
- prevFile = existing;
}
}
return {tmpFile,tmpData};
diff --git a/vs-code-extension/client/src/services/CobolCheckInputParser.ts b/vs-code-extension/client/src/services/CobolCheckInputParser.ts
index 27311aa9..6b76d5a6 100644
--- a/vs-code-extension/client/src/services/CobolCheckInputParser.ts
+++ b/vs-code-extension/client/src/services/CobolCheckInputParser.ts
@@ -1,7 +1,6 @@
import * as vscode from 'vscode';
const testCaseRegex = /^\s*(TESTCASE)\s*(.*)/i;
-// const testRegex = /^\s*(Expect)\s*(.*)\s*(not?)\s(>|<|to\s*be)\s*(.*)\s*/i;
const testSuiteRegex = /^\s*(TESTSUITE)\s*(.*)/i;
export const parseMarkdown = (text: string, events: {