eventCaptor = ArgumentCaptor.forClass(LienzoPanelResizeEvent.class);
- verify(handlerManager, times(1)).fireEvent(eventCaptor.capture());
- LienzoPanelResizeEvent event = eventCaptor.getValue();
- assertEquals(300d, event.getWidth(), 0);
- assertEquals(500d, event.getHeight(), 0);
- }
-
- @Test
- public void testOnRefresh() {
- tested.onRefresh();
- verify(scrollHandler, times(1)).refresh();
- }
-
- @Test
- public void testSetupHandlers() {
- tested.setupHandlers();
- verify(tested, times(1)).addMouseDownHandler(any(MouseDownHandler.class));
- verify(tested, times(1)).addMouseUpHandler(any(MouseUpHandler.class));
- verify(tested, times(1)).addMouseOutHandler(any(MouseOutHandler.class));
- verify(tested, times(1)).addScrollHandler(any(ScrollHandler.class));
- verify(tested, times(1)).addAttachHandler(any(AttachEvent.Handler.class));
- verify(handlers, times(10)).register(any(HandlerRegistration.class));
- }
-
- @Test
- public void testDestroy() {
- tested.destroy();
- verify(handlers, times(1)).removeHandler();
- }
-}
diff --git a/src/test/java/com/ait/lienzo/client/widget/panel/util/PanelTransformUtilsTests.java b/src/test/java/com/ait/lienzo/client/widget/panel/util/PanelTransformUtilsTests.java
index e73c6d17..55369716 100644
--- a/src/test/java/com/ait/lienzo/client/widget/panel/util/PanelTransformUtilsTests.java
+++ b/src/test/java/com/ait/lienzo/client/widget/panel/util/PanelTransformUtilsTests.java
@@ -24,27 +24,34 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Mock;
import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@RunWith(LienzoMockitoTestRunner.class)
public class PanelTransformUtilsTests {
+ @Mock
private Viewport viewport;
@Before
public void setUp() {
- viewport = new Viewport(1200, 900);
+ when(viewport.getWidth()).thenReturn(1200);
+ when(viewport.getHeight()).thenReturn(1200);
}
@Test
public void testSetScaleLevel() {
double level = 0.8d;
- viewport.setTransform(new Transform().translate(0.1d, 0.2d).scale(0.3d, 0.4d));
+ when(viewport.setTransform(any(Transform.class))).thenCallRealMethod();
+ viewport.setTransform(new Transform().translate(0.1d, 0.2d).scaleWithXY(0.3d, 0.4d));
+ when(viewport.getTransform()).thenCallRealMethod();
PanelTransformUtils.setScaleLevel(viewport, level);
Transform transform = viewport.getTransform();
+
assertEquals(0.1d, transform.getTranslateX(), 0d);
assertEquals(0.2d, transform.getTranslateY(), 0d);
assertEquals(0.8d, transform.getScaleX(), 0d);
@@ -53,7 +60,9 @@ public void testSetScaleLevel() {
@Test
public void testReset() {
- viewport.setTransform(new Transform().translate(0.1d, 0.2d).scale(0.3d, 0.4d));
+ when(viewport.setTransform(any(Transform.class))).thenCallRealMethod();
+ viewport.setTransform(new Transform().translate(0.1d, 0.2d).scaleWithXY(0.3d, 0.4d));
+ when(viewport.getTransform()).thenCallRealMethod();
PanelTransformUtils.reset(viewport);
Transform transform = viewport.getTransform();
assertEquals(0d, transform.getTranslateX(), 0d);
@@ -65,8 +74,8 @@ public void testReset() {
@Test
public void testComputeZoomLevelFitToWidth() {
LienzoBoundsPanel panel = mock(LienzoBoundsPanel.class);
- when(panel.getWidthPx()).thenReturn(800);
- when(panel.getHeightPx()).thenReturn(600);
+ when(panel.getWidePx()).thenReturn(800);
+ when(panel.getHighPx()).thenReturn(600);
Bounds layerBounds = Bounds.build(0d, 0d, 1600, 1200);
when(panel.getLayerBounds()).thenReturn(layerBounds);
double level = PanelTransformUtils.computeZoomLevelFitToWidth(panel);
@@ -75,7 +84,7 @@ public void testComputeZoomLevelFitToWidth() {
@Test
public void testComputeLevel() {
- viewport.setTransform(new Transform().translate(0.1d, 0.2d).scale(0.3d, 0.4d));
+ when(viewport.getTransform()).thenReturn(new Transform().translate(0.1d, 0.2d).scaleWithXY(0.3d, 0.4d));
double level = PanelTransformUtils.computeLevel(viewport);
assertEquals(0.3d, level, 0d);
}
diff --git a/src/test/java/com/ait/lienzo/test/BasicLienzoStateTest.java b/src/test/java/com/ait/lienzo/test/BasicLienzoStateTest.java
deleted file mode 100644
index afe2b09e..00000000
--- a/src/test/java/com/ait/lienzo/test/BasicLienzoStateTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *
- * Copyright (c) 2017 Ahome' Innovation Technologies. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.ait.lienzo.test;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import com.ait.lienzo.client.core.shape.Layer;
-import com.ait.lienzo.client.core.shape.Rectangle;
-import com.ait.lienzo.client.widget.LienzoPanel;
-import com.google.gwt.user.client.ui.FlowPanel;
-
-/**
- * This test checks the layer and rectangle object states.
- *
- * By using the LienzoMockitoTestRunner the test runs as the problematic native/final interfaces are not present.
- * Consider that some base JSO objects, such as NObjectJSO, are provided as built-in in-memory stub implementations,
- * so features that interact with native interfaces, such adding/removing children, setting/getting attributes
- * or context transformations are working as expected as when a real engine is behind it.
- *
- * If the stubbed method impl is not right or it's a default no-op, you can mock the method behavior
- * as well as final modifiers has been removed from the primitives.
- *
- * If you need more custom stubs or you're hitting with overlay types or overlay wrappers in Lienzo that are not included
- * yet in this library, please read the README.md file from this repository to use custom annotated settings and provide
- * your custom stuff.
- *
- * @author Roger Martinez
- * @since 1.0
- *
- */
-@RunWith(LienzoMockitoTestRunner.class)
-public class BasicLienzoStateTest
-{
- public class MyLienzo
- {
- private final FlowPanel mainPanel = new FlowPanel();
-
- private final LienzoPanel panel = new LienzoPanel(600, 600);
-
- private final Layer layer = new Layer();
-
- private final Rectangle rectangle = new Rectangle(50, 50);
-
- public MyLienzo()
- {
- mainPanel.add(panel);
-
- panel.add(layer);
-
- layer.add(rectangle);
-
- layer.draw();
- }
-
- public void test()
- {
- rectangle.setFillColor("#0000FF");
- }
-
- public LienzoPanel getPanel()
- {
- return panel;
- }
-
- public Layer getLayer()
- {
- return layer;
- }
- }
-
- private MyLienzo myLienzo;
-
- @Before
- public void setup()
- {
- myLienzo = new MyLienzo();
- }
-
- @Test
- public void test()
- {
- myLienzo.test();
-
- final int size = myLienzo.getLayer().getChildNodes().size();
-
- final String color1 = ((Rectangle) myLienzo.getLayer().getChildNodes().get(0)).getFillColor();
-
- Assert.assertEquals("#0000FF", color1);
-
- Assert.assertEquals(1, size);
- }
-}
diff --git a/src/test/java/com/ait/lienzo/test/PointsMockTest.java b/src/test/java/com/ait/lienzo/test/PointsMockTest.java
index 36e22e88..e47ea197 100644
--- a/src/test/java/com/ait/lienzo/test/PointsMockTest.java
+++ b/src/test/java/com/ait/lienzo/test/PointsMockTest.java
@@ -92,8 +92,8 @@ public void test()
final Point2D p = myLienzo.test(new Point2D(0, 0));
- assertEquals(p.getX(), 0, 0);
+ assertEquals(0, p.getX(), 0);
- assertEquals(p.getY(), 0, 0);
+ assertEquals(0, p.getY(), 0);
}
}
diff --git a/src/test/java/com/ait/lienzo/test/PointsTest.java b/src/test/java/com/ait/lienzo/test/PointsTest.java
index 3332f942..48af7d62 100644
--- a/src/test/java/com/ait/lienzo/test/PointsTest.java
+++ b/src/test/java/com/ait/lienzo/test/PointsTest.java
@@ -71,8 +71,8 @@ public void test()
{
final Point2D p = myLienzo.test(new Point2D(0, 0));
- assertEquals(p.getX(), 0, 0);
+ assertEquals(0, p.getX(), 0);
- assertEquals(p.getY(), 0, 0);
+ assertEquals(0, p.getY(), 0);
}
}
diff --git a/src/test/java/com/ait/lienzo/test/stub/custom/Point2D.java b/src/test/java/com/ait/lienzo/test/stub/custom/Point2D.java
deleted file mode 100644
index e1cabaa7..00000000
--- a/src/test/java/com/ait/lienzo/test/stub/custom/Point2D.java
+++ /dev/null
@@ -1,470 +0,0 @@
-/*
- *
- * Copyright (c) 2017 Ahome' Innovation Technologies. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.ait.lienzo.test.stub.custom;
-
-import com.ait.lienzo.client.core.util.Geometry;
-import com.ait.lienzo.client.core.util.GeometryException;
-import com.ait.lienzo.test.annotation.StubClass;
-
-/**
- * This is an example of a custom stub for class com.ait.lienzo.client.core.types.Point2D. This library already provides
- * an stub class for it, but this can be used as an example if you need to overrade the behavior from the build-in one and provide
- * your own for a concrete unit test class.
- *
- * This class overrides the implementation for the add and toString methods, used as an example.
- *
- * @author Roger Martinez
- * @since 1.0
- *
- */
-@StubClass("com.ait.lienzo.client.core.types.Point2D")
-public class Point2D
-{
- private double x;
-
- private double y;
-
- /** Stubbed wih custom impl. **/
- @Override
- public String toString()
- {
- return "{x=" + getX() + "} {y=" + getY() + "}";
- }
-
- /** Stubbed wih custom impl. **/
- public Point2D add(final Point2D p)
- {
- return new Point2D(this.x + p.getY(), this.y + p.getX());
- }
-
- public Point2D(final com.ait.lienzo.client.core.types.Point2D.Point2DJSO jso)
- {
- this();
- }
-
- /**
- * Constructs a Point2D at (0,0)
- */
- public Point2D()
- {
- }
-
- public final String toJSONString()
- {
- return toString();
- }
-
- /**
- * Constructs a Point2D at (x,y)
- *
- * @param x double
- * @param y double
- */
- public Point2D(final double x, final double y)
- {
- this();
- this.x = x;
- this.y = y;
- }
-
- public Point2D(final Point2D p)
- {
- this(p.getX(), p.getY());
- }
-
- public final Point2D copy()
- {
- return new Point2D(this.getX(), this.getY());
- }
-
- /**
- * Returns the x coordinate
- * @return double
- */
- public double getX()
- {
- return x;
- }
-
- /**
- * Sets the x coordinate
- * @param x double
- * @return this Point2D
- */
- public Point2D setX(final double x)
- {
- this.x = x;
-
- return this;
- }
-
- /**
- * Returns the y coordinate
- * @return double
- */
- public double getY()
- {
- return y;
- }
-
- /**
- * Sets the y coordinate
- * @param y double
- * @return this Point2D
- */
- public Point2D setY(final double y)
- {
- this.y = y;
-
- return this;
- }
-
- /**
- * Sets the x and y coordinates to those of point P.
- *
- * @param p Point2D
- * @return this Point2D
- */
- public Point2D set(final Point2D p)
- {
- this.x = p.getX();
- this.y = p.getY();
-
- return this;
- }
-
- /**
- * Returns the length of the vector from (0,0) to this Point2D.
- *
- * @return double
- */
- public double getLength()
- {
- // TODO
- return 0;
- };
-
- /**
- * Returns the distance from this Point2D to the other Point2D.
- *
- * @param other Point2D
- * @return double
- */
- public double distance(final Point2D other)
- {
- // TODO
- return 0;
- };
-
- /**
- * Returns the distance from point A to point B.
- *
- * @param a Point2D
- * @param b Point2D
- * @return double
- */
- public static double distance(final Point2D a, final Point2D b)
- {
- // TODO
- return 0;
- };
-
- public Point2D offset(final double x, final double y)
- {
- // TODO
-
- return this;
- }
-
- public Point2D offset(final Point2D p)
- {
- // TODO
-
- return this;
- }
-
- public Point2D minus(final double x, final double y)
- {
- // TODO
-
- return this;
- }
-
- public final Point2D minus(final Point2D p)
- {
- // TODO
-
- return this;
- }
-
- public Point2D normalize(final double length)
- {
- final double x = getX();
-
- final double y = getY();
-
- if (((x == 0) && (y == 0)) || (length == 0))
- {
- return this;
- }
- final double angle = Math.atan2(y, x);
-
- this.x = Math.cos(angle) * length;
- this.y = Math.sin(angle) * length;
-
- return this;
- }
-
- /**
- * Returns a new point by subtracting the coordinates of this point and point P,
- * i.e. (this.x - p.x, this.y - p.y)
- *
- * This Point2D is not modified.
- *
- * @param p Point2D
- * @return a new Point2D
- */
- public Point2D sub(final Point2D p)
- {
- // TODO
- return this;
- }
-
- /**
- * Returns a new point by diving the coordinates of this point by 'd',
- * i.e. (this.x / d, this.y / d)
- *
- * This Point2D is not modified.
- *
- * @param d double
- * @return a new Point2D
- */
- public Point2D div(final double d) throws GeometryException
- {
- if (d == 0.0)
- {
- throw new GeometryException("can't divide by 0");
- }
- return mul(1.0 / d);
- }
-
- /**
- * Returns a new point by multiplying the coordinates of this point by 'd',
- * i.e. (this.x * d, this.y * d)
- *
- * This Point2D is not modified.
- *
- * @param d double
- * @return a new Point2D
- */
- public Point2D scale(final double d)
- {
- // TODO
- return this;
- }
-
- public Point2D mul(final double d)
- {
- // TODO
- return this;
- }
-
- /**
- * Returns a new Point2D perpendicular to this vector by rotating this Point2D
- * 90 degrees counterclockwise around (0,0)
- *
- * @return Point2D
- public Point2D perpendicular()
- {
- // TODO
- return this;
-
- }
-
- /**
- * Returns a new Point2D by rotating this Point2D counterclockwise
- * over the angle (in radians, not degrees!)
- *
- * This Point2D is not modified.
- *
- * @return Point2D
- */
- public Point2D rotate(final double angle)
- {
- // TODO
- return this;
- }
-
- /**
- * Returns a new Point2D in the same direction as this Point2D
- * with a length of 1.
- *
- * @return Point2D
- */
- public Point2D unit() throws GeometryException
- {
- final double len = getLength();
-
- if (len == 0)
- {
- throw new GeometryException("can't normalize (0,0)");
- }
- return div(len);
- }
-
- /**
- * Returns whether this point is the Null vector (0,0)
- *
- * @return boolean
- */
- public boolean isNullVector()
- {
- // TODO
- return false;
- }
-
- /**
- * Returns the angle of the vector thru (0,0) and this Point2D,
- * and the positive x-axis. Returns 0 for the null vector (0,0).
- *
- * @return double
- */
- public double theta()
- {
- // TODO
- return 0;
- }
-
- public double thetaTo(final Point2D p)
- {
- // TODO
- return 0;
- }
-
- /**
- * Returns the underlying JavaScriptObject
- * @return Point2DJSO
- */
- public com.ait.lienzo.client.core.types.Point2D.Point2DJSO getJSO()
- {
- return null;
- }
-
- @Override
- public boolean equals(final Object other)
- {
- if ((other == null) || (false == (other instanceof Point2D)))
- {
- return false;
- }
- if (this == other)
- {
- return true;
- }
- final Point2D p = ((Point2D) other);
-
- return ((p.getX() == getX()) && (p.getY() == getY()));
- }
-
- public boolean closeEnough(final Point2D p)
- {
- return (Geometry.closeEnough(getX(), p.getX()) && Geometry.closeEnough(getY(), p.getY()));
- }
-
- public boolean closeEnough(final Point2D p, final double precision)
- {
- return (Geometry.closeEnough(getX(), p.getX(), precision) && Geometry.closeEnough(getY(), p.getY(), precision));
- }
-
- @Override
- public int hashCode()
- {
- return toJSONString().hashCode();
- }
-
- public double dot(final Point2D p)
- {
- // TODO
- return 0;
- }
-
- public double crossScalar(final Point2D p)
- {
- // TODO
- return 0;
- }
-
- /**
- * Returns whether the 3 points are colinear, i.e. whether they lie on a single straight line.
- *
- * @param p1
- * @param p2
- * @param p3
- * @return
- *
- * @see Collinear in Wolfram MathWorld
- */
- public static boolean collinear(final Point2D p1, final Point2D p2, final Point2D p3)
- {
- // TODO
- return false;
- }
-
- public boolean collinear(final Point2D p2, final Point2D p3)
- {
- return collinear(this, p2, p3);
- }
-
- /**
- * Returns the determinant of vectors P and Q. By definition:
- *
- * - det(P, Q) = -det(Q, P)
- *
- det(P, -Q) = -det(P, Q)
- *
- if P == alpha * Q <=> det(P, Q) = 0 (P and Q on same line)
- *
- det(P, Origin) = 0
- *
- OQ parallel OP <=> det(P,Q) = 0
- *
- * Imagine standing on the Origin, facing point P:
- *
- * - if Q is on your left, det(P,Q) > 0
- *
- if Q is on your right, det(P,Q) < 0
- *
- if Q is on the line thru P and the Origin, det(P,Q) = 0
- *
- *
- * @param p Point2D
- * @param q Point2D
- * @return the determinant of vectors P and Q
- */
- public static double det(final Point2D p, final Point2D q)
- {
- return (p.getX() * q.getY()) - (p.getY() * q.getX());
- }
-
- /**
- * Construct a Point2D from polar coordinates, i.e. a radius and an angle.
- *
- * @param radius
- * @param angle in radians
- * @return Point2D
- */
- public static Point2D polar(final double radius, final double angle)
- {
- return new Point2D(radius * Math.cos(angle), radius * Math.sin(angle));
- }
-}
diff --git a/src/test/java/com/ait/lienzo/test/stub/custom/StubPointsTest.java b/src/test/java/com/ait/lienzo/test/stub/custom/StubPointsTest.java
deleted file mode 100644
index 84d9569c..00000000
--- a/src/test/java/com/ait/lienzo/test/stub/custom/StubPointsTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *
- * Copyright (c) 2017 Ahome' Innovation Technologies. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.ait.lienzo.test.stub.custom;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import com.ait.lienzo.test.LienzoMockitoTestRunner;
-import com.ait.lienzo.test.annotation.Stubs;
-
-/**
- * Please before reading this, take a look at:
- *
- * @See com.ait.lienzo.test.PointsTest
- * @See com.ait.lienzo.test.PointsMockTest
- *
- * This example provides a custom stub implementation for toString and add methods, as an example
- * of an alternative for mocking it.
- *
- * Note that this unit test class is annotated with the @Stubs annotation, so here you're replacing the built-in stub
- * by the custom com.ait.lienzo.test.stub.custom.Point2D.
- *
- * @author Roger Martinez
- * @since 1.0
- *
- */
-@RunWith(LienzoMockitoTestRunner.class)
-@Stubs({ com.ait.lienzo.test.stub.custom.Point2D.class })
-public class StubPointsTest
-{
- public class MyLienzo
- {
- private final Point2D p;
-
- public MyLienzo(final Point2D p)
- {
- this.p = p;
- }
-
- public Point2D test(final Point2D p)
- {
- return this.p.add(p);
- }
- }
-
- private MyLienzo myLienzo;
-
- @Before
- public void setup()
- {
- myLienzo = new MyLienzo(new Point2D(1, 5));
- }
-
- @Test
- public void test()
- {
- final Point2D p = myLienzo.test(new Point2D(2, 3));
-
- Assert.assertEquals(4, p.getX(), 0);
-
- Assert.assertEquals(7, p.getY(), 0);
- }
-}
diff --git a/src/test/java/com/ait/lienzo/test/JSOMockTest.java b/src/test/java/com/ait/lienzo/test/suite/TestSuite.java
similarity index 50%
rename from src/test/java/com/ait/lienzo/test/JSOMockTest.java
rename to src/test/java/com/ait/lienzo/test/suite/TestSuite.java
index 9bc7b891..4edcff6f 100644
--- a/src/test/java/com/ait/lienzo/test/JSOMockTest.java
+++ b/src/test/java/com/ait/lienzo/test/suite/TestSuite.java
@@ -16,43 +16,38 @@
*
*/
-package com.ait.lienzo.test;
-
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.when;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+package com.ait.lienzo.test.suite;
+
+import com.ait.lienzo.test.BasicLienzoMockTest;
+import com.ait.lienzo.test.LienzoCoreAttributesTest;
+import com.ait.lienzo.test.PointsMockTest;
+import com.ait.lienzo.test.PointsTest;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
-
-import com.ait.tooling.nativetools.client.NObjectJSO;
+import org.junit.runners.Suite;
/**
- * This test just shows how Lienzo's overlay type methods can be mocked by using this library, if you need so.
- *
+ * Lienzo testing suite.
* @author Roger Martinez
* @since 1.0
- *
*/
-@RunWith(LienzoMockitoTestRunner.class)
-public class JSOMockTest
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+ BasicLienzoMockTest.class,
+ LienzoCoreAttributesTest.class,
+ PointsTest.class,
+ PointsMockTest.class,
+})
+public class TestSuite
{
- @Mock
- NObjectJSO objectJSO;
-
- @Before
- public void setup()
+ @BeforeClass
+ public static void setUpClass()
{
- when(objectJSO.getAsString(anyString())).thenReturn("My Custom #getAsString");
}
- @Test
- public void test()
+ @AfterClass
+ public static void tearDownClass()
{
- final String s = objectJSO.getAsString("Lienzo rocks ;)");
-
- Assert.assertEquals("My Custom #getAsString", s);
}
-}
+}
\ No newline at end of file