More adjustmetns to the tests were made.

MontesDesigns · May 22, 2013 · d702a16 · d702a16
1 parent 7614ea9
commit d702a16
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 39 deletions.
diff --git a/pixel-plugin-tests/src/test/java/org/onebeartoe/pixel/PluginSearchTest.java b/pixel-plugin-tests/src/test/java/org/onebeartoe/pixel/PluginSearchTest.java
@@ -20,9 +20,9 @@
 /**
  * Unit test for simple App.
  */
-public class PluginSearchTest 
-    extends TestCase
+public class PluginSearchTest extends TestCase
 {
+    private final String weatherJarPath = "../pixel-weather/target/pixel-weather-1.0-SNAPSHOT.jar";
     /**
      * Create the test case
      *
@@ -61,11 +61,10 @@ public void testPixelPcJar()
     public void testPixelWeatherJar()
     {
 	System.out.println("\n\n\nTesting pixel-weather JAR:");
-
-	String jarPath = "../pixel-pc/target/pixel-weather-1.0-SNAPSHOT.jar";
+
 	boolean useFilter = true;
 
-	int count = searchForPlugins(jarPath, useFilter);
+	int count = searchForPlugins(weatherJarPath, useFilter);
 
 	boolean foundPlugins = count > 0;
 
@@ -75,11 +74,11 @@ public void testPixelWeatherJar()
     public void testPixelWeatherJarNoFilter()
     {
 	System.out.println("\n\n\nTesting pixel-weather JAR, with no filter:");
-
-	String jarPath = "../pixel-pc/target/pixel-weather-1.0-SNAPSHOT.jar";
+
 	boolean useFilter = false;
 
-	int count = searchForPlugins(jarPath, useFilter);
+	int count = searchForPlugins(weatherJarPath, useFilter);
+	System.out.println("\n\n");
 
 	boolean foundPlugins = count > 0;
 

diff --git a/pixel-weather/pom.xml b/pixel-weather/pom.xml
@@ -59,30 +59,7 @@
                     </permissions>
 
                 </configuration>
-            </plugin>
-
-	    <plugin>
-		<artifactId>maven-assembly-plugin</artifactId>
-		<configuration>
-		  <archive>
-		    <manifest>
-		      <mainClass>com.ledpixelart.pc.PixelApp</mainClass>
-		    </manifest>
-		  </archive>
-		  <descriptorRefs>
-		    <descriptorRef>jar-with-dependencies</descriptorRef>
-		  </descriptorRefs>
-		</configuration>
-		<executions>
-		  <execution>
-		    <id>make-assembly</id>  <!-- this is used for inheritance merges -->
-		    <phase>package</phase>  <!-- bind to the packaging phase -->
-		    <goals>
-		      <goal>single</goal>
-		    </goals>
-		  </execution>
-		</executions>
-	    </plugin>
+            </plugin>	    
 
 	<plugin>
 	    <groupId>org.apache.maven.plugins</groupId>
@@ -94,13 +71,7 @@
          <artifactId>maven-jar-plugin</artifactId>
          <version>2.3.2</version>
          <configuration>
-           <archive>
-             <manifest>
-               <addClasspath>true</addClasspath>
-               <classpathPrefix>lib/</classpathPrefix>
-               <mainClass>com.ledpixelart.pc.PixelApp</mainClass>
-             </manifest>
-           </archive>
+
          </configuration>
       </plugin>