From 373302a2d63d0210866661e96a84c717b8832a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Sat, 13 Jan 2024 11:32:08 +0200 Subject: [PATCH] Fix warnings in AbstractTargetEditorTest Use try with resources and actually mark the class as abstract so it's not considered for running by JUnit. Warning reported in I-builds like https://download.eclipse.org/eclipse/downloads/drops4/I20240112-1800/compilelogs/plugins/org.eclipse.pde.genericeditor.extension.tests_1.2.300.v20231214-1521/@dot.html#OTHER_WARNINGS --- .../tests/AbstractTargetEditorTest.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/ui/org.eclipse.pde.genericeditor.extension.tests/src/org/eclipse/pde/genericeditor/extension/tests/AbstractTargetEditorTest.java b/ui/org.eclipse.pde.genericeditor.extension.tests/src/org/eclipse/pde/genericeditor/extension/tests/AbstractTargetEditorTest.java index 63b1dfd5d2..148ba370dd 100644 --- a/ui/org.eclipse.pde.genericeditor.extension.tests/src/org/eclipse/pde/genericeditor/extension/tests/AbstractTargetEditorTest.java +++ b/ui/org.eclipse.pde.genericeditor.extension.tests/src/org/eclipse/pde/genericeditor/extension/tests/AbstractTargetEditorTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2018 Red Hat Inc. and others + * Copyright (c) 2017, 2024 Red Hat Inc. and others * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -45,7 +45,7 @@ import org.junit.Before; import org.osgi.framework.FrameworkUtil; -public class AbstractTargetEditorTest { +public abstract class AbstractTargetEditorTest { static TargetDefinitionContentAssist contentAssist = new TargetDefinitionContentAssist(); private IProject project; @@ -70,15 +70,17 @@ public void setUp() throws Exception { protected ITextViewer getTextViewerForTarget(String name) throws Exception { IFile targetFile = project.getFile(name + ".target"); - InputStream testStream = FrameworkUtil.getBundle(this.getClass()) + try (InputStream testStream = FrameworkUtil.getBundle(this.getClass()) .getEntry("testing-files/target-files/" + name + ".txt").openStream(); - String normalizedLineFeeds = new BufferedReader(new InputStreamReader(testStream)).lines() - .collect(Collectors.joining("\n")); - InputStream normalizedStream = new ByteArrayInputStream(normalizedLineFeeds.getBytes(StandardCharsets.UTF_8)); - targetFile.create(normalizedStream, true, new NullProgressMonitor()); - IEditorPart editor = IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), - targetFile, "org.eclipse.ui.genericeditor.GenericEditor"); - return (ITextViewer) editor.getAdapter(ITextOperationTarget.class); + BufferedReader reader = new BufferedReader(new InputStreamReader(testStream))) { + String normalizedLineFeeds = reader.lines().collect(Collectors.joining("\n")); + InputStream normalizedStream = new ByteArrayInputStream( + normalizedLineFeeds.getBytes(StandardCharsets.UTF_8)); + targetFile.create(normalizedStream, true, new NullProgressMonitor()); + IEditorPart editor = IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), + targetFile, "org.eclipse.ui.genericeditor.GenericEditor"); + return (ITextViewer) editor.getAdapter(ITextOperationTarget.class); + } } protected String getLocationForSite(String name) {