--- old/modules/base/src/test/java/javafx/beans/property/PropertyReferenceTest.java	2015-08-31 10:23:31.593217427 -0400
+++ /dev/null	2015-08-30 16:31:40.093001923 -0400
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package javafx.beans.property;
-
-import static org.junit.Assert.*;
-import javafx.beans.Person;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.sun.javafx.property.PropertyReference;
-
-public class PropertyReferenceTest {
-	
-	private Person person;
-
-	@Before
-	public void setUp() {
-		person = new Person();
-	}
-	
-	@Test
-	public void testInteger() {
-		final PropertyReference<Integer> property = new PropertyReference<Integer>(Person.class, "age");
-		assertTrue(property.isReadable());
-		assertTrue(property.isWritable());
-		assertTrue((int.class.equals(property.getType())) || (Integer.class.equals(property.getType())));
-		assertEquals(person.ageProperty(), property.getProperty(person));
-		
-		assertEquals(0, person.getAge());
-		assertEquals(Integer.valueOf(0), property.get(person));
-		
-		property.set(person, 42);
-		assertEquals(42, person.getAge());
-		assertEquals(Integer.valueOf(42), property.get(person));
-	}
-	
-	@Test
-	public void testNoRead() {
-		final PropertyReference<Integer> property = new PropertyReference<Integer>(Person.class, "noRead");
-		assertFalse(property.isReadable());
-		assertTrue(property.isWritable());
-		assertTrue((int.class.equals(property.getType())) || (Integer.class.equals(property.getType())));
-		
-		assertEquals(0, person.noRead.get());
-		property.set(person, -311);
-		assertEquals(-311, person.noRead.get());
-	}
-	
-	@Test(expected=IllegalStateException.class)
-	public void testNoRead_IllegalRead() {
-		Person.NO_READ.get(person);
-	}
-	
-	@Test(expected=IllegalStateException.class)
-	public void testNoRead_IllegalReadProperty() {
-		Person.NO_READ.getProperty(person);
-	}
-	
-	@Test
-	public void testNoWrite() {
-		final PropertyReference<Integer> property = new PropertyReference<Integer>(Person.class, "noWrite");
-		assertTrue(property.isReadable());
-		assertFalse(property.isWritable());
-		assertTrue((int.class.equals(property.getType())) || (Integer.class.equals(property.getType())));
-		assertEquals(person.noWriteProperty(), property.getProperty(person));
-		
-		assertEquals(0, person.getNoWrite());
-		assertEquals(Integer.valueOf(0), property.get(person));
-		
-		person.noWrite.set(5125);
-		assertEquals(5125, person.getNoWrite());
-		assertEquals(Integer.valueOf(5125), property.get(person));
-	}
-	
-	@Test(expected=IllegalStateException.class)
-	public void testNoWrite_IllegalWrite() {
-		Person.NO_WRITE.set(person, 1);
-	}
-	
-	@Test
-	public void testNoReadWrite() {
-		final PropertyReference<Integer> property = new PropertyReference<Integer>(Person.class, "noReadWrite");
-		assertFalse(property.isReadable());
-		assertFalse(property.isWritable());
-	}
-	
-	@Test(expected=IllegalStateException.class)
-	public void testNoReadWrite_IllegalRead() {
-		Person.NO_READ_WRITE.get(person);
-	}
-	
-	@Test(expected=IllegalStateException.class)
-	public void testNoReadWrite_IllegalWrite() {
-		Person.NO_READ_WRITE.set(person, 1);
-	}
-	
-}
--- /dev/null	2015-08-30 16:31:40.093001923 -0400
+++ new/modules/base/src/test/java/test/javafx/beans/property/PropertyReferenceTest.java	2015-08-31 10:23:31.461217429 -0400
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package test.javafx.beans.property;
+
+import static org.junit.Assert.*;
+import test.javafx.beans.Person;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.sun.javafx.property.PropertyReference;
+
+public class PropertyReferenceTest {
+	
+	private Person person;
+
+	@Before
+	public void setUp() {
+		person = new Person();
+	}
+	
+	@Test
+	public void testInteger() {
+		final PropertyReference<Integer> property = new PropertyReference<Integer>(Person.class, "age");
+		assertTrue(property.isReadable());
+		assertTrue(property.isWritable());
+		assertTrue((int.class.equals(property.getType())) || (Integer.class.equals(property.getType())));
+		assertEquals(person.ageProperty(), property.getProperty(person));
+		
+		assertEquals(0, person.getAge());
+		assertEquals(Integer.valueOf(0), property.get(person));
+		
+		property.set(person, 42);
+		assertEquals(42, person.getAge());
+		assertEquals(Integer.valueOf(42), property.get(person));
+	}
+	
+	@Test
+	public void testNoRead() {
+		final PropertyReference<Integer> property = new PropertyReference<Integer>(Person.class, "noRead");
+		assertFalse(property.isReadable());
+		assertTrue(property.isWritable());
+		assertTrue((int.class.equals(property.getType())) || (Integer.class.equals(property.getType())));
+		
+		assertEquals(0, person.noRead.get());
+		property.set(person, -311);
+		assertEquals(-311, person.noRead.get());
+	}
+	
+	@Test(expected=IllegalStateException.class)
+	public void testNoRead_IllegalRead() {
+		Person.NO_READ.get(person);
+	}
+	
+	@Test(expected=IllegalStateException.class)
+	public void testNoRead_IllegalReadProperty() {
+		Person.NO_READ.getProperty(person);
+	}
+	
+	@Test
+	public void testNoWrite() {
+		final PropertyReference<Integer> property = new PropertyReference<Integer>(Person.class, "noWrite");
+		assertTrue(property.isReadable());
+		assertFalse(property.isWritable());
+		assertTrue((int.class.equals(property.getType())) || (Integer.class.equals(property.getType())));
+		assertEquals(person.noWriteProperty(), property.getProperty(person));
+		
+		assertEquals(0, person.getNoWrite());
+		assertEquals(Integer.valueOf(0), property.get(person));
+		
+		person.noWrite.set(5125);
+		assertEquals(5125, person.getNoWrite());
+		assertEquals(Integer.valueOf(5125), property.get(person));
+	}
+	
+	@Test(expected=IllegalStateException.class)
+	public void testNoWrite_IllegalWrite() {
+		Person.NO_WRITE.set(person, 1);
+	}
+	
+	@Test
+	public void testNoReadWrite() {
+		final PropertyReference<Integer> property = new PropertyReference<Integer>(Person.class, "noReadWrite");
+		assertFalse(property.isReadable());
+		assertFalse(property.isWritable());
+	}
+	
+	@Test(expected=IllegalStateException.class)
+	public void testNoReadWrite_IllegalRead() {
+		Person.NO_READ_WRITE.get(person);
+	}
+	
+	@Test(expected=IllegalStateException.class)
+	public void testNoReadWrite_IllegalWrite() {
+		Person.NO_READ_WRITE.set(person, 1);
+	}
+	
+}