Author: brett
Date: Fri Jul 11 10:02:23 2014
New Revision: 1609666
URL: http://svn.apache.org/r1609666
Log:
change framework detection
ranges not always suitable - e.g. can have v4.0 installed but not v3.5
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_243_WpfGeneratedResourcesHandlingTest.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_288_Net40SupportTest.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_328_VS2010WpfProjectSupportTest.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.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_465_AspxDisablePrecompilationTest.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_474_AspxExcludeWorkingDirectoriesTest.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_571_AzureSDKVersionTest.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_580_WpfBrowserTest.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_96_GlobalAsaxPrecompiledTest.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0013WebAppInstallTest.java
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0041Net35Test.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=1609666&r1=1609665&r2=1609666&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
Fri Jul 11 10:02:23 2014
@@ -27,6 +27,7 @@ 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.Os;
import org.apache.maven.it.util.ResourceExtractor;
import org.apache.maven.it.util.StringUtils;
import org.apache.maven.it.util.cli.CommandLineException;
@@ -41,6 +42,7 @@ import java.io.StringWriter;
import java.io.Writer;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.regex.Matcher;
@@ -50,24 +52,27 @@ import java.util.zip.ZipFile;
public abstract class AbstractNPandayIntegrationTestCase
extends TestCase
{
+ protected static final String FRAMEWORK_V4_0 = "v4.0.30319";
+ protected static final String FRAMEWORK_V3_5 = "v3.5";
+ protected static final String FRAMEWORK_V2_0 = "v2.0.50727";
+ protected static final String FRAMEWORK_V1_1 = "v1.1";
+
protected boolean skip;
protected String skipReason;
- private static final String NPANDAY_MAX_FRAMEWORK_VERSION_PROPERTY =
"npanday.framework.version";
-
private static final String NPANDAY_VERSION_SYSTEM_PROPERTY =
"npanday.version";
protected static DefaultArtifactVersion version = checkVersion();
- private static DefaultArtifactVersion frameworkVersion =
checkFrameworkVersion();
-
private static boolean debugMaven = Boolean.valueOf( System.getProperty(
"debug.maven", "false" ) );
private static boolean debugOutput = Boolean.valueOf( System.getProperty(
"npanday.log.debug", "false" ) );
private static boolean forceVersion = Boolean.valueOf( System.getProperty(
"npanday.version.force", "false" ) );
+ private static final List<String> availableFrameworkVersions =
findAvailableFrameworkVersions();
+
private static final Pattern PATTERN = Pattern.compile(
"(.*?)-(RC[0-9]+|SNAPSHOT)" );
private static String disasmArg;
@@ -94,16 +99,14 @@ public abstract class AbstractNPandayInt
}
}
- protected AbstractNPandayIntegrationTestCase( String versionRangeStr,
String frameworkVersionStr )
+ protected AbstractNPandayIntegrationTestCase( String versionRangeStr,
String frameworkVersion )
{
this( versionRangeStr );
- VersionRange versionRange = createVersionRange(frameworkVersionStr);
-
- if ( frameworkVersion != null && !versionRange.containsVersion(
frameworkVersion ) && !forceVersion )
+ if ( !availableFrameworkVersions.contains(frameworkVersion) &&
!forceVersion )
{
skip = true;
- skipReason = "Framework version " + frameworkVersion + " not in
range " + versionRange;
+ skipReason = "Framework version " + frameworkVersion + " not
available";
}
}
@@ -122,6 +125,31 @@ public abstract class AbstractNPandayInt
return getVerifier(context.getTestDir());
}
+ private static List<String> findAvailableFrameworkVersions() {
+ // TODO: might need to check if framework is sufficient - might need
to check actual SDK for a given tools version
+
+ List<String> keys;
+ if (!Os.isFamily( Os.FAMILY_WINDOWS )) {
+ // on Mono, assume all present until we can do better at finding
them
+ System.out.println("Assuming all frameworks are available");
+ return Arrays.asList(FRAMEWORK_V1_1, FRAMEWORK_V2_0,
FRAMEWORK_V3_5, FRAMEWORK_V4_0);
+ }
+ else {
+ try {
+ keys = new ArrayList<String>();
+ for (String key :
WinRegistry.readStringSubKeys(WinRegistry.RegistryHKey.HKLM.getHKey(),
"SOFTWARE\\Microsoft\\.NETFramework")) {
+ if (key.matches("^v[0-9.]+$")) {
+ keys.add(key);
+ }
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e.getMessage(), e);
+ }
+ }
+ System.out.println("Available frameworks: " + keys);
+ return keys;
+ }
+
protected static boolean checkNPandayVersion( VersionRange versionRange,
DefaultArtifactVersion version )
{
if (version == null) {
@@ -158,58 +186,6 @@ public abstract class AbstractNPandayInt
return version;
}
- private static DefaultArtifactVersion checkFrameworkVersion()
- {
- DefaultArtifactVersion version = null;
- String v = System.getProperty( NPANDAY_MAX_FRAMEWORK_VERSION_PROPERTY
);
- if ( v != null )
- {
- version = new DefaultArtifactVersion( v );
- System.out.println( "Using Framework versions <= " + version );
- }
- else
- {
- // TODO: this is not necessarily accurate. While it gets all those
available, the max should actually be
- // the one in the path (which can be obtained from the
output for csc, but there may be other better
- // ways such as a small C# app to interrogate it.
- // It may be best to have an NPanday plugin that can reveal
it then call that first to set it,
- // reusing the vendor info
-
- File versions = new File( System.getenv( "systemroot" ) +
"\\Microsoft.NET\\Framework" );
- if ( versions.exists() )
- {
- List<DefaultArtifactVersion> frameworkVersions = new
ArrayList<DefaultArtifactVersion>();
- String[] list = versions.list( new java.io.FilenameFilter()
- {
- public boolean accept( File parent, String name )
- {
- File f = new File( parent, name );
- // Mscorlib.dll can be used to detect 2.0 SDK,
Microsoft.CompactFramework.Build.Tasks.dll for 3.5 SDK
- // Having just the runtime (without these files) is
not sufficient
- return f.isDirectory() && ( new File( f,
"Mscorlib.dll" ).exists() || new File( f,
-
"Microsoft.CompactFramework.Build.Tasks.dll"
).exists() );
- }
- } );
- if ( list != null && list.length > 0 )
- {
- for ( String frameworkVersion : list )
- {
- frameworkVersions.add( new DefaultArtifactVersion(
frameworkVersion ) );
- }
- Collections.sort( frameworkVersions );
- System.out.println( "Available framework versions: " +
frameworkVersions );
- version = frameworkVersions.get( frameworkVersions.size()
- 1 );
- System.out.println( "Selected framework version: " +
version );
- }
- }
- if ( version == null )
- {
- System.out.println( "No Framework version given - attempting
to use all" );
- }
- }
- return version;
- }
-
protected static VersionRange createVersionRange( String versionRangeStr )
{
VersionRange versionRange;
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=1609666&r1=1609665&r2=1609666&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
Fri Jul 11 10:02:23 2014
@@ -26,7 +26,7 @@ public class Azure17Bootstrap
{
public Azure17Bootstrap()
{
- super( "[1.5.0-incubating,)", "[v4.0.30319,)" );
+ super( "[1.5.0-incubating,)" );
skipIfMissingAzureSDK("1.7");
}
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=1609666&r1=1609665&r2=1609666&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
Fri Jul 11 10:02:23 2014
@@ -26,7 +26,7 @@ public class AzureBootstrap
{
public AzureBootstrap()
{
- super( "[1.5.0-incubating,)", "[v4.0.30319,)" );
+ super( "[1.5.0-incubating,)" );
skipIfMissingAzureSDK("1.6");
}
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=1609666&r1=1609665&r2=1609666&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
Fri Jul 11 10:02:23 2014
@@ -26,9 +26,10 @@ import java.io.File;
public class NPANDAY_196_MvcSupportTest
extends AbstractNPandayIntegrationTestCase
{
+
public NPANDAY_196_MvcSupportTest()
{
- super( "[1.2,)", "[v3.5,)" );
+ super( "[1.2,)", FRAMEWORK_V3_5 );
skipIfMissingMVC2();
}
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_243_WpfGeneratedResourcesHandlingTest.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_243_WpfGeneratedResourcesHandlingTest.java?rev=1609666&r1=1609665&r2=1609666&view=diff
==============================================================================
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_243_WpfGeneratedResourcesHandlingTest.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_243_WpfGeneratedResourcesHandlingTest.java
Fri Jul 11 10:02:23 2014
@@ -28,7 +28,7 @@ public class NPANDAY_243_WpfGeneratedRes
{
public NPANDAY_243_WpfGeneratedResourcesHandlingTest()
{
- super( "[1.2,)", "[v3.5,)" ); // 1.2+
+ super( "[1.2,)", FRAMEWORK_V3_5 );
}
public void testWpfProject()
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=1609666&r1=1609665&r2=1609666&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
Fri Jul 11 10:02:23 2014
@@ -30,7 +30,7 @@ public class NPANDAY_254_WebAppWithCultu
{
public NPANDAY_254_WebAppWithCultureResTest()
{
- super( "[1.5.0-incubating,)", "[v4.0.30319,)" );
+ super( "[1.5.0-incubating,)", FRAMEWORK_V4_0 );
skipIfMissingWebDeployV2();
skipIfXdtNotPresent();
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_288_Net40SupportTest.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_288_Net40SupportTest.java?rev=1609666&r1=1609665&r2=1609666&view=diff
==============================================================================
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_288_Net40SupportTest.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_288_Net40SupportTest.java
Fri Jul 11 10:02:23 2014
@@ -28,7 +28,7 @@ public class NPANDAY_288_Net40SupportTes
{
public NPANDAY_288_Net40SupportTest()
{
- super( "[1.4.0-incubating,)", "[v4.0.30319,)" );
+ super( "[1.4.0-incubating,)", FRAMEWORK_V4_0 );
}
public void testNet40Project()
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_328_VS2010WpfProjectSupportTest.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_328_VS2010WpfProjectSupportTest.java?rev=1609666&r1=1609665&r2=1609666&view=diff
==============================================================================
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_328_VS2010WpfProjectSupportTest.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_328_VS2010WpfProjectSupportTest.java
Fri Jul 11 10:02:23 2014
@@ -28,7 +28,7 @@ public class NPANDAY_328_VS2010WpfProjec
{
public NPANDAY_328_VS2010WpfProjectSupportTest()
{
- super( "[1.4.0-incubating,)", "[v4.0.30319,)" );
+ super( "[1.4.0-incubating,)", FRAMEWORK_V4_0 );
}
public void testWPF2010Project()
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.java?rev=1609666&r1=1609665&r2=1609666&view=diff
==============================================================================
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_329_VS2010WcfProjectSupportTest.java
Fri Jul 11 10:02:23 2014
@@ -28,9 +28,10 @@ import java.util.List;
public class NPANDAY_329_VS2010WcfProjectSupportTest
extends AbstractNPandayIntegrationTestCase
{
+
public NPANDAY_329_VS2010WcfProjectSupportTest()
{
- super( "[1.4.0-incubating,)", "[v4.0.30319,)" );
+ super( "[1.4.0-incubating,)", FRAMEWORK_V4_0);
}
public void testWCF2010Project()
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=1609666&r1=1609665&r2=1609666&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
Fri Jul 11 10:02:23 2014
@@ -28,7 +28,7 @@ public class NPANDAY_330_VS2010MvcProjec
{
public NPANDAY_330_VS2010MvcProjectSupportTest()
{
- super( "[1.4.0-incubating,)", "[v4.0.30319,)" );
+ super( "[1.4.0-incubating,)", FRAMEWORK_V4_0 );
skipIfMissingMVC2();
}
Modified:
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_465_AspxDisablePrecompilationTest.java?rev=1609666&r1=1609665&r2=1609666&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_465_AspxDisablePrecompilationTest.java
Fri Jul 11 10:02:23 2014
@@ -31,7 +31,7 @@ public class NPANDAY_465_AspxDisablePrec
{
public NPANDAY_465_AspxDisablePrecompilationTest()
{
- super( "[1.4.1-incubating,)", "[v3.5,)" );
+ super( "[1.4.1-incubating,)", FRAMEWORK_V3_5 );
}
public void testDisablePrecompilation()
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_474_AspxExcludeWorkingDirectoriesTest.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_474_AspxExcludeWorkingDirectoriesTest.java?rev=1609666&r1=1609665&r2=1609666&view=diff
==============================================================================
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_474_AspxExcludeWorkingDirectoriesTest.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_474_AspxExcludeWorkingDirectoriesTest.java
Fri Jul 11 10:02:23 2014
@@ -32,7 +32,7 @@ public class NPANDAY_474_AspxExcludeWork
{
public NPANDAY_474_AspxExcludeWorkingDirectoriesTest()
{
- super( "[1.4.1-incubating,)", "[v3.5,)" );
+ super( "[1.4.1-incubating,)", FRAMEWORK_V4_0 );
}
public void testExcludeWorkingDirectories()
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=1609666&r1=1609665&r2=1609666&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
Fri Jul 11 10:02:23 2014
@@ -26,7 +26,7 @@ public class NPANDAY_480_AzureSupportOne
{
public NPANDAY_480_AzureSupportOneWebRole()
{
- super( "[1.5.0-incubating,)", "[v4.0.30319,)" );
+ super( "[1.5.0-incubating,)", FRAMEWORK_V4_0 );
skipIfMissingAzureSDK("1.6");
skipIfMissingWebDeployV2();
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=1609666&r1=1609665&r2=1609666&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
Fri Jul 11 10:02:23 2014
@@ -26,7 +26,7 @@ public class NPANDAY_480_CloudServiceWit
{
public NPANDAY_480_CloudServiceWithMultipleRoles()
{
- super( "[1.5.0-incubating,)", "[v4.0.30319,)" );
+ super( "[1.5.0-incubating,)", FRAMEWORK_V4_0 );
skipIfMissingAzureSDK("1.6");
skipIfMissingWebDeployV2();
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=1609666&r1=1609665&r2=1609666&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
Fri Jul 11 10:02:23 2014
@@ -26,7 +26,7 @@ public class NPANDAY_480_CloudServiceWit
{
public NPANDAY_480_CloudServiceWithWorkerRole()
{
- super( "[1.5.0-incubating,)", "[v4.0.30319,)" );
+ super( "[1.5.0-incubating,)", FRAMEWORK_V4_0 );
skipIfMissingAzureSDK("1.6");
}
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_571_AzureSDKVersionTest.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_571_AzureSDKVersionTest.java?rev=1609666&r1=1609665&r2=1609666&view=diff
==============================================================================
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_571_AzureSDKVersionTest.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_571_AzureSDKVersionTest.java
Fri Jul 11 10:02:23 2014
@@ -26,7 +26,7 @@ public class NPANDAY_571_AzureSDKVersion
{
public NPANDAY_571_AzureSDKVersionTest()
{
- super( "[1.5.0-incubating,)", "[v4.0.30319,)" );
+ super( "[1.5.0-incubating,)", FRAMEWORK_V4_0 );
skipIfMissingProgramFilesDirectory( "Microsoft SDKs\\Windows
Azure\\.NET SDK\\2012-06", "Azure SDK 1.7 is not installed" );
}
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_580_WpfBrowserTest.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_580_WpfBrowserTest.java?rev=1609666&r1=1609665&r2=1609666&view=diff
==============================================================================
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_580_WpfBrowserTest.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_580_WpfBrowserTest.java
Fri Jul 11 10:02:23 2014
@@ -28,7 +28,7 @@ public class NPANDAY_580_WpfBrowserTest
{
public NPANDAY_580_WpfBrowserTest()
{
- super( "[1.5.0-incubating,)", "[v4.0.30319,)" );
+ super( "[1.5.0-incubating,)", FRAMEWORK_V4_0 );
}
public void test()
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_96_GlobalAsaxPrecompiledTest.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_96_GlobalAsaxPrecompiledTest.java?rev=1609666&r1=1609665&r2=1609666&view=diff
==============================================================================
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_96_GlobalAsaxPrecompiledTest.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPANDAY_96_GlobalAsaxPrecompiledTest.java
Fri Jul 11 10:02:23 2014
@@ -31,7 +31,7 @@ public class NPANDAY_96_GlobalAsaxPrecom
{
public NPANDAY_96_GlobalAsaxPrecompiledTest()
{
- super( "[1.4.0-incubating,)", "[v3.5,)" );
+ super( "[1.4.0-incubating,)", FRAMEWORK_V3_5 );
}
public void testGlobalAsaxPrecompiled()
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java?rev=1609666&r1=1609665&r2=1609666&view=diff
==============================================================================
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0012VBWebAppTest.java
Fri Jul 11 10:02:23 2014
@@ -33,7 +33,7 @@ public class NPandayIT0012VBWebAppTest
{
public NPandayIT0012VBWebAppTest()
{
- super( "[1.2,)" );
+ super( "[1.2,)", FRAMEWORK_V3_5 );
}
public void testWebAppInstall()
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=1609666&r1=1609665&r2=1609666&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
Fri Jul 11 10:02:23 2014
@@ -31,7 +31,7 @@ public class NPandayIT0013WebAppInstallT
{
public NPandayIT0013WebAppInstallTest()
{
- super( "[1.0.2,)" );
+ super( "[1.0.2,)", FRAMEWORK_V3_5 );
}
public void testWebAppInstall()
Modified:
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0041Net35Test.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0041Net35Test.java?rev=1609666&r1=1609665&r2=1609666&view=diff
==============================================================================
---
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0041Net35Test.java
(original)
+++
incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/NPandayIT0041Net35Test.java
Fri Jul 11 10:02:23 2014
@@ -29,7 +29,7 @@ public class NPandayIT0041Net35Test
{
public NPandayIT0041Net35Test()
{
- super( "[1.0.2,)", "[v3.5,)" );
+ super( "[1.0.2,)", FRAMEWORK_V3_5 );
}
public void testNet35Project()
