Author: brett Date: Tue Feb 25 11:51:28 2014 New Revision: 1571658 URL: http://svn.apache.org/r1571658 Log: reduce duplication of skip conditions
Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/Azure17Bootstrap.java incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AzureBootstrap.java incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_196_MvcSupportTest.java incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_254_WebAppWithCultureResTest.java incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_330_VS2010MvcProjectSupportTest.java incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_452_SilverlightAppTest.java incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_AzureSupportOneWebRole.java incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithMultipleRoles.java incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithWorkerRole.java incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_488_MSDeployPackageSimpleWebApp.java Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java?rev=1571658&r1=1571657&r2=1571658&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.java Tue Feb 25 11:51:28 2014 @@ -26,7 +26,6 @@ import org.apache.maven.artifact.version import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.FileUtils; -import org.apache.maven.it.util.IOUtil; import org.apache.maven.it.util.ResourceExtractor; import org.apache.maven.it.util.cli.CommandLineException; import org.apache.maven.it.util.cli.CommandLineUtils; @@ -34,20 +33,15 @@ import org.apache.maven.it.util.cli.Comm import org.apache.maven.it.util.cli.StreamConsumer; import org.apache.maven.it.util.cli.WriterStreamConsumer; -import java.io.BufferedOutputStream; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; import java.io.StringWriter; import java.io.Writer; import java.util.ArrayList; import java.util.Collections; -import java.util.Enumeration; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.zip.ZipEntry; import java.util.zip.ZipFile; public abstract class AbstractNPandayIntegrationTestCase @@ -84,7 +78,7 @@ public abstract class AbstractNPandayInt protected AbstractNPandayIntegrationTestCase( String versionRangeStr ) { - VersionRange versionRange = createVersionRange( versionRangeStr ); + VersionRange versionRange = createVersionRange(versionRangeStr); if ( !checkNPandayVersion( versionRange, version ) && !forceVersion ) { @@ -97,7 +91,7 @@ public abstract class AbstractNPandayInt { String v = version.toString(); - Matcher m = PATTERN.matcher( v ); + Matcher m = PATTERN.matcher(v); if ( m.matches() ) { return versionRange.containsVersion( new DefaultArtifactVersion( m.group( 1 ) ) ); @@ -112,7 +106,7 @@ public abstract class AbstractNPandayInt { this( versionRangeStr ); - VersionRange versionRange = createVersionRange( frameworkVersionStr ); + VersionRange versionRange = createVersionRange(frameworkVersionStr); if ( frameworkVersion != null && !versionRange.containsVersion( frameworkVersion ) && !forceVersion ) { @@ -312,7 +306,7 @@ public abstract class AbstractNPandayInt protected String getBuildSourcesGenerated( String fileName ) { - return getBuildFile( "build-sources", fileName ); + return getBuildFile("build-sources", fileName); } protected String getBuildFile( String buildDirectory, String fileName ) @@ -322,12 +316,12 @@ public abstract class AbstractNPandayInt protected String getAssemblyFile( String assemblyName, String type ) { - return getAssemblyFile( assemblyName, null, type, null ); + return getAssemblyFile(assemblyName, null, type, null); } protected String getAssemblyFile( String assemblyName, String version, String type ) { - return getAssemblyFile( assemblyName, version, type, null ); + return getAssemblyFile(assemblyName, version, type, null); } protected String getAssemblyFile( String assemblyName, String version, String type, String classifier ) @@ -338,14 +332,14 @@ public abstract class AbstractNPandayInt protected void clearRdfCache() throws IOException { - FileUtils.deleteDirectory( new File( System.getProperty( "user.home" ), ".m2/uac/rdfRepository" ) ); + FileUtils.deleteDirectory(new File(System.getProperty("user.home"), ".m2/uac/rdfRepository")); } protected void deleteArtifact( Verifier verifier, String groupId, String artifactId, String version, String type ) throws IOException { FileUtils.deleteDirectory( new File( System.getProperty( "user.home" ), ".m2/uac/gac_msil/" + artifactId + "/" + version + "__" + groupId ) ); - verifier.deleteArtifact( groupId, artifactId, version, type ); + verifier.deleteArtifact(groupId, artifactId, version, type); } protected void assertSubsystem( String assembly, int subsystem ) @@ -493,7 +487,7 @@ public abstract class AbstractNPandayInt protected String getTestAssemblyFile( String artifactId, String version, String type ) { String basedir = "target/test-assemblies"; - return getAssemblyFilePath( basedir, artifactId, type ); + return getAssemblyFilePath(basedir, artifactId, type); } private String getAssemblyFilePath( String basedir, String artifactId, String type ) @@ -533,7 +527,7 @@ public abstract class AbstractNPandayInt private boolean isResourcePresent( String assembly, String resource ) throws VerificationException { - return isResourcePresent( assembly, getAssemblyName( assembly ), resource ); + return isResourcePresent(assembly, getAssemblyName(assembly), resource); } private boolean isResourcePresent( String assembly, String assemblyName, String resource ) @@ -575,7 +569,7 @@ public abstract class AbstractNPandayInt private boolean hasPublicKey( String assembly ) throws VerificationException { - String output = runILDisasm( assembly ); + String output = runILDisasm(assembly); boolean insideCorrectAssembly = false; for ( String line : output.split( "\n" ) ) @@ -599,7 +593,7 @@ public abstract class AbstractNPandayInt private String getAssemblyFrameworkVersion( File assembly ) throws VerificationException { - String output = runILDisasm( assembly.getAbsolutePath() ); + String output = runILDisasm(assembly.getAbsolutePath()); String prefix = "// Metadata version: v"; for ( String line : output.split( "\n" ) ) @@ -625,7 +619,7 @@ public abstract class AbstractNPandayInt throws VerificationException { String frameworkVersion = getAssemblyFrameworkVersion( assembly ); - VersionRange versionRange = createVersionRange( versionRangeStr ); + VersionRange versionRange = createVersionRange(versionRangeStr); if ( !versionRange.containsVersion( new DefaultArtifactVersion( frameworkVersion ) ) ) { fail( "Framework version " + frameworkVersion + " is not in range " + versionRangeStr ); @@ -689,7 +683,27 @@ public abstract class AbstractNPandayInt protected void assertXdtPresent() { // TODO: when XDT doesn't require VS 2010, then this can be removed - skipIfMissingMSBuildTask( "Microsoft/VisualStudio/v10.0/Web/Microsoft.Web.Publishing.Tasks.dll", - "Visual Studio 2010 with web platform is not installed" ); + skipIfMissingMSBuildTask("Microsoft/VisualStudio/v10.0/Web/Microsoft.Web.Publishing.Tasks.dll", + "Visual Studio 2010 with web platform is not installed"); + } + + protected void skipIfMissingWebDeployV2() { + skipIfMissingProgramFilesDirectory("IIS/Microsoft Web Deploy V2", "Web Deploy 2.0 not installed"); + } + + protected void skipIfMissingAzureSDK(String sdkVersion) { + if ("1.6".equals(sdkVersion)) { + skipIfMissingProgramFilesDirectory( "Windows Azure SDK", "Azure SDK is not installed" ); + } + else if ("1.7".equals(sdkVersion)) { + skipIfMissingProgramFilesDirectory( "Microsoft SDKs\\Windows Azure\\.NET SDK\\2012-06", "Azure SDK is not installed" ); + } + else { + throw new IllegalArgumentException("Unknown SDK version: " + sdkVersion); + } + } + + protected void skipIfMissingMVC2() { + skipIfMissingGAC( "System.Web.MVC", "MVC.NET is not installed" ); } } Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/Azure17Bootstrap.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/Azure17Bootstrap.java?rev=1571658&r1=1571657&r2=1571658&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/Azure17Bootstrap.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/Azure17Bootstrap.java Tue Feb 25 11:51:28 2014 @@ -31,7 +31,7 @@ public class Azure17Bootstrap { super( "[1.5.0-incubating,)", "[v4.0.30319,)" ); - skipIfMissingProgramFilesDirectory( "Microsoft SDKs\\Windows Azure\\.NET SDK\\2012-06", "Azure SDK is not installed" ); + skipIfMissingAzureSDK("1.7"); } public void testBootstrap() Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AzureBootstrap.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AzureBootstrap.java?rev=1571658&r1=1571657&r2=1571658&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AzureBootstrap.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AzureBootstrap.java Tue Feb 25 11:51:28 2014 @@ -31,7 +31,7 @@ public class AzureBootstrap { super( "[1.5.0-incubating,)", "[v4.0.30319,)" ); - skipIfMissingProgramFilesDirectory( "Windows Azure SDK", "Azure SDK is not installed" ); + skipIfMissingAzureSDK("1.6"); } public void testBootstrap() Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_196_MvcSupportTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_196_MvcSupportTest.java?rev=1571658&r1=1571657&r2=1571658&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_196_MvcSupportTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_196_MvcSupportTest.java Tue Feb 25 11:51:28 2014 @@ -29,9 +29,9 @@ public class NPANDAY_196_MvcSupportTest { public NPANDAY_196_MvcSupportTest() { - super( "[1.2,)", "[v3.5,)" ); + super( "[1.2,)", "[v3.5,)" ); - skipIfMissingGAC( "System.Web.MVC", "MVC.NET is not installed" ); + skipIfMissingMVC2(); } public void testMVCProject() Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_254_WebAppWithCultureResTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_254_WebAppWithCultureResTest.java?rev=1571658&r1=1571657&r2=1571658&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_254_WebAppWithCultureResTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_254_WebAppWithCultureResTest.java Tue Feb 25 11:51:28 2014 @@ -32,7 +32,7 @@ public class NPANDAY_254_WebAppWithCultu { super( "[1.5.0-incubating,)", "[v4.0.30319,)" ); - skipIfMissingProgramFilesDirectory( "IIS/Microsoft Web Deploy V2", "Web Deploy 2.0 not installed" ); + skipIfMissingWebDeployV2(); assertXdtPresent(); } Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_330_VS2010MvcProjectSupportTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_330_VS2010MvcProjectSupportTest.java?rev=1571658&r1=1571657&r2=1571658&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_330_VS2010MvcProjectSupportTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_330_VS2010MvcProjectSupportTest.java Tue Feb 25 11:51:28 2014 @@ -29,9 +29,9 @@ public class NPANDAY_330_VS2010MvcProjec { public NPANDAY_330_VS2010MvcProjectSupportTest() { - super( "[1.4.0-incubating,)", "[v4.0.30319,)" ); + super( "[1.4.0-incubating,)", "[v4.0.30319,)" ); - skipIfMissingGAC( "System.Web.MVC", "MVC.NET is not installed" ); + skipIfMissingMVC2(); } public void testMVC2010Project() Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_452_SilverlightAppTest.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_452_SilverlightAppTest.java?rev=1571658&r1=1571657&r2=1571658&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_452_SilverlightAppTest.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_452_SilverlightAppTest.java Tue Feb 25 11:51:28 2014 @@ -35,7 +35,7 @@ public class NPANDAY_452_SilverlightAppT skipIfMissingMSBuildTask( "Microsoft/Silverlight/v3.0/Microsoft.Silverlight.CSharp.targets", "Silverlight v3.0 SDK is not present" ); // required for ASP.NET packaging - skipIfMissingProgramFilesDirectory( "IIS/Microsoft Web Deploy V2", "Web Deploy 2.0 not installed" ); + skipIfMissingWebDeployV2(); } public void test() Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_AzureSupportOneWebRole.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_AzureSupportOneWebRole.java?rev=1571658&r1=1571657&r2=1571658&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_AzureSupportOneWebRole.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_AzureSupportOneWebRole.java Tue Feb 25 11:51:28 2014 @@ -28,8 +28,8 @@ public class NPANDAY_480_AzureSupportOne { super( "[1.5.0-incubating,)", "[v4.0.30319,)" ); - skipIfMissingProgramFilesDirectory( "Windows Azure SDK", "Azure SDK is not installed" ); - skipIfMissingProgramFilesDirectory( "IIS/Microsoft Web Deploy V2", "Web Deploy 2.0 not installed" ); + skipIfMissingAzureSDK("1.6"); + skipIfMissingWebDeployV2(); assertXdtPresent(); } Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithMultipleRoles.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithMultipleRoles.java?rev=1571658&r1=1571657&r2=1571658&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithMultipleRoles.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithMultipleRoles.java Tue Feb 25 11:51:28 2014 @@ -28,8 +28,8 @@ public class NPANDAY_480_CloudServiceWit { super( "[1.5.0-incubating,)", "[v4.0.30319,)" ); - skipIfMissingProgramFilesDirectory( "Windows Azure SDK", "Azure SDK is not installed" ); - skipIfMissingProgramFilesDirectory( "IIS/Microsoft Web Deploy V2", "Web Deploy 2.0 not installed" ); + skipIfMissingAzureSDK("1.6"); + skipIfMissingWebDeployV2(); assertXdtPresent(); } Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithWorkerRole.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithWorkerRole.java?rev=1571658&r1=1571657&r2=1571658&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithWorkerRole.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_480_CloudServiceWithWorkerRole.java Tue Feb 25 11:51:28 2014 @@ -28,7 +28,7 @@ public class NPANDAY_480_CloudServiceWit { super( "[1.5.0-incubating,)", "[v4.0.30319,)" ); - skipIfMissingProgramFilesDirectory( "Windows Azure SDK", "Azure SDK is not installed" ); + skipIfMissingAzureSDK("1.6"); } public void test() Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_488_MSDeployPackageSimpleWebApp.java URL: http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_488_MSDeployPackageSimpleWebApp.java?rev=1571658&r1=1571657&r2=1571658&view=diff ============================================================================== --- incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_488_MSDeployPackageSimpleWebApp.java (original) +++ incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_488_MSDeployPackageSimpleWebApp.java Tue Feb 25 11:51:28 2014 @@ -30,7 +30,7 @@ public class NPANDAY_488_MSDeployPackage { super( "[1.5.0-incubating,)" ); - skipIfMissingProgramFilesDirectory( "IIS/Microsoft Web Deploy V2", "Web Deploy 2.0 not installed" ); + skipIfMissingWebDeployV2(); } public void test()