Clean tests

diff --git a/pf4j/src/test/java/org/pf4j/CompoundPluginDescriptorFinderTest.java b/pf4j/src/test/java/org/pf4j/CompoundPluginDescriptorFinderTest.java
index 518ba1e9bde59d60ba617007945c6983fbad94b5..a24ff44d82af46dd0b88e817ec19098e5ff79269 100644 (file)
--- a/pf4j/src/test/java/org/pf4j/CompoundPluginDescriptorFinderTest.java
+++ b/pf4j/src/test/java/org/pf4j/CompoundPluginDescriptorFinderTest.java
@@ -17,6 +17,7 @@ package org.pf4j;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
+import org.pf4j.plugin.PluginJar;
 import org.pf4j.plugin.PluginZip;
 
 import java.nio.charset.StandardCharsets;
@@ -64,9 +65,9 @@ public class CompoundPluginDescriptorFinderTest {
     @Test
     public void findInJar() throws Exception {
         PluginDescriptorFinder descriptorFinder = new CompoundPluginDescriptorFinder()
-            .add(new PropertiesPluginDescriptorFinder());
+            .add(new ManifestPluginDescriptorFinder());
 
-        PluginZip pluginJar = new PluginZip.Builder(pluginsPath.resolve("my-plugin-1.2.3.jar"), "myPlugin")
+        PluginJar pluginJar = new PluginJar.Builder(pluginsPath.resolve("my-plugin-1.2.3.jar"), "myPlugin")
             .pluginVersion("1.2.3")
             .build();
 
@@ -86,11 +87,11 @@ public class CompoundPluginDescriptorFinderTest {
     public void testSpaceCharacterInFileName() throws Exception {
         PluginDescriptorFinder descriptorFinder = new PropertiesPluginDescriptorFinder();
 
-        PluginZip pluginJar = new PluginZip.Builder(pluginsPath.resolve("my plugin-1.2.3.jar"), "myPlugin")
+        PluginZip pluginZip = new PluginZip.Builder(pluginsPath.resolve("my plugin-1.2.3.jar"), "myPlugin")
             .pluginVersion("1.2.3")
             .build();
 
-        PluginDescriptor pluginDescriptor = descriptorFinder.find(pluginJar.path());
+        PluginDescriptor pluginDescriptor = descriptorFinder.find(pluginZip.path());
         assertNotNull(pluginDescriptor);
     }
 

diff --git a/pf4j/src/test/java/org/pf4j/PropertiesPluginDescriptorFinderTest.java b/pf4j/src/test/java/org/pf4j/PropertiesPluginDescriptorFinderTest.java
index 78459525d4164c7654a286cbcbc0eea3fd3090e4..8b484b4a4f6bf069f04622517579ac886f6139fb 100644 (file)
--- a/pf4j/src/test/java/org/pf4j/PropertiesPluginDescriptorFinderTest.java
+++ b/pf4j/src/test/java/org/pf4j/PropertiesPluginDescriptorFinderTest.java
@@ -18,7 +18,6 @@ package org.pf4j;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
-import org.pf4j.plugin.PluginZip;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -29,7 +28,6 @@ import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -105,21 +103,6 @@ public class PropertiesPluginDescriptorFinderTest {
         assertThrows(PluginException.class, () -> descriptorFinder.find(pluginsPath.resolve("test-plugin-3")));
     }
 
-    @Test
-    public void findInJar() throws Exception {
-        PluginZip pluginJar = new PluginZip.Builder(pluginsPath.resolve("my-plugin-1.2.3.jar"), "myPlugin")
-            .pluginVersion("1.2.3")
-            .build();
-
-        assertTrue(Files.exists(pluginJar.path()));
-
-        PluginDescriptorFinder descriptorFinder = new PropertiesPluginDescriptorFinder();
-        PluginDescriptor pluginDescriptor = descriptorFinder.find(pluginJar.path());
-        assertNotNull(pluginDescriptor);
-        assertEquals("myPlugin", pluginJar.pluginId());
-        assertEquals("1.2.3", pluginJar.pluginVersion());
-    }
-
     private List<String> getPlugin1Properties() {
         String[] lines = new String[] {
             "plugin.id=test-plugin-1\n"