Skip to content

refactor(tests): directly use Path instead of converting to File first #1507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FlorianKroiss wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −8
Open

refactor(tests): directly use Path instead of converting to File first #1507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/outline/OutlineContentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void testExternalFile(@TempDir Path tempDir) throws CoreException, IOExce

MockLanguageServer.INSTANCE.setDocumentSymbols(symbolCow);

final var editor = (ITextEditor) TestUtils.openExternalFileInEditor(testFile.toFile());
final var editor = (ITextEditor) TestUtils.openExternalFileInEditor(testFile);

final var outlinePage = (CNFOutlinePage) new EditorToOutlineAdapterFactory().getAdapter(editor, IContentOutlinePage.class);
final var shell = new Shell(editor.getEditorSite().getWorkbenchWindow().getShell());
Expand Down Expand Up @@ -90,7 +90,7 @@ public void testExternalFileOpenedOnFileStore(@TempDir Path tempDir) throws Core

MockLanguageServer.INSTANCE.setDocumentSymbols(symbolCow);

final var editor = (ITextEditor) TestUtils.openExternalFileOnFileStore(testFile.toFile());
final var editor = (ITextEditor) TestUtils.openExternalFileOnFileStore(testFile);

final var outlinePage = (CNFOutlinePage) new EditorToOutlineAdapterFactory().getAdapter(editor, IContentOutlinePage.class);
final var shell = new Shell(editor.getEditorSite().getWorkbenchWindow().getShell());
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/outline/OutlineViewerInputTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public void testDocumentURIAbsolutePathForExternalFile(@TempDir Path tempDir) th
var tempFile = Files.writeString(tempDir.resolve("externalTest.lspt"), "external file content for testing absolute paths");

// Open the external file in an editor
var editor = (ITextEditor) TestUtils.openExternalFileInEditor(tempFile.toFile());
var editor = (ITextEditor) TestUtils.openExternalFileInEditor(tempFile);
var document = LSPEclipseUtils.getDocument(editor);

// Create OutlineViewerInput and verify documentURI
Expand Down
9 changes: 4 additions & 5 deletions org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
Expand Down Expand Up @@ -101,20 +100,20 @@ public static List<IEditorReference> splitActiveEditor() {
return List.of(page.getEditorReferences());
}

public static IEditorPart openExternalFileInEditor(File file) throws PartInitException {
public static IEditorPart openExternalFileInEditor(Path file) throws PartInitException {
IWorkbenchWindow workbenchWindow = UI.getActiveWindow();
IWorkbenchPage page = workbenchWindow.getActivePage();
IEditorPart part = IDE.openEditor(page, file.toURI(), "org.eclipse.ui.genericeditor.GenericEditor", false);
IEditorPart part = IDE.openEditor(page, file.toUri(), "org.eclipse.ui.genericeditor.GenericEditor", false);
if (part != null) {
part.setFocus();
}
return part;
}

public static IEditorPart openExternalFileOnFileStore(File file) throws PartInitException {
public static IEditorPart openExternalFileOnFileStore(Path file) throws PartInitException {
IWorkbenchWindow workbenchWindow = UI.getActiveWindow();
IWorkbenchPage page = workbenchWindow.getActivePage();
IFileStore fileStore = EFS.getLocalFileSystem().getStore(file.toURI());
IFileStore fileStore = EFS.getLocalFileSystem().getStore(file.toUri());
IEditorPart part = IDE.openEditorOnFileStore(page, fileStore);
if (part != null) {
part.setFocus();
Expand Down