Author: brett Date: Fri Jul 11 11:59:10 2014 New Revision: 1609701 URL: http://svn.apache.org/r1609701 Log: v3.0 a separate list
also add comments for others for later clarity Modified: incubator/npanday/npanday-its/trunk/src/test/java/npanday/its/AbstractNPandayIntegrationTestCase.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=1609701&r1=1609700&r2=1609701&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 11:59:10 2014 @@ -141,12 +141,18 @@ public abstract class AbstractNPandayInt // Additional framework versions, which likely provide tools, as ToolsVersions is not always populated for (String key : WinRegistry.readStringSubKeys(WinRegistry.RegistryHKey.HKLM.getHKey(), "SOFTWARE\\Microsoft\\.NETFramework")) { + // No tests specific to v1.0/v1.1 if ("v2.0.50727".equals(key) && !keys.contains("2.0")) { keys.add("2.0"); } + else if ("v3.0".equals(key) && !keys.contains("3.0")) { + keys.add("3.0"); + } + // v3.5 not listed under .NETFramework as it is in place - rely on the ToolsVersions for that else if ("v4.0.30319".equals(key) && !keys.contains("4.0")) { keys.add("4.0"); } + // versions above v4.0 will all be found in ToolsVersions } } catch (Exception e) { throw new RuntimeException(e.getMessage(), e);