Author: brett
Date: Thu Jan 26 11:09:37 2012
New Revision: 1236137
URL: http://svn.apache.org/viewvc?rev=1236137&view=rev
Log:
[NPANDAY-535] ensure a ZIP is installed in the local repository
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0013WebAppInstallTest.java
incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0013WebAppInstallTest/pom.xml
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0013WebAppInstallTest.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0013WebAppInstallTest.java?rev=1236137&r1=1236136&r2=1236137&view=diff
==============================================================================
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0013WebAppInstallTest.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0013WebAppInstallTest.java
Thu Jan 26 11:09:37 2012
@@ -39,6 +39,12 @@ public class NPandayIT0013WebAppInstallT
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/NPandayIT0013WebAppInstallTest" );
Verifier verifier = getVerifier( testDir );
+
+ File localRepoZip = new File( verifier.getArtifactPath( "NPanday.ITs",
"WebAppExample", "1.0-SNAPSHOT", "zip" ) );
+ File localRepoDll = new File( verifier.getArtifactPath( "NPanday.ITs",
"WebAppExample", "1.0-SNAPSHOT", "dll" ) );
+ localRepoZip.delete();
+ localRepoDll.delete();
+
verifier.executeGoal( "install" );
File zipFile = new File( testDir, getAssemblyFile( "WebAppExample",
"1.0.0", "zip" ) );
verifier.assertFilePresent( zipFile.getAbsolutePath() );
@@ -51,5 +57,12 @@ public class NPandayIT0013WebAppInstallT
String assembly = new File( testDir,
"target/WebAppExample/bin/WebAppExample.dll" ).getCanonicalPath();
assertClassPresent( assembly, "_Default" );
+
+ // aspx:package sets the main artifact as the ZIP, not the DLL
+ if ( checkNPandayVersion( "1.4.1-incubating,)" ) )
+ {
+ assertTrue( localRepoZip.exists() );
+ assertFalse( localRepoDll.exists() );
+ }
}
}
Modified:
incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0013WebAppInstallTest/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0013WebAppInstallTest/pom.xml?rev=1236137&r1=1236136&r2=1236137&view=diff
==============================================================================
---
incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0013WebAppInstallTest/pom.xml
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/resources/NPandayIT0013WebAppInstallTest/pom.xml
Thu Jan 26 11:09:37 2012
@@ -30,6 +30,7 @@
<artifactId>WebAppExample</artifactId>
<packaging>asp</packaging>
<name>NPanday.IT : WebAppExample</name>
+ <version>1.0-SNAPSHOT</version>
<build>
<sourceDirectory>.</sourceDirectory>
<plugins>
