diff --git a/framework/test-src/play/plugins/PluginCollectionTest.java b/framework/test-src/play/plugins/PluginCollectionTest.java index dfd3e34424..64216248a7 100644 --- a/framework/test-src/play/plugins/PluginCollectionTest.java +++ b/framework/test-src/play/plugins/PluginCollectionTest.java @@ -6,6 +6,7 @@ import static org.mockito.Mockito.when; import java.io.File; +import java.net.URL; import java.util.Collection; import org.junit.Before; @@ -80,8 +81,10 @@ protected boolean isLoadedByApplicationClassloader(PlayPlugin plugin) { @Test public void skipsDuplicatePlugins() { PluginCollection pc = spy(new PluginCollection()); - when(pc.loadPlayPluginDescriptors()) - .thenReturn(asList(getClass().getResource("custom-play.plugins"), getClass().getResource("custom-play.plugins.duplicate"))); + URL resource1 = getClass().getResource("custom-play.plugins"); + URL resource2 = getClass().getResource("custom-play.duplicate.plugins"); + assertThat(resource2).isNotNull(); + when(pc.loadPlayPluginDescriptors()).thenReturn(asList(resource1, resource2)); pc.loadPlugins(); assertThat(pc.getAllPlugins()).containsExactly(pc.getPluginInstance(EnhancerPlugin.class), pc.getPluginInstance(TestPlugin.class)); } diff --git a/framework/test-src/play/plugins/custom-play.duplicate.plugins b/framework/test-src/play/plugins/custom-play.duplicate.plugins new file mode 100644 index 0000000000..ea739a14f7 --- /dev/null +++ b/framework/test-src/play/plugins/custom-play.duplicate.plugins @@ -0,0 +1,2 @@ +0:play.plugins.EnhancerPlugin +1:play.plugins.TestPlugin diff --git a/framework/test-src/play/plugins/custom-play.plugins.duplicate b/framework/test-src/play/plugins/custom-play.plugins.duplicate deleted file mode 100644 index 39ab6591bf..0000000000 --- a/framework/test-src/play/plugins/custom-play.plugins.duplicate +++ /dev/null @@ -1,2 +0,0 @@ -0:play.CorePlugin -1:play.plugins.TestPlugin