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 2011/12/19 11:20:02 UTC
svn commit: r1220694 - in /incubator/npanday/npanday-its/trunk/src/test:
java/npanday/its/ resources/NPANDAY_474_AspxExcludeWorkingDirectoriesTest/
Author: brett
Date: Mon Dec 19 11:20:02 2011
New Revision: 1220694
URL: http://svn.apache.org/viewvc?rev=1220694&view=rev
Log:
add a test case for NPANDAY-474
Added:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_474_AspxExcludeWorkingDirectoriesTest.java
- copied, changed from r1211819, incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_465_AspxDisablePrecompilationTest.java
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_474_AspxExcludeWorkingDirectoriesTest/
- copied from r1211762, incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_329_VS2010WcfProjectSupportTest/
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/IntegrationTestSuite.java
incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_474_AspxExcludeWorkingDirectoriesTest/pom.xml
Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/IntegrationTestSuite.java?rev=1220694&r1=1220693&r2=1220694&view=diff
==============================================================================
--- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/IntegrationTestSuite.java (original)
+++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/IntegrationTestSuite.java Mon Dec 19 11:20:02 2011
@@ -46,6 +46,7 @@ public class IntegrationTestSuite
// suite.addTestSuite( NPandayIT0002NetModuleDependencyTest.class ); // issue #11729
// suite.addTestSuite( NPandayIT0003NetModuleTransitiveDependencyTest.class ); // issue #11729
+ suite.addTestSuite( NPANDAY_474_AspxExcludeWorkingDirectoriesTest.class);
suite.addTestSuite( NPANDAY_459_MsBuildProjectReferencesTest.class );
suite.addTestSuite( NPANDAY_465_AspxDisablePrecompilationTest.class );
suite.addTestSuite( NPANDAY_488_MSDeployPackageSimpleWebApp.class );
Copied: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_474_AspxExcludeWorkingDirectoriesTest.java (from r1211819, incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_465_AspxDisablePrecompilationTest.java)
URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_474_AspxExcludeWorkingDirectoriesTest.java?p2=incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_474_AspxExcludeWorkingDirectoriesTest.java&p1=incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_465_AspxDisablePrecompilationTest.java&r1=1211819&r2=1220694&rev=1220694&view=diff
==============================================================================
--- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_465_AspxDisablePrecompilationTest.java (original)
+++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_474_AspxExcludeWorkingDirectoriesTest.java Mon Dec 19 11:20:02 2011
@@ -23,37 +23,38 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-public class NPANDAY_465_AspxDisablePrecompilationTest
+public class NPANDAY_474_AspxExcludeWorkingDirectoriesTest
extends AbstractNPandayIntegrationTestCase
{
- public NPANDAY_465_AspxDisablePrecompilationTest()
+ public NPANDAY_474_AspxExcludeWorkingDirectoriesTest()
{
super( "[1.4.1-incubating,)", "[v3.5,)" );
}
- public void testDisablePrecompilation()
+ public void testExcludeWorkingDirectories()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/NPANDAY_465_AspxDisablePrecompilationTest" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/NPANDAY_474_AspxExcludeWorkingDirectoriesTest" );
+
+ File svnDir = new File( testDir, ".svn" );
+ svnDir.mkdirs();
+ new File( svnDir, "entries" ).createNewFile();
+ new File( svnDir, "prop-base" ).mkdir();
+
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
- File zipFile = new File( testDir, getAssemblyFile( "GlobalASAXExample", "1.0.0", "zip" ) );
+ File zipFile = new File( testDir, getAssemblyFile( "WcfService1", "1.0.0", "zip" ) );
verifier.assertFilePresent( zipFile.getAbsolutePath() );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- List<String> expectedEntries = Arrays.asList( "bin/GlobalASAXExample.dll", "Default.aspx", "Global.asax",
- "Web.config" );
- assertZipEntries( zipFile, expectedEntries );
-
- List<String> unexpectedEntries = Arrays.asList( "bin/App_global.asax.dll", "bin/App_global.asax.compiled",
- "Global.asax.cs", "Default.aspx.cs", "Default.aspx.designer.cs",
- "pom.xml", "GlobalASAXExample.csproj",
- "Properties/AssemblyInfo.cs" );
+ assertTrue( new File( testDir, ".svn" ).exists() );
+ assertTrue( new File( testDir, ".references" ).exists() );
+
+ List<String> unexpectedEntries = Arrays.asList( ".svn", ".references" );
assertNoZipEntries( zipFile, unexpectedEntries );
- String assembly = new File( testDir, "target/GlobalASAXExample/bin/GlobalASAXExample.dll" ).getCanonicalPath();
- assertClassPresent( assembly, "_Default" );
- assertClassPresent( assembly, "Global" );
+ String assembly = new File( testDir, "target/WcfService1/bin/WcfService1.dll" ).getCanonicalPath();
+ assertClassPresent( assembly, "Service1" );
}
}
Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_474_AspxExcludeWorkingDirectoriesTest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_474_AspxExcludeWorkingDirectoriesTest/pom.xml?rev=1220694&r1=1211762&r2=1220694&view=diff
==============================================================================
--- incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_474_AspxExcludeWorkingDirectoriesTest/pom.xml (original)
+++ incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_474_AspxExcludeWorkingDirectoriesTest/pom.xml Mon Dec 19 11:20:02 2011
@@ -48,8 +48,19 @@ under the License.
</plugin>
<plugin>
<groupId>org.apache.npanday.plugins</groupId>
- <artifactId>maven-aspx-plugin</artifactId>
+ <artifactId>NPanday.Plugin.Msbuild.JavaBinding</artifactId>
<extensions>true</extensions>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.npanday.plugins</groupId>
+ <artifactId>maven-aspx-plugin</artifactId>
<configuration>
<frameworkVersion>4.0</frameworkVersion>
</configuration>
@@ -79,4 +90,4 @@ under the License.
<classifier>31bf3856ad364e35</classifier>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>