Author: apadilla Date: Sat Apr 23 13:09:19 2011 New Revision: 1096141 URL: http://svn.apache.org/viewvc?rev=1096141&view=rev Log: * added additional assert for NPanday-377 * reverted commit on IntegrationTestSuite
Removed: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_377_WithNPandaySettingsPathTest/NPANDAY_377_WithNPandaySettingsPathTest/path/npanday-settings.xml Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/IntegrationTestSuite.java incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_377_WithNPandaySettingsPathTest.java incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_377_WithNPandaySettingsPathTest/NPANDAY_377_WithNPandaySettingsPathTest/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=1096141&r1=1096140&r2=1096141&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 Sat Apr 23 13:09:19 2011 @@ -47,43 +47,43 @@ public class IntegrationTestSuite // suite.addTestSuite( NPandayIT0003NetModuleTransitiveDependencyTest.class ); // issue #11729 suite.addTestSuite( NPANDAY_377_WithNPandaySettingsPathTest.class ); - //suite.addTestSuite( NPANDAY_329_VS2010WcfProjectSupportTest.class ); - //suite.addTestSuite( NPANDAY_328_VS2010WpfProjectSupportTest.class ); - //suite.addTestSuite( NPANDAY_330_VS2010MvcProjectSupportTest.class ); - //suite.addTestSuite( NPANDAY_288_Net40SupportTest.class ); - //suite.addTestSuite( NPANDAY_302_SnapshotUpdatesTest.class ); - //suite.addTestSuite( NPANDAY_292_CompilerParamForOptioninferTest.class ); - //suite.addTestSuite( NPANDAY_140_ConflictingExtensionsTest.class ); - //suite.addTestSuite( NPANDAY_268_TransitiveDependenciesTest.class ); - //suite.addTestSuite( NPANDAY_262_ResolvingMixedVersionsTest.class ); - //suite.addTestSuite( NPANDAY_196_MvcSupportTest.class ); - //suite.addTestSuite( NPANDAY_245_WpfGeneratedResourcesHandlingTest.class ); - //suite.addTestSuite( NPANDAY_198_MissingGroupOrVersionTest.class ); - //suite.addTestSuite( NPANDAY_208_MsBuildCopyReferencesTest.class ); - //suite.addTestSuite( NPANDAY_202_MsBuildErrorHandlingTest.class ); - //suite.addTestSuite( NPANDAY_121_ResGenWithErrorInFileNameTest.class ); + suite.addTestSuite( NPANDAY_329_VS2010WcfProjectSupportTest.class ); + suite.addTestSuite( NPANDAY_328_VS2010WpfProjectSupportTest.class ); + suite.addTestSuite( NPANDAY_330_VS2010MvcProjectSupportTest.class ); + suite.addTestSuite( NPANDAY_288_Net40SupportTest.class ); + suite.addTestSuite( NPANDAY_302_SnapshotUpdatesTest.class ); + suite.addTestSuite( NPANDAY_292_CompilerParamForOptioninferTest.class ); + suite.addTestSuite( NPANDAY_140_ConflictingExtensionsTest.class ); + suite.addTestSuite( NPANDAY_268_TransitiveDependenciesTest.class ); + suite.addTestSuite( NPANDAY_262_ResolvingMixedVersionsTest.class ); + suite.addTestSuite( NPANDAY_196_MvcSupportTest.class ); + suite.addTestSuite( NPANDAY_245_WpfGeneratedResourcesHandlingTest.class ); + suite.addTestSuite( NPANDAY_198_MissingGroupOrVersionTest.class ); + suite.addTestSuite( NPANDAY_208_MsBuildCopyReferencesTest.class ); + suite.addTestSuite( NPANDAY_202_MsBuildErrorHandlingTest.class ); + suite.addTestSuite( NPANDAY_121_ResGenWithErrorInFileNameTest.class ); - //suite.addTestSuite( NPandayIT0014WithResourceFileTest.class ); - //suite.addTestSuite( NPandayIT0013WebAppInstallTest.class ); - //suite.addTestSuite( NPandayIT0012VBWebAppTest.class ); - //suite.addTestSuite( NPandayIT0011SnapshotResolutionTest.class ); - //suite.addTestSuite( NPandayIT0041Net35Test.class ); - //suite.addTestSuite( NPandayIT0040IntraProjectDependencyTest.class ); - //suite.addTestSuite( NPandayIT0039ConsoleApplicationTest.class ); - //suite.addTestSuite( NPandayIT0038CompilerWithArgsTest.class ); - //suite.addTestSuite( NPandayIT0037ClassLibWithWebRefInstallTest.class ); - //suite.addTestSuite( NPandayIT0036InstalledArtifactsVerificationTest.class ); - //suite.addTestSuite( NPandayIT0035VBRootNamespaceTest.class ); - //suite.addTestSuite( NPandayIT0032CompileExclusionsTest.class ); - //suite.addTestSuite( NPandayIT0029RemoteRepoTest.class ); - //suite.addTestSuite( NPandayIT0028RemoteSnapshotRepoTest.class ); - //suite.addTestSuite( NPandayIT0022StrongNameKeyAddedToAssemblyTest.class ); - //suite.addTestSuite( NPandayIT0020EmbeddedResourcesTest.class ); - //suite.addTestSuite( NPandayIT0010VBCompilationTest.class ); - //suite.addTestSuite( NPandayIT0007XSDVerificationTest.class ); - //suite.addTestSuite( NPandayIT0006StockingHandlersTest.class ); - //suite.addTestSuite( NPandayIT0004NUnitTestVerificationTest.class ); - //suite.addTestSuite( NPandayIT0001CompilerVerificationTest.class ); + suite.addTestSuite( NPandayIT0014WithResourceFileTest.class ); + suite.addTestSuite( NPandayIT0013WebAppInstallTest.class ); + suite.addTestSuite( NPandayIT0012VBWebAppTest.class ); + suite.addTestSuite( NPandayIT0011SnapshotResolutionTest.class ); + suite.addTestSuite( NPandayIT0041Net35Test.class ); + suite.addTestSuite( NPandayIT0040IntraProjectDependencyTest.class ); + suite.addTestSuite( NPandayIT0039ConsoleApplicationTest.class ); + suite.addTestSuite( NPandayIT0038CompilerWithArgsTest.class ); + suite.addTestSuite( NPandayIT0037ClassLibWithWebRefInstallTest.class ); + suite.addTestSuite( NPandayIT0036InstalledArtifactsVerificationTest.class ); + suite.addTestSuite( NPandayIT0035VBRootNamespaceTest.class ); + suite.addTestSuite( NPandayIT0032CompileExclusionsTest.class ); + suite.addTestSuite( NPandayIT0029RemoteRepoTest.class ); + suite.addTestSuite( NPandayIT0028RemoteSnapshotRepoTest.class ); + suite.addTestSuite( NPandayIT0022StrongNameKeyAddedToAssemblyTest.class ); + suite.addTestSuite( NPandayIT0020EmbeddedResourcesTest.class ); + suite.addTestSuite( NPandayIT0010VBCompilationTest.class ); + suite.addTestSuite( NPandayIT0007XSDVerificationTest.class ); + suite.addTestSuite( NPandayIT0006StockingHandlersTest.class ); + suite.addTestSuite( NPandayIT0004NUnitTestVerificationTest.class ); + suite.addTestSuite( NPandayIT0001CompilerVerificationTest.class ); return suite; } Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_377_WithNPandaySettingsPathTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_377_WithNPandaySettingsPathTest.java?rev=1096141&r1=1096140&r2=1096141&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_377_WithNPandaySettingsPathTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_377_WithNPandaySettingsPathTest.java Sat Apr 23 13:09:19 2011 @@ -41,6 +41,7 @@ public class NPANDAY_377_WithNPandaySett verifier.executeGoal( "install" ); verifier.assertFilePresent( new File( testDir, "NPANDAY_377_WithNPandaySettingsPathTest/" + getAssemblyFile( "NPANDAY377WithNPandaySettingsPathTest", "1.0.0", "dll" ) ).getAbsolutePath() ); + verifier.assertFilePresent( new File( testDir, "NPANDAY_377_WithNPandaySettingsPathTest/npanday-settings.xml").getAbsolutePath() ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); } Modified: incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_377_WithNPandaySettingsPathTest/NPANDAY_377_WithNPandaySettingsPathTest/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_377_WithNPandaySettingsPathTest/NPANDAY_377_WithNPandaySettingsPathTest/pom.xml?rev=1096141&r1=1096140&r2=1096141&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_377_WithNPandaySettingsPathTest/NPANDAY_377_WithNPandaySettingsPathTest/pom.xml (original) +++ incubator/npanday/npanday-its/trunk/src/test/resources/NPANDAY_377_WithNPandaySettingsPathTest/NPANDAY_377_WithNPandaySettingsPathTest/pom.xml Sat Apr 23 13:09:19 2011 @@ -27,6 +27,6 @@ </plugins> </build> <properties> - <npanday.settings>${basedir}/path</npanday.settings> + <npanday.settings>${basedir}</npanday.settings> </properties> </project> \ No newline at end of file