modules/graphics/src/test/java/test/com/sun/javafx/sg/prism/NGTestBase.java
Print this page
rev 9250 : 8134762: Refactor Javafx graphics module tests for clear separation of tests
Reviewed-by:
*** 21,44 ****
* 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 com.sun.javafx.sg.prism;
import javafx.geometry.Insets;
import javafx.scene.layout.Background;
import javafx.scene.layout.BackgroundFill;
import javafx.scene.layout.CornerRadii;
import java.lang.reflect.Field;
import com.sun.javafx.geom.BaseBounds;
- import com.sun.javafx.geom.BoxBounds;
import com.sun.javafx.geom.DirtyRegionContainer;
import com.sun.javafx.geom.DirtyRegionPool;
import com.sun.javafx.geom.RectBounds;
import com.sun.javafx.geom.transform.BaseTransform;
import com.sun.javafx.geom.transform.GeneralTransform3D;
import com.sun.prism.Graphics;
import com.sun.prism.paint.Color;
import com.sun.scenario.effect.Effect;
/**
--- 21,50 ----
* 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.com.sun.javafx.sg.prism;
import javafx.geometry.Insets;
import javafx.scene.layout.Background;
import javafx.scene.layout.BackgroundFill;
import javafx.scene.layout.CornerRadii;
import java.lang.reflect.Field;
import com.sun.javafx.geom.BaseBounds;
import com.sun.javafx.geom.DirtyRegionContainer;
import com.sun.javafx.geom.DirtyRegionPool;
import com.sun.javafx.geom.RectBounds;
import com.sun.javafx.geom.transform.BaseTransform;
import com.sun.javafx.geom.transform.GeneralTransform3D;
+ import com.sun.javafx.sg.prism.NGCircleShim;
+ import com.sun.javafx.sg.prism.NGGroupShim;
+ import com.sun.javafx.sg.prism.NGNode;
+ import com.sun.javafx.sg.prism.NGNodeShim;
+ import com.sun.javafx.sg.prism.NGRectangleShim;
+ import com.sun.javafx.sg.prism.NGRegionShim;
+ import com.sun.javafx.sg.prism.NodeEffectInput;
import com.sun.prism.Graphics;
import com.sun.prism.paint.Color;
import com.sun.scenario.effect.Effect;
/**
*** 173,183 ****
region.setOpaqueInsets(0, 0, 0, 0);
return region;
}
! public static final class TestNGGroup extends NGGroup implements TestNGNode {
private boolean askedToAccumulateDirtyRegion;
private boolean computedDirtyRegion;
private boolean rendered;
@Override
--- 179,189 ----
region.setOpaqueInsets(0, 0, 0, 0);
return region;
}
! public static final class TestNGGroup extends NGGroupShim implements TestNGNode {
private boolean askedToAccumulateDirtyRegion;
private boolean computedDirtyRegion;
private boolean rendered;
@Override
*** 189,216 ****
@Override public int accumulateDirtyRegions(final RectBounds clip,
RectBounds dirtyRegion, DirtyRegionPool pool, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx) {
askedToAccumulateDirtyRegion = true;
return super.accumulateDirtyRegions(clip, dirtyRegion, pool, drc, tx, pvTx);
}
! @Override protected int accumulateGroupDirtyRegion(
final RectBounds clip, RectBounds dirtyRegion, DirtyRegionPool pool, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx)
{
computedDirtyRegion = true;
return super.accumulateGroupDirtyRegion(clip, dirtyRegion, pool, drc, tx, pvTx);
}
! @Override protected int accumulateNodeDirtyRegion(
final RectBounds clip, RectBounds dirtyRegion, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx)
{
computedDirtyRegion = true;
return super.accumulateNodeDirtyRegion(clip, dirtyRegion, drc, tx, pvTx);
}
@Override public boolean askedToAccumulateDirtyRegion() { return askedToAccumulateDirtyRegion; }
@Override public boolean computedDirtyRegion() { return computedDirtyRegion; }
@Override public boolean rendered() { return rendered; }
}
! public static final class TestNGRegion extends NGRegion implements TestNGNode {
private boolean askedToAccumulateDirtyRegion;
private boolean computedDirtyRegion;
private boolean rendered;
@Override
--- 195,222 ----
@Override public int accumulateDirtyRegions(final RectBounds clip,
RectBounds dirtyRegion, DirtyRegionPool pool, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx) {
askedToAccumulateDirtyRegion = true;
return super.accumulateDirtyRegions(clip, dirtyRegion, pool, drc, tx, pvTx);
}
! @Override public int accumulateGroupDirtyRegion(
final RectBounds clip, RectBounds dirtyRegion, DirtyRegionPool pool, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx)
{
computedDirtyRegion = true;
return super.accumulateGroupDirtyRegion(clip, dirtyRegion, pool, drc, tx, pvTx);
}
! @Override public int accumulateNodeDirtyRegion(
final RectBounds clip, RectBounds dirtyRegion, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx)
{
computedDirtyRegion = true;
return super.accumulateNodeDirtyRegion(clip, dirtyRegion, drc, tx, pvTx);
}
@Override public boolean askedToAccumulateDirtyRegion() { return askedToAccumulateDirtyRegion; }
@Override public boolean computedDirtyRegion() { return computedDirtyRegion; }
@Override public boolean rendered() { return rendered; }
}
! public static final class TestNGRegion extends NGRegionShim implements TestNGNode {
private boolean askedToAccumulateDirtyRegion;
private boolean computedDirtyRegion;
private boolean rendered;
@Override
*** 222,249 ****
@Override public int accumulateDirtyRegions(final RectBounds clip,
RectBounds dirtyRegion, DirtyRegionPool pool, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx) {
askedToAccumulateDirtyRegion = true;
return super.accumulateDirtyRegions(clip, dirtyRegion, pool, drc, tx, pvTx);
}
! @Override protected int accumulateGroupDirtyRegion(
final RectBounds clip, RectBounds dirtyRegion, DirtyRegionPool pool, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx)
{
computedDirtyRegion = true;
return super.accumulateGroupDirtyRegion(clip, dirtyRegion, pool, drc, tx, pvTx);
}
! @Override protected int accumulateNodeDirtyRegion(
final RectBounds clip, RectBounds dirtyRegion, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx)
{
computedDirtyRegion = true;
return super.accumulateNodeDirtyRegion(clip, dirtyRegion, drc, tx, pvTx);
}
@Override public boolean askedToAccumulateDirtyRegion() { return askedToAccumulateDirtyRegion; }
@Override public boolean computedDirtyRegion() { return computedDirtyRegion; }
@Override public boolean rendered() { return rendered; }
}
! public static final class TestNGRectangle extends NGRectangle implements TestNGNode {
private boolean askedToAccumulateDirtyRegion;
private boolean computedDirtyRegion;
private boolean rendered;
@Override
--- 228,255 ----
@Override public int accumulateDirtyRegions(final RectBounds clip,
RectBounds dirtyRegion, DirtyRegionPool pool, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx) {
askedToAccumulateDirtyRegion = true;
return super.accumulateDirtyRegions(clip, dirtyRegion, pool, drc, tx, pvTx);
}
! @Override public int accumulateGroupDirtyRegion(
final RectBounds clip, RectBounds dirtyRegion, DirtyRegionPool pool, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx)
{
computedDirtyRegion = true;
return super.accumulateGroupDirtyRegion(clip, dirtyRegion, pool, drc, tx, pvTx);
}
! @Override public int accumulateNodeDirtyRegion(
final RectBounds clip, RectBounds dirtyRegion, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx)
{
computedDirtyRegion = true;
return super.accumulateNodeDirtyRegion(clip, dirtyRegion, drc, tx, pvTx);
}
@Override public boolean askedToAccumulateDirtyRegion() { return askedToAccumulateDirtyRegion; }
@Override public boolean computedDirtyRegion() { return computedDirtyRegion; }
@Override public boolean rendered() { return rendered; }
}
! public static final class TestNGRectangle extends NGRectangleShim implements TestNGNode {
private boolean askedToAccumulateDirtyRegion;
private boolean computedDirtyRegion;
private boolean rendered;
@Override
*** 254,275 ****
@Override public int accumulateDirtyRegions(final RectBounds clip,
RectBounds dirtyRegion, DirtyRegionPool pool, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx) {
askedToAccumulateDirtyRegion = true;
return super.accumulateDirtyRegions(clip, dirtyRegion, pool, drc, tx, pvTx);
}
! @Override protected int accumulateNodeDirtyRegion(
final RectBounds clip, RectBounds dirtyRegion, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx)
{
computedDirtyRegion = true;
return super.accumulateNodeDirtyRegion(clip, dirtyRegion, drc, tx, pvTx);
}
@Override public boolean askedToAccumulateDirtyRegion() { return askedToAccumulateDirtyRegion; }
@Override public boolean computedDirtyRegion() { return computedDirtyRegion; }
@Override public boolean rendered() { return rendered; }
}
! public static final class TestNGCircle extends NGCircle implements TestNGNode {
private boolean askedToAccumulateDirtyRegion;
private boolean computedDirtyRegion;
private boolean rendered;
@Override
--- 260,281 ----
@Override public int accumulateDirtyRegions(final RectBounds clip,
RectBounds dirtyRegion, DirtyRegionPool pool, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx) {
askedToAccumulateDirtyRegion = true;
return super.accumulateDirtyRegions(clip, dirtyRegion, pool, drc, tx, pvTx);
}
! @Override public int accumulateNodeDirtyRegion(
final RectBounds clip, RectBounds dirtyRegion, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx)
{
computedDirtyRegion = true;
return super.accumulateNodeDirtyRegion(clip, dirtyRegion, drc, tx, pvTx);
}
@Override public boolean askedToAccumulateDirtyRegion() { return askedToAccumulateDirtyRegion; }
@Override public boolean computedDirtyRegion() { return computedDirtyRegion; }
@Override public boolean rendered() { return rendered; }
}
! public static final class TestNGCircle extends NGCircleShim implements TestNGNode {
private boolean askedToAccumulateDirtyRegion;
private boolean computedDirtyRegion;
private boolean rendered;
@Override
*** 280,290 ****
@Override public int accumulateDirtyRegions(final RectBounds clip,
RectBounds dirtyRegion, DirtyRegionPool pool, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx) {
askedToAccumulateDirtyRegion = true;
return super.accumulateDirtyRegions(clip, dirtyRegion, pool, drc, tx, pvTx);
}
! @Override protected int accumulateNodeDirtyRegion(
final RectBounds clip, RectBounds dirtyRegion, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx)
{
computedDirtyRegion = true;
return super.accumulateNodeDirtyRegion(clip, dirtyRegion, drc,tx, pvTx);
}
--- 286,296 ----
@Override public int accumulateDirtyRegions(final RectBounds clip,
RectBounds dirtyRegion, DirtyRegionPool pool, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx) {
askedToAccumulateDirtyRegion = true;
return super.accumulateDirtyRegions(clip, dirtyRegion, pool, drc, tx, pvTx);
}
! @Override public int accumulateNodeDirtyRegion(
final RectBounds clip, RectBounds dirtyRegion, DirtyRegionContainer drc, BaseTransform tx, GeneralTransform3D pvTx)
{
computedDirtyRegion = true;
return super.accumulateNodeDirtyRegion(clip, dirtyRegion, drc,tx, pvTx);
}
*** 303,315 ****
public static abstract class Creator<N extends NGNode> {
public abstract N create();
}
public static abstract class Polluter {
! protected BaseTransform tx = BaseTransform.IDENTITY_TRANSFORM;
! protected abstract void pollute(NGNode node);
! protected BaseBounds modifiedBounds(NGNode node) {
return DirtyRegionTestBase.getWhatTransformedBoundsWouldBe(node, tx);
}
public RectBounds polluteAndGetExpectedBounds(NGNode node) {
BaseBounds originalBounds = node.getCompleteBounds(new RectBounds(), BaseTransform.IDENTITY_TRANSFORM);
BaseBounds modifiedBounds = modifiedBounds(node);
--- 309,321 ----
public static abstract class Creator<N extends NGNode> {
public abstract N create();
}
public static abstract class Polluter {
! public BaseTransform tx = BaseTransform.IDENTITY_TRANSFORM;
! public abstract void pollute(NGNode node);
! public BaseBounds modifiedBounds(NGNode node) {
return DirtyRegionTestBase.getWhatTransformedBoundsWouldBe(node, tx);
}
public RectBounds polluteAndGetExpectedBounds(NGNode node) {
BaseBounds originalBounds = node.getCompleteBounds(new RectBounds(), BaseTransform.IDENTITY_TRANSFORM);
BaseBounds modifiedBounds = modifiedBounds(node);