Change tests so that folder name and project name are distinct #343
Conversation
Signed-off-by: David Kwon <dakwon@redhat.com>
|
One moment please, I will explain why this PR removes some tests. |
| @@ -187,7 +181,7 @@ public void run(IProgressMonitor monitor) throws CoreException { | |||
| // property: | |||
| // deployment-artifact=io.quarkus\:quarkus-hibernate-orm-deployment\:0.21.1 | |||
|
|
|||
| IJavaProject javaProject = JavaModelManager.getJavaModelManager().getJavaModel().getJavaProject(description.getName()); | |||
| IJavaProject javaProject = JavaModelManager.getJavaModelManager().getJavaModel().getJavaProject(projectName); | |||
There was a problem hiding this comment.
After a discussion with @fbricon, we can stick with Maven tests for now. When loading Maven projects (ie, from VS Code), the IResource path is P/folderName, therefore we should use projectName (which is the folder name) here instead of description.getName().
This essentially reverts a change that #330 did.
| @Test | ||
| public void projectNameSameFolderName() throws Exception { |
There was a problem hiding this comment.
This test tested the case where you have two folders in your workspace with the same folder name, but different project names specified in .project.
I removed this case because for maven projects, since this the IResource path is their folder name, if two maven projects have the same folder name, they would share the same IProject object.
In other words, this test would try to load two projects, but only one project would be created.
Also, it seems that in Eclipse, by default, you cannot have two maven project folders with the same name in the package explorer even though the two projects have different names in .project.
| List<ProjectLabelInfoEntry> projectLabelEntries = ProjectLabelManager.getInstance().getProjectLabelInfo(); | ||
| assertName(projectLabelEntries, quarkusGradle, "quarkus-gradle-project"); | ||
| assertName(projectLabelEntries, gradle, "empty-gradle-project"); | ||
| assertName(projectLabelEntries, renamedGradle, "my-gradle-project"); |
There was a problem hiding this comment.
When loading Gradle projects (ie, from VS Code), if the folder name is folder-name and the project name in .project is new-name, unlike loading Maven projects, I've observed that the IResource path is P/new-name instead of P/folder-name.
Since Maven projects are being focussed on, for now, I removed the Gradle test case where folder name != project name.
There was a problem hiding this comment.
This removed test case will cause a NPE since this PR loads projects using folder name: JavaModelManager.getJavaModelManager().getJavaModel().getJavaProject({folder name here}); in BasePropertiesManagerTest.java.
Currently, the tests introduced in #330 succeed when the project labels command retrieves the project name as both
project.getName()orproject.getDescription().getName()here: https://github.com/xorye/quarkus-ls/blob/4a1dae985db0ef0cfa9f7f8bac82e54bb6b878fd/microprofile.jdt/com.redhat.microprofile.jdt.core/src/main/java/com/redhat/microprofile/jdt/core/ProjectLabelManager.java#L83This PR ensures that tests pass if
project.getDescription().getName()is used, and fail ifproject.getName()is used.