You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by br...@apache.org on 2012/01/16 05:24:57 UTC

svn commit: r1231841 - /incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AddInInstallationTest.java

Author: brett
Date: Mon Jan 16 05:24:57 2012
New Revision: 1231841

URL: http://svn.apache.org/viewvc?rev=1231841&view=rev
Log:
fix directory for testing addin installation

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=1231841&r1=1231840&r2=1231841&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:24:57 2012
@@ -71,15 +71,14 @@ public class AddInInstallationTest
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        // TODO: check the AddIn files
-
+        File vsinstallerBin = new File( vsinstaller, "bin" );
         if ( checkNPandayVersion( createVersionRange( "[1.5.0,)" ), version ) )
         {
             File assembly = new File( verifier.getArtifactPath( "org.apache.logging", "log4net", "1.2.11", "dll",
                                                                 "net-2.0" ) );
             assertTrue( "Check " + assembly.getAbsolutePath() + " exists", assembly.exists() );
             
-            assembly = new File( vsinstaller, "log4net.dll" );
+            assembly = new File( vsinstallerBin, "log4net.dll" );
             assertTrue( "Check " + assembly.getAbsolutePath() + " exists", assembly.exists() );
         }
 
@@ -94,7 +93,7 @@ public class AddInInstallationTest
 
             assertAssemblyFrameworkVersion( assembly, "[2.0.50727]" );
 
-            assembly = new File( vsinstaller, parts[1] + ".dll" );
+            assembly = new File( vsinstallerBin, parts[1] + ".dll" );
             assertTrue( "Check " + assembly.getAbsolutePath() + " exists", assembly.exists() );
         }
     }