svn commit: r1231839 - in /incubator/npanday/npanday-its/trunk/src/test: java/npanday/its/AddInInstallationTest.java resources/AddInInstallationTest/ resources/AddInInstallationTest/empty.txt

[br...@apache.org]

Author: brett
Date: Mon Jan 16 05:02:53 2012
New Revision: 1231839

URL: http://svn.apache.org/viewvc?rev=1231839&view=rev
Log:
make sure log4net is installed too

Added:
    incubator/npanday/npanday-its/trunk/src/test/resources/AddInInstallationTest/
    incubator/npanday/npanday-its/trunk/src/test/resources/AddInInstallationTest/empty.txt
Modified:
    incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AddInInstallationTest.java

Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AddInInstallationTest.java
URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AddInInstallationTest.java?rev=1231839&r1=1231838&r2=1231839&view=diff
==============================================================================
--- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AddInInstallationTest.java (original)
+++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AddInInstallationTest.java Mon Jan 16 05:02:53 2012
@@ -61,12 +61,12 @@ public class AddInInstallationTest
             );
         }
 
-        String tmpdir = System.getProperty( "maven.test.tmpdir", System.getProperty( "java.io.tmpdir" ) );
-        File testDir = new File( tmpdir, "AddInInstallationTest" );
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/AddInInstallationTest" );
+        File vsinstaller = new File( testDir, "vsinstaller" );
         testDir.mkdirs();
         Verifier verifier = getVerifier( testDir );
         verifier.setAutoclean( false );
-        verifier.getCliOptions().add( "-DinstallationLocation=" + new File( testDir, "vsinstaller" ).getAbsolutePath() );
+        verifier.getCliOptions().add( "-DinstallationLocation=" + vsinstaller.getAbsolutePath() );
         verifier.executeGoal( groupId + ":maven-vsinstaller-plugin:" + version.toString() + ":install" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
@@ -77,7 +77,10 @@ public class AddInInstallationTest
         {
             File assembly = new File( verifier.getArtifactPath( "org.apache.logging", "log4net", "1.2.11", "dll",
                                                                 "net-2.0" ) );
-            assertTrue( "Check " + assembly + " exists", assembly.exists() );
+            assertTrue( "Check " + assembly.getAbsolutePath() + " exists", assembly.exists() );
+            
+            assembly = new File( vsinstaller, "log4net.dll" );
+            assertTrue( "Check " + assembly.getAbsolutePath() + " exists", assembly.exists() );
         }
 
         // check correct framework version of libraries in the local repository
@@ -90,6 +93,9 @@ public class AddInInstallationTest
             assertTrue( "Check " + assembly + " exists", assembly.exists() );
 
             assertAssemblyFrameworkVersion( assembly, "[2.0.50727]" );
+
+            assembly = new File( vsinstaller, parts[1] + ".dll" );
+            assertTrue( "Check " + assembly.getAbsolutePath() + " exists", assembly.exists() );
         }
     }
 }

Added: incubator/npanday/npanday-its/trunk/src/test/resources/AddInInstallationTest/empty.txt
URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/AddInInstallationTest/empty.txt?rev=1231839&view=auto
==============================================================================
--- incubator/npanday/npanday-its/trunk/src/test/resources/AddInInstallationTest/empty.txt (added)
+++ incubator/npanday/npanday-its/trunk/src/test/resources/AddInInstallationTest/empty.txt Mon Jan 16 05:02:53 2012
@@ -0,0 +1 @@
+deliberately empty directory to check that installation works
\ No newline at end of file