Use readFile instead of openTextDocument for regex test case discovery (

#13)

src/language-tools/java.ts

@@ -8,7 +8,7 @@ import {SourceFileTestCaseInfo, TestCaseInfo} from '../test-info/test-info'
 
 const TEST_FILE_REGEX = /^(Test.+\.java|.+Test\.java)$/
 const JAVA_TEST_REGEX =
-  /@Test\s+.*\s+public void (?<methodName>\w+)|public class (?<className>\w+Test)\s+extends/
+  /@Test\s+.*\s+public void (?<methodName>\w+)|public class (?<className>(Test\w*|\w+Test))\s+extends/
 const PACKAGE_NAME_REGEX =
   /package\s+(?<packageName>([a-zA-Z_][a-zA-Z0-9_]*)(\.[a-zA-Z_][a-zA-Z0-9_]*)*);/
 
@@ -80,8 +80,9 @@ export class JavaLanguageTools implements LanguageTools {
     uri: vscode.Uri
   ): Promise<TestFileContents> {
     // Get document text.
-    const textDocument = await vscode.workspace.openTextDocument(uri)
-    const text = textDocument.getText()
+    const fileContents = await vscode.workspace.fs.readFile(uri)
+    const text = fileContents.toString()
+    const lines = text.split('\n')
 
     const testCases: DocumentTestItem[] = []
     let classTestCase: DocumentTestItem | undefined
@@ -92,8 +93,16 @@ export class JavaLanguageTools implements LanguageTools {
 
     let match
     const regex = new RegExp(JAVA_TEST_REGEX, 'g')
+
+    let lineStartIndex = 0
+    let currentLine = 0
     while ((match = regex.exec(text)) !== null) {
-      const position = textDocument.positionAt(match.index)
+      // Advance the current line each time there is a match.
+      while (lineStartIndex + lines[currentLine].length < match.index) {
+        lineStartIndex += lines[currentLine].length + 1 // +1 for the newline character.
+        currentLine++
+      }
+      const position = new vscode.Position(currentLine, 0)
 
       // Each match will contain either the full Class, or an individual test method.
       if (match.groups.className) {

src/test-explorer/resolver.ts

@@ -268,7 +268,14 @@ export class TestResolver implements OnModuleInit, vscode.Disposable {
     this.condenseTestItems(parentTest)
 
     // Kick off test case resolution within each of the target's documents.
+    let counter = 1
     for (const doc of allDocumentTestItems) {
+      updateDescription(
+        parentTest,
+        `Loading: analyzing test cases in file ${counter++} of ${
+          allDocumentTestItems.length
+        }`
+      )
       await this.resolveDocumentTestCases(doc, cancellationToken)
 
       if (doc.uri) {
@@ -280,6 +287,7 @@ export class TestResolver implements OnModuleInit, vscode.Disposable {
         this.store.updateTestItemWatcher(doc.id, watcher)
       }
     }
+    updateDescription(parentTest)
   }
 
   private async resolveDocumentTestCases(

src/test/suite/language-tools/java.test.ts

@@ -34,7 +34,7 @@ suite('Java Language Tools', () => {
     testController.dispose()
   })
 
-  test('process test cases', async () => {
+  test('process test cases, example 1', async () => {
     const result = await languageTools.getDocumentTestCases(
       vscode.Uri.file(
         path.join(fixtureDir, 'language_files', 'SampleValidExampleTest.java')
@@ -57,6 +57,29 @@ suite('Java Language Tools', () => {
     assert.equal(result.documentTest?.name, 'SampleValidExampleTest')
   })
 
+  test('process test cases, example 2', async () => {
+    const result = await languageTools.getDocumentTestCases(
+      vscode.Uri.file(
+        path.join(fixtureDir, 'language_files', 'TestSampleValidExample.java')
+      )
+    )
+
+    assert.strictEqual(result.isTestFile, true)
+    assert.strictEqual(result.testCases.length, 2)
+
+    const expectedBaseTestFilter =
+      'com.sample.project.common.client.samplepackage.TestSampleValidExample'
+
+    const expectedTests = ['testGetInstance', 'testGetSampleClient']
+    for (const test of result.testCases) {
+      assert.ok(expectedTests.includes(test.name))
+      assert.ok(test.testFilter.startsWith(expectedBaseTestFilter))
+      assert.ok(test.testFilter.endsWith(test.name))
+    }
+    assert.equal(result.documentTest?.testFilter, expectedBaseTestFilter)
+    assert.equal(result.documentTest?.name, 'TestSampleValidExample')
+  })
+
   test('no matching test class name', async () => {
     const result = await languageTools.getDocumentTestCases(
       vscode.Uri.file(

src/test/testdata/language_files/TestSampleValidExample.java

@@ -0,0 +1,26 @@
+package com.sample.project.common.client.samplepackage;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import com.uber.testing.base.TestBase;
+import org.junit.Test;
+
+public class TestSampleValidExample extends TestBase {
+  @Test
+  public void testGetInstance() {
+    SampleClientProvider instance =
+        SampleClientProvider.getInstance("sample");
+    assertNotNull(instance);
+  }
+
+  @Test
+  public void testGetSampleClient() {
+    SampleClientProvider instance =
+        SampleClientProvider.getInstance("sample");
+    StatementRenderingClient clientA = instance.getSampleClient();
+    StatementRenderingClient clientB = instance.getSampleClient();
+    assertNotNull(clientA);
+    assertEquals(clientA, clientB);
+  }
+}