-
Notifications
You must be signed in to change notification settings - Fork 330
Use destination URI when creating resource during copy refactoring #3588
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.
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
mx990
wants to merge
2
commits into
eclipse-xtext:main
Choose a base branch
from
mx990:refactoring-copy-uri-fix
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+176
−2
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
175 changes: 175 additions & 0 deletions
175
...ext.ui.tests/src-longrunning/org/eclipse/xtext/ui/tests/refactoring/ResourceCopyTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,175 @@ | ||
| /** | ||
| * Copyright (c) 2026 TypeFox GmbH (http://www.typefox.io) and others. | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0. | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| */ | ||
| package org.eclipse.xtext.ui.tests.refactoring; | ||
|
|
||
| import java.util.stream.Stream; | ||
|
|
||
| import org.eclipse.core.resources.IContainer; | ||
| import org.eclipse.core.resources.IFile; | ||
| import org.eclipse.core.resources.IResource; | ||
| import org.eclipse.core.runtime.IPath; | ||
| import org.eclipse.ltk.core.refactoring.resource.CopyResourcesDescriptor; | ||
| import org.eclipse.xtext.testing.InjectWith; | ||
| import org.eclipse.xtext.testing.XtextRunner; | ||
| import org.eclipse.xtext.testlanguages.fileAware.ui.tests.FileAwareTestLanguageUiInjectorProvider; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| /** | ||
| * @author koehnlein - Initial contribution and API | ||
|
mx990 marked this conversation as resolved.
|
||
| * @author mx990 - adapted from ResourceMoveTest | ||
| */ | ||
| @InjectWith(FileAwareTestLanguageUiInjectorProvider.class) | ||
| @RunWith(XtextRunner.class) | ||
| public class ResourceCopyTest extends AbstractResourceRelocationTest { | ||
| @Test | ||
| public void testCopyFile() throws Exception { | ||
| String model1 = | ||
| "package foo.bar\n" + | ||
| "element X {\n" + | ||
| " ref X\n" + | ||
| "}\n"; | ||
| IFile x = file("foo/bar/X.fileawaretestlanguage", model1); | ||
| String model2 = | ||
| "package foo\n" + | ||
| "element Y {\n" + | ||
| " ref bar.X\n" + | ||
| "}\n"; | ||
| file("foo/Y.fileawaretestlanguage", model2); | ||
| performCopy(folder("foo/baz"), x); | ||
| Assert.assertTrue(x.exists()); | ||
| assertFileContents("foo/bar/X.fileawaretestlanguage", model1); | ||
| assertFileContents("foo/Y.fileawaretestlanguage", model2); | ||
| String expectation1 = | ||
| "package foo.baz\n" + | ||
| "element X {\n" + | ||
| " ref X\n" + | ||
| "}\n"; | ||
| assertFileContents("foo/baz/X.fileawaretestlanguage", expectation1); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCopyFile_2() throws Exception { | ||
| String model1 = | ||
| "package foo.bar\n" + | ||
| "element X {\n" + | ||
| " ref X\n" + | ||
| "}\n"; | ||
| file("foo/bar/X.fileawaretestlanguage", model1); | ||
| String model2 = | ||
| "package foo\n" + | ||
| "element Y {\n" + | ||
| " ref bar.X\n" + | ||
| "}\n"; | ||
| IFile y = file("foo/Y.fileawaretestlanguage", model2); | ||
| performCopy(folder("foo/baz"), y); | ||
| Assert.assertTrue(y.exists()); | ||
| assertFileContents("foo/bar/X.fileawaretestlanguage", model1); | ||
| assertFileContents("foo/Y.fileawaretestlanguage", model2); | ||
| String expectation1 = | ||
| "package foo.baz\n" + | ||
| "element Y {\n" + | ||
| " ref foo.bar.X\n" + | ||
| "}\n"; | ||
| assertFileContents("foo/baz/Y.fileawaretestlanguage", expectation1); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCopyFiles() throws Exception { | ||
| String model1 = | ||
| "package foo.bar\n" + | ||
| "element X {\n" + | ||
| " ref X\n" + | ||
| "}\n"; | ||
| IFile x = file("foo/X.fileawaretestlanguage", model1); | ||
| String model2 = | ||
| "package foo\n" + | ||
| "element Y {\n" + | ||
| " ref bar.X\n" + | ||
| "}\n"; | ||
| IFile y = file("foo/Y.fileawaretestlanguage", model2); | ||
| performCopy(folder("foo/baz"), x, y); | ||
| Assert.assertTrue(y.exists()); | ||
| assertFileContents("foo/X.fileawaretestlanguage", model1); | ||
| assertFileContents("foo/Y.fileawaretestlanguage", model2); | ||
| String expectation1 = | ||
| "package foo.baz\n" + | ||
| "element X {\n" + | ||
| " ref X\n" + | ||
| "}\n"; | ||
| assertFileContents("foo/baz/X.fileawaretestlanguage", expectation1); | ||
| String expectation2 = | ||
| "package foo.baz\n" + | ||
| "element Y {\n" + | ||
| " ref X\n" + | ||
| "}\n"; | ||
| assertFileContents("foo/baz/Y.fileawaretestlanguage", expectation2); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCopyDirectory() throws Exception { | ||
| String model1 = | ||
| "package foo.bar\n" + | ||
| "element X {\n" + | ||
| " ref X\n" + | ||
| "}\n"; | ||
| IFile x = file("foo/bar/X.fileawaretestlanguage", model1); | ||
| String model2 = | ||
| "package foo\n" + | ||
| "element Y {\n" + | ||
| " ref bar.X\n" + | ||
| "}\n"; | ||
| file("foo/Y.fileawaretestlanguage", model2); | ||
| performCopy(folder("foo/baz"), x.getParent()); | ||
| Assert.assertTrue(x.exists()); | ||
| assertFileContents("foo/bar/X.fileawaretestlanguage", model1); | ||
| assertFileContents("foo/Y.fileawaretestlanguage", model2); | ||
| String expectation1 = | ||
| "package foo.baz.bar\n" + | ||
| "element X {\n" + | ||
| " ref X\n" + | ||
| "}\n"; | ||
| assertFileContents("foo/baz/bar/X.fileawaretestlanguage", expectation1); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCopyDirectoryToRoot() throws Exception { | ||
| String model1 = | ||
| "package foo.bar\n" + | ||
| "element X {\n" + | ||
| " ref X\n" + | ||
| "}\n"; | ||
| IFile x = file("foo/bar/X.fileawaretestlanguage", model1); | ||
| String model2 = | ||
| "package foo\n" + | ||
| "element Y {\n" + | ||
| " ref bar.X\n" + | ||
| "}\n"; | ||
| file("foo/Y.fileawaretestlanguage", model2); | ||
| performCopy(project, x.getParent()); | ||
| Assert.assertTrue(x.exists()); | ||
| assertFileContents("foo/bar/X.fileawaretestlanguage", model1); | ||
| assertFileContents("foo/Y.fileawaretestlanguage", model2); | ||
| String expectation1 = | ||
| "package bar\n" + | ||
| "element X {\n" + | ||
| " ref X\n" + | ||
| "}\n"; | ||
| assertFileContents("bar/X.fileawaretestlanguage", expectation1); | ||
| } | ||
|
|
||
| protected void performCopy(IContainer theDestination, IResource... theResources) throws Exception { | ||
| CopyResourcesDescriptor copyResourcesDescriptor = new CopyResourcesDescriptor(); | ||
| copyResourcesDescriptor.setResourcePaths(Stream.of(theResources).map(IResource::getFullPath).toArray(IPath[]::new)); | ||
| copyResourcesDescriptor.setDestinationPaths(Stream.of(theResources).map(IResource::getFullPath).map(IPath::lastSegment) | ||
| .map(theDestination.getFullPath()::append).toArray(IPath[]::new)); | ||
| performRefactoring(copyResourcesDescriptor); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.