Moving a test method to a more appropriate test class

Author: barancev

java/client/test/org/openqa/selenium/support/pagefactory/DefaultElementLocatorTest.java

@@ -23,7 +23,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.junit.Rule;
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.WebDriver;

java/client/test/org/openqa/selenium/support/pagefactory/UsingPageFactoryTest.java

@@ -22,8 +22,13 @@
 import static org.junit.Assert.assertThat;
 
 import org.junit.Test;
+import org.openqa.selenium.By;
 import org.openqa.selenium.JavascriptExecutor;
+import org.openqa.selenium.StubDriver;
+import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
+import org.openqa.selenium.remote.RemoteWebElement;
+import org.openqa.selenium.remote.internal.WebElementToJsonConverter;
 import org.openqa.selenium.support.CacheLookup;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.PageFactory;
@@ -61,6 +66,32 @@ public void canListDecoratedElements() {
     }
   }
 
+  @Test
+  public void testDecoratedElementsShouldBeUnwrapped() {
+    final RemoteWebElement element = new RemoteWebElement();
+    element.setId("foo");
+
+    WebDriver driver = new StubDriver() {
+      @Override
+      public WebElement findElement(By by) {
+        return element;
+      }
+    };
+
+    PublicPage page = new PublicPage();
+    PageFactory.initElements(driver, page);
+
+    Object seen = new WebElementToJsonConverter().apply(page.element);
+    Object expected = new WebElementToJsonConverter().apply(element);
+
+    assertEquals(expected, seen);
+  }
+
+
+  public class PublicPage {
+    public WebElement element;
+  }
+
   public static class Page {
     @FindBy(name = "someForm")
     WebElement formElement;