GRAILS-6719 applied patch for similarly-named inline plugin name confusion

Author: burtbeckwith

src/java/grails/util/PluginBuildSettings.groovy

@@ -193,7 +193,7 @@ class PluginBuildSettings {
         }
 
         for (Resource pluginDir in pluginDirs) {
-            def pluginPath = pluginDir.file.canonicalPath
+            def pluginPath = pluginDir.file.canonicalPath + File.separator
             def sourcePath = new File(sourceFile).canonicalPath
             if (sourcePath.startsWith(pluginPath)) {
                 // Check the path of the source file relative to the

src/test/grails/util/PluginBuildSettingsTests.groovy

@@ -12,7 +12,8 @@ class PluginBuildSettingsTests extends GroovyTestCase {
 
     private static final File TEST_PROJ_DIR = new File("test/test-projects/plugin-build-settings")
     private static final File NESTED_INLINE_PLUGIN_TEST_PROJ_DIR = new File("test/test-projects/nested-inline-plugins/app")
-    
+    private static final File INLINE_PLUGINS_TEST_PROJ_DIR = new File("test/test-projects/inline-plugins/app")
+
     PluginBuildSettings createPluginBuildSettings(File projectDir = TEST_PROJ_DIR) {
         def settings = new BuildSettings(new File("."), projectDir)
         settings.loadConfig()
@@ -183,30 +184,50 @@ class PluginBuildSettingsTests extends GroovyTestCase {
                     -> new File(pluginSettings.buildSettings.globalPluginsDir, "test/../gwt")
                 }] as Resource)
     }
-    
+
     void testNestedInlinePlugins() {
         def pluginSettings = createPluginBuildSettings(NESTED_INLINE_PLUGIN_TEST_PROJ_DIR)
         def inlinePluginDirs = pluginSettings.inlinePluginDirectories*.file
-        
+
         assertEquals("inline plugins found", 2, inlinePluginDirs.size())
-        
+
         def pluginOneDir = inlinePluginDirs.find { it.name.endsWith("plugin-one") }
         assertNotNull("plugin one dir", pluginOneDir)
         assertTrue("plugin one dir exists", pluginOneDir.exists())
-        
+
         def pluginTwoDir = inlinePluginDirs.find { it.name.endsWith("plugin-two") }
         assertNotNull("plugin two dir", pluginTwoDir)
-        
+
         // This is the most important test.
-        // 
+        //
         // plugin two is a dependency of plugin one, and is defined relative to it
         // which means the path it is defined with does not point to it if resolved
-        // relative to the "root" app that included plugin one. This would produce 
+        // relative to the "root" app that included plugin one. This would produce
         // a false positive if test/test-projects/nested-inline-plugins/plugin-two existed.
         assertTrue("plugin two dir exists", pluginTwoDir.exists())
-        
+
         // Make sure no one has done the wrong thing and put a dir at test/test-projects/nested-inline-plugins/plugin-two
         def pluginTwoInSameDirAsRootApp = new File(NESTED_INLINE_PLUGIN_TEST_PROJ_DIR.parentFile, "plugin-two")
         assertTrue("should not be a plugin-two dir in same dir as root app", !pluginTwoInSameDirAsRootApp.exists())
     }
+
+	void testInlinePluginsWithCommonPrefix() {
+		def pluginSettings = createPluginBuildSettings(INLINE_PLUGINS_TEST_PROJ_DIR)
+		def pluginInfos = pluginSettings.getPluginInfos()
+
+		assertEquals "plugins found", 2, pluginInfos.size()
+
+		assertNotNull "should contain foo", pluginInfos.find { it.name == 'foo' }
+		assertNotNull "should contain foobar", pluginInfos.find { it.name == 'foobar' }
+
+		def pluginsDir = new File(INLINE_PLUGINS_TEST_PROJ_DIR.parentFile, "plugins")
+		def fooSource = new File(pluginsDir, "foo/grails-app/controllers/foo/FooController.groovy")
+		def foobarSource = new File(pluginsDir, "foobar/grails-app/controllers/foobar/FoobarController.groovy")
+
+		assertEquals "FooController in foo plugin", "foo", pluginSettings.getPluginInfoForSource(fooSource.path).name
+		assertEquals "FoobarController in foobar plugin", "foobar", pluginSettings.getPluginInfoForSource(foobarSource.path).name
+
+		def testSource = new File(pluginsDir, "foo/test/unit/foo/FooControllerTests.groovy")
+		assertNull "test source should not return a plugin info", pluginSettings.getPluginInfoForSource(testSource.path)
+	}
 }

test/test-projects/inline-plugins/README.txt

@@ -0,0 +1 @@
+Used by PluginBuildSettingsTests to test GRAILS-6719

test/test-projects/inline-plugins/app/grails-app/conf/BuildConfig.groovy

@@ -0,0 +1,2 @@
+grails.plugin.location.foo="../plugins/foo"
+grails.plugin.location.foobar="../plugins/foobar"

test/test-projects/inline-plugins/plugins/foo/FooGrailsPlugin.groovy

@@ -0,0 +1 @@
+class FooGrailsPlugin {}

test/test-projects/inline-plugins/plugins/foo/grails-app/controllers/foo/FooController.groovy

@@ -0,0 +1,3 @@
+package foo
+
+class FooController {}

test/test-projects/inline-plugins/plugins/foobar/FoobarGrailsPlugin.groovy

@@ -0,0 +1 @@
+class FoobarGrailsPlugin {}

test/test-projects/inline-plugins/plugins/foobar/grails-app/controllers/foobar/FoobarController.groovy

@@ -0,0 +1,4 @@
+package foobar
+
+class FoobarController {}
+