Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 29376 invoked from network); 2 Mar 2010 10:22:46 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Mar 2010 10:22:46 -0000 Received: (qmail 51792 invoked by uid 500); 2 Mar 2010 10:22:43 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 51762 invoked by uid 500); 2 Mar 2010 10:22:43 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 51755 invoked by uid 99); 2 Mar 2010 10:22:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Mar 2010 10:22:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Mar 2010 10:22:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BC05723889E5; Tue, 2 Mar 2010 10:22:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r917946 - /continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java Date: Tue, 02 Mar 2010 10:22:22 -0000 To: commits@continuum.apache.org From: mbaclay@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100302102222.BC05723889E5@eris.apache.org> Author: mbaclay Date: Tue Mar 2 10:22:22 2010 New Revision: 917946 URL: http://svn.apache.org/viewvc?rev=917946&view=rev Log: updated fix for CONTINUUM-2474 Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java?rev=917946&r1=917945&r2=917946&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java Tue Mar 2 10:22:22 2010 @@ -30,55 +30,37 @@ public class InstallationTest extends AbstractInstallationTest { - public void testAddJdkToolWithoutBuildEnvirotment() + public void testAddJdkToolWithoutBuildEnvironment() { String INSTALL_TOOL_JDK_NAME = getProperty( "INSTALL_TOOL_JDK_NAME" ); - if(isWindows()) - { - String INSTALL_TOOL_JDK_PATH = getProperty( "INSTALL_TOOL_JDK_PATH" ); - goToAddInstallationTool(); - addInstallation( INSTALL_TOOL_JDK_NAME, "JDK", INSTALL_TOOL_JDK_PATH, false, true, true ); - } - else if(isMac() || isUnix()) - { - String INSTALL_TOOL_JDK_PATH = getEscapeProperty( "INSTALL_TOOL_JDK_PATH" ); - goToAddInstallationTool(); - addInstallation( INSTALL_TOOL_JDK_NAME, "JDK", INSTALL_TOOL_JDK_PATH, false, true, true ); - } + String INSTALL_TOOL_JDK_PATH = isWindows() ? getProperty( "INSTALL_TOOL_JDK_PATH" ) : getEscapeProperty( "INSTALL_TOOL_JDK_PATH" ); + goToAddInstallationTool(); + addInstallation( INSTALL_TOOL_JDK_NAME, "JDK", INSTALL_TOOL_JDK_PATH, false, true, true ); } - public void testAddMavenToolWithBuildEnvirotment() + public void testAddMavenToolWithBuildEnvironment() { String INSTALL_TOOL_MAVEN_NAME = getProperty( "INSTALL_TOOL_MAVEN_NAME" ); - if(isWindows()) - { - String INSTALL_TOOL_MAVEN_PATH = getProperty( "INSTALL_TOOL_MAVEN_PATH" ); - goToAddInstallationTool(); - addInstallation( INSTALL_TOOL_MAVEN_NAME, "Maven 2", INSTALL_TOOL_MAVEN_PATH, true, true, true ); - // TODO: Validate build envirotment - } - else if(isMac() || isUnix()) - { - String INSTALL_TOOL_MAVEN_PATH = getEscapeProperty( "INSTALL_TOOL_MAVEN_PATH" ); - goToAddInstallationTool(); - addInstallation( INSTALL_TOOL_MAVEN_NAME, "Maven 2", INSTALL_TOOL_MAVEN_PATH, true, true, true ); - // TODO: Validate build envirotment - } + String INSTALL_TOOL_MAVEN_PATH = isWindows() ? getProperty( "INSTALL_TOOL_MAVEN_PATH" ) : getEscapeProperty( "INSTALL_TOOL_MAVEN_PATH" ); + goToAddInstallationTool(); + addInstallation( INSTALL_TOOL_MAVEN_NAME, "Maven 2", INSTALL_TOOL_MAVEN_PATH, true, true, true ); + // TODO: Validate build environment + } - public void testAddInstallationVariableWithBuildEnvirotment() + public void testAddInstallationVariableWithBuildEnvironment() { String INSTALL_VAR_NAME = getProperty( "INSTALL_VAR_NAME" ); String INSTALL_VAR_VARIABLE_NAME = getProperty( "INSTALL_VAR_VARIABLE_NAME" ); String INSTALL_VAR_PATH = getProperty( "INSTALL_VAR_PATH" ); goToAddInstallationVariable(); addInstallation( INSTALL_VAR_NAME, INSTALL_VAR_VARIABLE_NAME, INSTALL_VAR_PATH, true, false, true ); - // TODO: Validate build envirotment + // TODO: Validate build environment } - public void testAddInstallationVariableWithoutBuildEnvirotment() + public void testAddInstallationVariableWithoutBuildEnvironment() { - String INSTALL_VAR_NAME = "var_without_build_envirotment"; + String INSTALL_VAR_NAME = "var_without_build_environment"; String INSTALL_VAR_VARIABLE_NAME = "var_name"; String INSTALL_VAR_PATH = "path"; goToAddInstallationVariable(); @@ -115,27 +97,18 @@ assertTextPresent( "You must define an environment variable" ); } - @Test( dependsOnMethods = { "testAddJdkToolWithoutBuildEnvirotment" } ) + @Test( dependsOnMethods = { "testAddJdkToolWithoutBuildEnvironment" } ) public void testAddDuplicatedInstallationTool() { String INSTALL_TOOL_JDK_NAME = getProperty( "INSTALL_TOOL_JDK_NAME" ); - if(isWindows()) - { - String INSTALL_TOOL_JDK_PATH = getProperty( "INSTALL_TOOL_JDK_PATH" ); - goToAddInstallationTool(); - addInstallation( INSTALL_TOOL_JDK_NAME, "JDK", INSTALL_TOOL_JDK_PATH, false, true, false ); - assertTextPresent( "Installation name already exists" ); - } - else if(isMac() || isUnix()) - { - String INSTALL_TOOL_JDK_PATH = getEscapeProperty( "INSTALL_TOOL_JDK_PATH" ); - goToAddInstallationTool(); - addInstallation( INSTALL_TOOL_JDK_NAME, "JDK", INSTALL_TOOL_JDK_PATH, false, true, false ); - assertTextPresent( "Installation name already exists" ); - } + String INSTALL_TOOL_JDK_PATH = isWindows() ? getProperty( "INSTALL_TOOL_JDK_PATH" ) : getEscapeProperty( "INSTALL_TOOL_JDK_PATH" ); + goToAddInstallationTool(); + addInstallation( INSTALL_TOOL_JDK_NAME, "JDK", INSTALL_TOOL_JDK_PATH, false, true, false ); + assertTextPresent( "Installation name already exists" ); + } - @Test( dependsOnMethods = { "testAddInstallationVariableWithBuildEnvirotment" } ) + @Test( dependsOnMethods = { "testAddInstallationVariableWithBuildEnvironment" } ) public void testAddDuplicatedInstallationVariable() { String INSTALL_VAR_NAME = getProperty( "INSTALL_VAR_NAME" ); @@ -146,31 +119,19 @@ assertTextPresent( "Installation name already exists" ); } - @Test( dependsOnMethods = { "testAddJdkToolWithoutBuildEnvirotment" } ) + @Test( dependsOnMethods = { "testAddJdkToolWithoutBuildEnvironment" } ) public void testEditInstallationTool() { String INSTALL_TOOL_JDK_NAME = getProperty( "INSTALL_TOOL_JDK_NAME" ); - if(isWindows()) - { - String INSTALL_TOOL_JDK_PATH = getProperty( "INSTALL_TOOL_JDK_PATH" ); - String newName = "new_name"; - goToEditInstallation( INSTALL_TOOL_JDK_NAME, "JDK", INSTALL_TOOL_JDK_PATH, true ); - editInstallation( newName, "JDK", INSTALL_TOOL_JDK_PATH, true, true ); - goToEditInstallation( newName, "JDK", INSTALL_TOOL_JDK_PATH, true ); - editInstallation( INSTALL_TOOL_JDK_NAME, "JDK", INSTALL_TOOL_JDK_PATH, true, true ); - } - else if(isMac() || isUnix()) - { - String INSTALL_TOOL_JDK_PATH = getEscapeProperty( "INSTALL_TOOL_JDK_PATH" ); - String newName = "new_name"; - goToEditInstallation( INSTALL_TOOL_JDK_NAME, "JDK", INSTALL_TOOL_JDK_PATH, true ); - editInstallation( newName, "JDK", INSTALL_TOOL_JDK_PATH, true, true ); - goToEditInstallation( newName, "JDK", INSTALL_TOOL_JDK_PATH, true ); - editInstallation( INSTALL_TOOL_JDK_NAME, "JDK", INSTALL_TOOL_JDK_PATH, true, true ); - } + String INSTALL_TOOL_JDK_PATH = isWindows() ? getProperty( "INSTALL_TOOL_JDK_PATH" ) : getEscapeProperty( "INSTALL_TOOL_JDK_PATH" ); + String newName = "new_name"; + goToEditInstallation( INSTALL_TOOL_JDK_NAME, "JDK", INSTALL_TOOL_JDK_PATH, true ); + editInstallation( newName, "JDK", INSTALL_TOOL_JDK_PATH, true, true ); + goToEditInstallation( newName, "JDK", INSTALL_TOOL_JDK_PATH, true ); + editInstallation( INSTALL_TOOL_JDK_NAME, "JDK", INSTALL_TOOL_JDK_PATH, true, true ); } - @Test( dependsOnMethods = { "testAddInstallationVariableWithBuildEnvirotment" } ) + @Test( dependsOnMethods = { "testAddInstallationVariableWithBuildEnvironment" } ) public void testEditInstallationVariable() { String INSTALL_VAR_NAME = getProperty( "INSTALL_VAR_NAME" ); @@ -198,22 +159,11 @@ String INSTALL_VAR_NAME = getProperty( "INSTALL_VAR_NAME" ); removeInstallation( INSTALL_VAR_NAME ); } - + public static boolean isWindows() { String os = System.getProperty("os.name").toLowerCase(); - return (os.indexOf( "win" ) >= 0); - } - - public static boolean isMac() - { - String os = System.getProperty("os.name").toLowerCase(); - return (os.indexOf( "mac" ) >= 0); - } - - public static boolean isUnix() - { - String os = System.getProperty("os.name").toLowerCase(); - return (os.indexOf( "nix") >=0 || os.indexOf( "nux") >=0); + //windows + return (os.indexOf( "win" ) >= 0); } }