bugfix for #4 "creation of test classes fails on nested maven project" (

#7) * bugfix for #4 "creation of test classes fails on nested maven project" * Remove the block of commented-out lines of code. * Remove the block of commented-out lines of code.
seratch · Mar 30, 2017 · 8c307eb · 8c307eb
1 parent 291c391
commit 8c307eb
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 16 deletions.
diff --git a/eclipse-plugin/src/main/java/org/junithelper/plugin/action/AbstractAction.java b/eclipse-plugin/src/main/java/org/junithelper/plugin/action/AbstractAction.java
@@ -46,8 +46,8 @@ protected Configuration getConfiguration(IPreferenceStore store, ISelection sele
         }
         if (!isNotSelected(structuredSelection) && !isSelectedSeveral(structuredSelection)) {
             String projectName = getProjectName(structuredSelection);
-            String projectRootPath = getWorkspaceRootAbsolutePath(getIWorkspaceRoot())
+            String projectRootPath = getIWorkspaceRoot().findMember(projectName).getLocationURI().getPath()
-                    + StringValue.DirectorySeparator.General + projectName + StringValue.DirectorySeparator.General;
+                    + StringValue.DirectorySeparator.General;
             String configFilepath = projectRootPath + "junithelper-config.properties";
             File configProperites = new File(configFilepath);
             if (configProperites.exists()) {
@@ -108,10 +108,6 @@ protected String getPathFromProjectRoot(StructuredSelection structuredSelection)
         return ResourcePathUtil.getPathStartsFromProjectRoot(structuredSelection);
     }
 
-    protected String getWorkspaceRootAbsolutePath(IWorkspaceRoot workspaceRoot) {
-        return workspaceRoot.getLocation().toString();
-    }
-
     protected String getResourcePathForTargetClassFile(StructuredSelection structuredSelection) {
         // path started from project root
         String pathFromProjectRoot = getPathFromProjectRoot(structuredSelection);

diff --git a/eclipse-plugin/src/main/java/org/junithelper/plugin/action/CreateNewTestCaseAction.java b/eclipse-plugin/src/main/java/org/junithelper/plugin/action/CreateNewTestCaseAction.java
@@ -102,8 +102,8 @@ public void run(IAction action) {
             // get project path, resource path
             projectName = getProjectName(structuredSelection);
             resourcePathForTargetClassFile = getResourcePathForTargetClassFile(structuredSelection);
-            String projectRootAbsolutePath = getWorkspaceRootAbsolutePath(getIWorkspaceRoot())
+            String projectRootAbsolutePath = getIWorkspaceRoot().findMember(projectName).getLocationURI().getPath()
-                    + StringValue.DirectorySeparator.General + projectName + StringValue.DirectorySeparator.General;
+                    + StringValue.DirectorySeparator.General;
 
             resourcePathForTestClassFile = resourcePathForTargetClassFile.replaceFirst(
                     config.directoryPathOfProductSourceCode, config.directoryPathOfTestSourceCode).replace(

diff --git a/eclipse-plugin/src/main/java/org/junithelper/plugin/action/Force3TestCaseAction.java b/eclipse-plugin/src/main/java/org/junithelper/plugin/action/Force3TestCaseAction.java
@@ -74,8 +74,8 @@ public void run(IAction action) {
                     config.directoryPathOfProductSourceCode, config.directoryPathOfTestSourceCode).replaceFirst(
                     "[^(Test)]\\.java$", StringValue.JUnit.TestClassNameSuffix + StringValue.FileExtension.JavaFile);
             String projectName = getProjectName(structuredSelection);
-            String projectRootAbsolutePath = getWorkspaceRootAbsolutePath(getIWorkspaceRoot())
+            String projectRootAbsolutePath = getIWorkspaceRoot().findMember(projectName).getLocationURI().getPath()
-                    + StringValue.DirectorySeparator.General + projectName + StringValue.DirectorySeparator.General;
+                    + StringValue.DirectorySeparator.General;
 
             // ----------------------------------------
             // check selection

diff --git a/eclipse-plugin/src/main/java/org/junithelper/plugin/action/Force4TestCaseAction.java b/eclipse-plugin/src/main/java/org/junithelper/plugin/action/Force4TestCaseAction.java
@@ -74,8 +74,8 @@ public void run(IAction action) {
                     config.directoryPathOfProductSourceCode, config.directoryPathOfTestSourceCode).replaceFirst(
                     "[^(Test)]\\.java$", StringValue.JUnit.TestClassNameSuffix + StringValue.FileExtension.JavaFile);
             String projectName = getProjectName(structuredSelection);
-            String projectRootAbsolutePath = getWorkspaceRootAbsolutePath(getIWorkspaceRoot())
+            String projectRootAbsolutePath = getIWorkspaceRoot().findMember(projectName).getLocationURI().getPath()
-                    + StringValue.DirectorySeparator.General + projectName + StringValue.DirectorySeparator.General;
+                    + StringValue.DirectorySeparator.General;
 
             // ----------------------------------------
             // check selection

diff --git a/eclipse-plugin/src/main/java/org/junithelper/plugin/action/OpenTestCaseAction.java b/eclipse-plugin/src/main/java/org/junithelper/plugin/action/OpenTestCaseAction.java
@@ -98,8 +98,8 @@ public void run(IAction action) {
                     StringValue.FileExtension.JavaFile,
                     StringValue.JUnit.TestClassNameSuffix + StringValue.FileExtension.JavaFile);
 
-            String projectRootAbsolutePath = getWorkspaceRootAbsolutePath(getIWorkspaceRoot())
+            String projectRootAbsolutePath = getIWorkspaceRoot().findMember(projectName).getLocationURI().getPath()
-                    + StringValue.DirectorySeparator.General + projectName + StringValue.DirectorySeparator.General;
+                    + StringValue.DirectorySeparator.General;
 
             String testCaseFileAbsolutePath = projectRootAbsolutePath + resourcePathForTestCaseFile;
 

diff --git a/eclipse-plugin/src/main/java/org/junithelper/plugin/action/OpenTestTargetAction.java b/eclipse-plugin/src/main/java/org/junithelper/plugin/action/OpenTestTargetAction.java
@@ -72,8 +72,8 @@ public void run(IAction action) {
             // get project path, resource path
             String resourcePathForTestClassFile = getResourcePathForTargetClassFile(structuredSelection);
             String projectName = getProjectName(structuredSelection);
-            String projectRootPath = getWorkspaceRootAbsolutePath(getIWorkspaceRoot())
+            String projectRootPath = getIWorkspaceRoot().findMember(projectName).getLocationURI().getPath()
-                    + StringValue.DirectorySeparator.General + projectName + StringValue.DirectorySeparator.General;
+                    + StringValue.DirectorySeparator.General;
 
             // ----------------------------------------
             // check selection