--- old/modules/base/src/test/java/javafx/binding/DependencyUtils.java 2015-08-31 10:24:30.173216769 -0400 +++ /dev/null 2015-08-30 16:31:40.093001923 -0400 @@ -1,57 +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.binding; - -import java.util.ListIterator; - -import javafx.beans.binding.Binding; -import javafx.collections.FXCollections; -import javafx.collections.ObservableList; -import static org.junit.Assert.*; - -public class DependencyUtils { - - public static void checkDependencies(ObservableList seq, Object... deps) { - // we want to check the source dependencies, therefore we have to - // remove all intermediate bindings - final ObservableList copy = FXCollections.observableArrayList(seq); - final ListIterator it = copy.listIterator(); - while (it.hasNext()) { - final Object obj = it.next(); - if (obj instanceof Binding) { - it.remove(); - final Binding binding = (Binding)obj; - for (final Object newDep : binding.getDependencies()) { - it.add(newDep); - } - } - } - for (final Object obj : deps) { - assertTrue(copy.contains(obj)); - } - } - -} --- /dev/null 2015-08-30 16:31:40.093001923 -0400 +++ new/modules/base/src/test/java/test/javafx/binding/DependencyUtils.java 2015-08-31 10:24:30.041216770 -0400 @@ -0,0 +1,57 @@ +/* + * 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.binding; + +import java.util.ListIterator; + +import javafx.beans.binding.Binding; +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import static org.junit.Assert.*; + +public class DependencyUtils { + + public static void checkDependencies(ObservableList seq, Object... deps) { + // we want to check the source dependencies, therefore we have to + // remove all intermediate bindings + final ObservableList copy = FXCollections.observableArrayList(seq); + final ListIterator it = copy.listIterator(); + while (it.hasNext()) { + final Object obj = it.next(); + if (obj instanceof Binding) { + it.remove(); + final Binding binding = (Binding)obj; + for (final Object newDep : binding.getDependencies()) { + it.add(newDep); + } + } + } + for (final Object obj : deps) { + assertTrue(copy.contains(obj)); + } + } + +}