-
Notifications
You must be signed in to change notification settings - Fork 835
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7011 from jtulach/jtulach/MultiLineTextsInMx
`NbLaunchDelegate` fix and test multi line texts in suite.py
- Loading branch information
Showing
5 changed files
with
211 additions
and
4 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
132 changes: 132 additions & 0 deletions
132
.../unit/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegateTest.java
This file contains 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,132 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.netbeans.modules.java.lsp.server.debugging.launch; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.util.Map; | ||
| import java.util.concurrent.CompletableFuture; | ||
| import java.util.function.Consumer; | ||
| import org.junit.After; | ||
| import org.junit.AfterClass; | ||
| import org.junit.Before; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Test; | ||
| import static org.junit.Assert.*; | ||
| import org.netbeans.api.project.Project; | ||
| import org.netbeans.api.project.ProjectManager; | ||
| import org.netbeans.modules.java.lsp.server.debugging.DebugAdapterContext; | ||
| import org.netbeans.spi.project.ActionProvider; | ||
| import org.netbeans.spi.project.ProjectFactory; | ||
| import org.netbeans.spi.project.ProjectState; | ||
| import org.netbeans.spi.project.SingleMethod; | ||
| import org.openide.filesystems.FileObject; | ||
| import org.openide.filesystems.FileUtil; | ||
| import org.openide.loaders.DataObject; | ||
| import org.openide.util.Lookup; | ||
| import org.openide.util.Pair; | ||
| import org.openide.util.lookup.Lookups; | ||
| import org.openide.util.lookup.ServiceProvider; | ||
|
|
||
| public class NbLaunchDelegateTest { | ||
|
|
||
| public NbLaunchDelegateTest() { | ||
| } | ||
|
|
||
| @Test | ||
| public void testFileObjectsLookup() throws Exception { | ||
| FileObject fo = FileUtil.createMemoryFileSystem().getRoot().createData("test.txt"); | ||
| Lookup lkp = NbLaunchDelegate.createTargetLookup(null, null, fo); | ||
| assertEquals(fo, lkp.lookup(FileObject.class)); | ||
|
|
||
| DataObject obj = lkp.lookup(DataObject.class); | ||
| assertNotNull("DataObject also found", obj); | ||
|
|
||
| assertEquals("It's FileObject's data object", obj, DataObject.find(fo)); | ||
| assertNull("No single method", lkp.lookup(SingleMethod.class)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testFileObjectsLookupWithSingleMethod() throws Exception { | ||
| FileObject fo = FileUtil.createMemoryFileSystem().getRoot().createData("test-with-method.txt"); | ||
| SingleMethod m = new SingleMethod(fo, "main"); | ||
| Lookup lkp = NbLaunchDelegate.createTargetLookup(null, m, fo); | ||
| assertEquals(fo, lkp.lookup(FileObject.class)); | ||
|
|
||
| DataObject obj = lkp.lookup(DataObject.class); | ||
| assertNotNull("DataObject also found", obj); | ||
|
|
||
| assertEquals("It's FileObject's data object", obj, DataObject.find(fo)); | ||
|
|
||
| assertEquals("Found single method", m, lkp.lookup(SingleMethod.class)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testFindsMavenProject() throws Exception { | ||
| FileObject dir = FileUtil.createMemoryFileSystem().getRoot().createFolder("testprj"); | ||
| FileObject xml = dir.createData("build.xml"); | ||
| Project prj = ProjectManager.getDefault().findProject(dir); | ||
| assertNotNull("Project dir recognized", prj); | ||
|
|
||
| SingleMethod m = new SingleMethod(xml, "main"); | ||
| Lookup lkp = NbLaunchDelegate.createTargetLookup(prj, m, xml); | ||
| assertNull("No file object", lkp.lookup(FileObject.class)); | ||
| DataObject obj = lkp.lookup(DataObject.class); | ||
| assertNull("No DataObject ", obj); | ||
| assertNull("No single method", lkp.lookup(SingleMethod.class)); | ||
| assertEquals(prj, lkp.lookup(Project.class)); | ||
| } | ||
|
|
||
| @ServiceProvider(service = ProjectFactory.class) | ||
| public static final class MockProjectFactory implements ProjectFactory { | ||
|
|
||
| @Override | ||
| public boolean isProject(FileObject projectDirectory) { | ||
| return projectDirectory.getNameExt().equals("testprj"); | ||
| } | ||
|
|
||
| @Override | ||
| public Project loadProject(FileObject projectDirectory, ProjectState state) throws IOException { | ||
| return new MockProject(projectDirectory); | ||
| } | ||
|
|
||
| @Override | ||
| public void saveProject(Project project) throws IOException, ClassCastException { | ||
| } | ||
|
|
||
| private static final class MockProject implements Project { | ||
| private final FileObject dir; | ||
|
|
||
| MockProject(FileObject dir) { | ||
| this.dir = dir; | ||
| } | ||
|
|
||
| @Override | ||
| public FileObject getProjectDirectory() { | ||
| return dir; | ||
| } | ||
|
|
||
| @Override | ||
| public Lookup getLookup() { | ||
| return Lookups.fixed(this); | ||
| } | ||
|
|
||
| } | ||
| } | ||
| } |
This file contains 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
53 changes: 53 additions & 0 deletions
53
java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/multilinetexts.py
This file contains 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,53 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
|
|
||
| suite = { | ||
| "mxversion": "7.5.0", | ||
| "name" : "multilinetexts", | ||
| "version" : "1.0.0", | ||
| "repositories" : { | ||
| }, | ||
| "libraries" : { | ||
| }, | ||
| "licenses" : { | ||
| }, | ||
| "distributions" : { | ||
| "TOOLCHAIN": { | ||
| "native": True, | ||
| "platformDependent": True, | ||
| "os": { | ||
| "linux": { | ||
| "layout": { | ||
| "toolchain.multi": { | ||
| "source_type": "string", | ||
| "value": ''' | ||
| line1 | ||
| line2 | ||
| line3 | ||
| line5 | ||
| ''' | ||
| }, | ||
| }, | ||
| "dependencies": [ | ||
| ], | ||
| }, | ||
| }, | ||
| "maven" : False, | ||
| }, | ||
| }, | ||
| } |