modules/graphics/src/test/java/test/javafx/css/SelectorPartitioningTest.java
Print this page
rev 9250 : 8134762: Refactor Javafx graphics module tests for clear separation of tests
Reviewed-by:
*** 21,37 ****
* 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.css;
import com.sun.javafx.css.SelectorPartitioning;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import javafx.scene.paint.Color;
import org.junit.Test;
import static org.junit.Assert.*;
import org.junit.runner.RunWith;
--- 21,46 ----
* 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.css;
import com.sun.javafx.css.SelectorPartitioning;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
+ import javafx.css.CssParser;
+ import javafx.css.Declaration;
+ import javafx.css.DeclarationShim;
+ import javafx.css.Rule;
+ import javafx.css.RuleShim;
+ import javafx.css.Selector;
+ import javafx.css.SimpleSelector;
+ import javafx.css.SimpleSelectorShim;
+ import javafx.css.Stylesheet;
import javafx.scene.paint.Color;
import org.junit.Test;
import static org.junit.Assert.*;
import org.junit.runner.RunWith;
*** 78,88 ****
.append(Double.valueOf(color.getBlue()*255).intValue()).append(");}")
).toString());
List<String> styleClasses =
styleClass != null ? Arrays.asList(styleClass.split("\\.")) : null;
this.selector =
! new SimpleSelector(type, styleClasses, null, id);
this.matches = matches;
}
}
private static class ComplexData extends Data {
--- 87,97 ----
.append(Double.valueOf(color.getBlue()*255).intValue()).append(");}")
).toString());
List<String> styleClasses =
styleClass != null ? Arrays.asList(styleClass.split("\\.")) : null;
this.selector =
! SimpleSelectorShim.getSimpleSelector(type, styleClasses, null, id);
this.matches = matches;
}
}
private static class ComplexData extends Data {
*** 185,195 ****
Stylesheet stylesheet =
new CssParser().parse(data.stylesheetText);
for (Rule rule : stylesheet.getRules()) {
! for (Selector selector : rule.getUnobservedSelectorList()) {
instance.partition(selector);
}
}
if (data instanceof SimpleData) {
--- 194,204 ----
Stylesheet stylesheet =
new CssParser().parse(data.stylesheetText);
for (Rule rule : stylesheet.getRules()) {
! for (Selector selector : RuleShim.getUnobservedSelectorList(rule)) {
instance.partition(selector);
}
}
if (data instanceof SimpleData) {
*** 208,223 ****
assertEquals(1,matched.size());
Selector selector = matched.get(0);
Rule rule = selector.getRule();
! assertEquals(1,rule.getUnobservedDeclarationList().size());
! Declaration decl = rule.getUnobservedDeclarationList().get(0);
! assertEquals("-fx-fill", decl.property);
! Color color = (Color)decl.parsedValue.convert(null);
assertEquals(simpleData.selector.toString(), data.color.getRed(), color.getRed(), 0.00001);
assertEquals(simpleData.selector.toString(), data.color.getGreen(), color.getGreen(), 0.00001);
assertEquals(simpleData.selector.toString(), data.color.getBlue(), color.getBlue(), 0.00001);
--- 217,232 ----
assertEquals(1,matched.size());
Selector selector = matched.get(0);
Rule rule = selector.getRule();
! assertEquals(1,RuleShim.getUnobservedDeclarationList(rule).size());
! Declaration decl = RuleShim.getUnobservedDeclarationList(rule).get(0);
! assertEquals("-fx-fill", DeclarationShim.get_property(decl));
! Color color = (Color)DeclarationShim.get_parsedValue(decl).convert(null);
assertEquals(simpleData.selector.toString(), data.color.getRed(), color.getRed(), 0.00001);
assertEquals(simpleData.selector.toString(), data.color.getGreen(), color.getGreen(), 0.00001);
assertEquals(simpleData.selector.toString(), data.color.getBlue(), color.getBlue(), 0.00001);