SimonStewart: Sorting out text handling a little bit

r4661

Author: shs96c

common/src/java/com/thoughtworks/webdriver/internal/OperatingSystem.java

@@ -0,0 +1,55 @@
+// Copyright 2008 Google Inc. All Rights Reserved.
+
+package com.thoughtworks.webdriver.internal;
+
+public enum OperatingSystem {
+	WINDOWS("win") {
+		@Override
+		public String getLineEnding() {
+			return "\r\n";
+		}
+	},
+	MAC("mac") {
+		@Override
+		public String getLineEnding() {
+			return "\r";
+		}
+	},
+	UNIX("x") {
+		@Override
+		public String getLineEnding() {
+			return "\n";
+		}
+	};
+
+	private static OperatingSystem currentOs;
+	private final String partOfOsName;
+
+	private OperatingSystem(String partOfOsName) {
+		this.partOfOsName = partOfOsName;
+	}
+
+	public static OperatingSystem getCurrentPlatform() {
+		if (currentOs != null) {
+			return currentOs;
+		}
+		
+		for (OperatingSystem os : OperatingSystem.values()) {
+			if (os.isCurrentPlatform()) {
+				currentOs = os;
+				return os;
+			}
+		}
+
+		// Default to assuming we're on a unix variant (including linux)
+		currentOs = UNIX;
+		return UNIX;
+	}
+
+	public abstract String getLineEnding();
+
+	private boolean isCurrentPlatform() {
+		String osName = System.getProperty("os.name").toLowerCase();
+		return osName.indexOf(partOfOsName) != -1;
+	}
+}

common/test/java/com/thoughtworks/webdriver/CookieImplementationTest.java

@@ -54,7 +54,7 @@ public void testGetAllCookies() {
         assertThat(cookies.contains(cookie2), is(true));
     }
 
-	@Ignore("safari")
+	@Ignore("ie, safari")
     public void testCookieIntegrity() {
         driver.get(alternateBaseUrl + "animals");
         driver.manage().deleteAllCookies();

common/test/java/com/thoughtworks/webdriver/FormHandlingTest.java

@@ -166,13 +166,13 @@ public void testShouldThrowAnExceptionWhenTogglingTheStateOfARadioButton() {
 		}
 	}
 
-	@Ignore(value = "ie, safari", reason = "Test fails")
+	@Ignore(value = "safari", reason = "Test fails")
 	public void testShouldBeAbleToAlterTheContentsOfAFileUploadInputElement() {
 		driver.get(formPage);
 		WebElement uploadElement = driver.findElement(By.id("upload"));
 		assertThat(uploadElement.getValue(), equalTo(""));
-		uploadElement.setValue("Cheese");
-		assertThat(uploadElement.getValue(), equalTo("Cheese"));
+		uploadElement.setValue("Cheese/\\/");
+		assertThat(uploadElement.getValue(), equalTo("Cheese/\\/"));
 	}
 
 	public void testShouldThrowAnExceptionWhenSelectingAnUnselectableElement() {

common/test/java/com/thoughtworks/webdriver/TextHandlingTest.java

@@ -4,18 +4,16 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 
+import com.thoughtworks.webdriver.internal.OperatingSystem;
+
 public class TextHandlingTest extends AbstractDriverTestCase {
 	private String newLine;
 
 	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 
-		String os = System.getProperty("os.name").toLowerCase();
-    	if (os.indexOf("win") != -1)
-    		newLine = "\r\n";
-    	else 
-    		newLine = "\n";
+		newLine = OperatingSystem.getCurrentPlatform().getLineEnding();
 	}
 
     public void testShouldReturnTheTextContentOfASingleElementWithNoChildren() {

firefox/src/java/com/thoughtworks/webdriver/firefox/FirefoxDriver.java

@@ -10,6 +10,7 @@
 import com.thoughtworks.webdriver.internal.FindsById;
 import com.thoughtworks.webdriver.internal.FindsByLinkText;
 import com.thoughtworks.webdriver.internal.FindsByXPath;
+import com.thoughtworks.webdriver.internal.OperatingSystem;
 
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
@@ -56,9 +57,11 @@ public FirefoxDriver(String profileName) {
 
         if (!extension.isConnected()) {
             throw new RuntimeException(
-                    "Unable to connect to Firefox. Is the WebDriver extension installed, and is there a profile called WebDriver?\n" +
-                            "To set up a profile for WebDriver, simply start firefox from the command line with the \"ProfileManager\" switch\n" +
-                            "This will look like: firefox -ProfileManager. Alternatively, use the FirefoxLauncher support class from this project");
+                    "Unable to connect to Firefox. Is the WebDriver extension installed, and is there a profile called WebDriver?" + 
+                    OperatingSystem.getCurrentPlatform().getLineEnding() +
+                    "To set up a profile for WebDriver, simply start firefox from the command line with the \"ProfileManager\" switch" + 
+                    OperatingSystem.getCurrentPlatform().getLineEnding() +
+                    "This will look like: firefox -ProfileManager. Alternatively, use the FirefoxLauncher support class from this project");
         }
 
         fixId();

firefox/src/java/com/thoughtworks/webdriver/firefox/FirefoxLauncher.java

@@ -19,6 +19,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.thoughtworks.webdriver.internal.OperatingSystem;
+
 public class FirefoxLauncher {
     public static void main(String[] args) {
         FirefoxLauncher launcher = new FirefoxLauncher();

firefox/src/java/com/thoughtworks/webdriver/firefox/FirefoxWebElement.java

@@ -3,6 +3,7 @@
 import com.thoughtworks.webdriver.WebDriver;
 import com.thoughtworks.webdriver.WebElement;
 import com.thoughtworks.webdriver.RenderedWebElement;
+import com.thoughtworks.webdriver.internal.OperatingSystem;
 
 import java.awt.Point;
 import java.awt.Dimension;
@@ -45,7 +46,7 @@ public String getValue() {
         if (!"OK".equals(status))
             return null;
 
-        return remainder;
+        return remainder.replace("\n", OperatingSystem.getCurrentPlatform().getLineEnding());
     }
 
     public WebDriver setValue(String value) {
@@ -91,7 +92,8 @@ public boolean isEnabled() {
     }
 
     public String getText() {
-        return parent.sendMessage("getElementText", elementId);
+    	String toReturn = parent.sendMessage("getElementText", elementId);
+        return toReturn.replace("\n", OperatingSystem.getCurrentPlatform().getLineEnding());
     }
 
     public List<WebElement> getChildrenOfType(String tagName) {

firefox/src/java/com/thoughtworks/webdriver/firefox/OperatingSystem.java

@@ -21,6 +21,7 @@
 import com.thoughtworks.webdriver.NoSuchElementException;
 import com.thoughtworks.webdriver.WebDriver;
 import com.thoughtworks.webdriver.WebElement;
+import com.thoughtworks.webdriver.internal.OperatingSystem;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -39,6 +40,8 @@ public class HtmlUnitWebElement implements WebElement {
     public HtmlUnitWebElement(HtmlUnitDriver parent, HtmlElement element) {
         this.parent = parent;
         this.element = element;
+        
+        
     }
 
     public WebDriver click() {
@@ -239,7 +242,7 @@ private void getTextFromNode(DomNode node, StringBuffer toReturn, StringBuffer t
         }
 
         if (isBlockLevel(node)) {
-            toReturn.append(collapseWhitespace(textSoFar)).append("\n");
+            toReturn.append(collapseWhitespace(textSoFar)).append(OperatingSystem.getCurrentPlatform().getLineEnding());
             textSoFar.delete(0, textSoFar.length());
         }
     }