From 8776fcaa2ed0b5ea7d198ceb785b835518a48049 Mon Sep 17 00:00:00 2001 From: Thomas Cashman Date: Sun, 14 May 2017 17:31:18 +0200 Subject: [PATCH] Tagging 1.5.0-beta.8 --- build.gradle | 2 +- .../mini2Dx/ui/layout/FlexDirectionTest.java | 29 +++++++++++++++++ .../mini2Dx/ui/render/RenderLayerTest.java | 5 +++ .../org/mini2Dx/ui/render/RenderNodeTest.java | 32 +++++++++++++++++++ .../mini2Dx/ui/render/RowRenderNodeTest.java | 4 +++ 5 files changed, 71 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c14e49e7e..0d17835f4 100644 --- a/build.gradle +++ b/build.gradle @@ -64,7 +64,7 @@ def docProjects() { subprojects.findAll { !it.name.contains('uat') } } -def projectVersion = '1.5.0-SNAPSHOT'; +def projectVersion = '1.5.0-beta.8'; configure(docProjects()) { apply plugin: "java" diff --git a/ui/src/test/java/org/mini2Dx/ui/layout/FlexDirectionTest.java b/ui/src/test/java/org/mini2Dx/ui/layout/FlexDirectionTest.java index 4b4f7743c..d5ea3e9c1 100644 --- a/ui/src/test/java/org/mini2Dx/ui/layout/FlexDirectionTest.java +++ b/ui/src/test/java/org/mini2Dx/ui/layout/FlexDirectionTest.java @@ -6,6 +6,11 @@ import java.util.ArrayList; import java.util.List; +import org.jmock.Expectations; +import org.jmock.Mockery; +import org.jmock.lib.legacy.ClassImposteriser; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import org.mini2Dx.ui.dummy.DummyParentRenderNode; import org.mini2Dx.ui.dummy.DummyParentUiElement; @@ -13,6 +18,7 @@ import org.mini2Dx.ui.dummy.DummyUiElement; import org.mini2Dx.ui.element.Visibility; import org.mini2Dx.ui.render.RenderNode; +import org.mini2Dx.ui.render.UiContainerRenderTree; import junit.framework.Assert; @@ -22,7 +28,9 @@ public class FlexDirectionTest { private static final int TOTAL_CHILDREN = 4; + private Mockery mockery; private LayoutState layoutState; + private UiContainerRenderTree renderTree; private final DummyParentUiElement parentElement = new DummyParentUiElement(); private final List children = new ArrayList(1); @@ -30,6 +38,27 @@ public class FlexDirectionTest { private DummyParentRenderNode parentRenderNode; + @Before + public void setUp() { + mockery = new Mockery(); + mockery.setImposteriser(ClassImposteriser.INSTANCE); + + layoutState = mockery.mock(LayoutState.class); + renderTree = mockery.mock(UiContainerRenderTree.class); + + mockery.checking(new Expectations() { + { + atLeast(1).of(layoutState).getUiContainerRenderTree(); + will(returnValue(renderTree)); + } + }); + } + + @After + public void teardown() { + mockery.assertIsSatisfied(); + } + @Test public void testColumn() { setUpPreferredSizes(300f, 100f); diff --git a/ui/src/test/java/org/mini2Dx/ui/render/RenderLayerTest.java b/ui/src/test/java/org/mini2Dx/ui/render/RenderLayerTest.java index 723920689..80cf97945 100644 --- a/ui/src/test/java/org/mini2Dx/ui/render/RenderLayerTest.java +++ b/ui/src/test/java/org/mini2Dx/ui/render/RenderLayerTest.java @@ -32,6 +32,7 @@ public class RenderLayerTest { private Mockery mockery; private LayoutState layoutState; + private UiContainerRenderTree renderTree; private DummyParentUiElement parentElement = new DummyParentUiElement(); private DummyUiElement uiElement1 = new DummyUiElement(); @@ -53,6 +54,8 @@ public void setUp() { mockery.setImposteriser(ClassImposteriser.INSTANCE); layoutState = mockery.mock(LayoutState.class); + renderTree = mockery.mock(UiContainerRenderTree.class); + renderLayer.add(renderNode1); renderLayer.add(renderNode2); } @@ -339,6 +342,8 @@ public void testPreferredHeightWrappedWithPaddingAndNegativeMargin() { private void configureParentWithWidth(final float parentWidth) { mockery.checking(new Expectations() { { + atLeast(1).of(layoutState).getUiContainerRenderTree(); + will(returnValue(renderTree)); one(layoutState).getParentWidth(); will(returnValue(parentWidth)); atLeast(1).of(layoutState).setParentWidth(with(any(Float.class))); diff --git a/ui/src/test/java/org/mini2Dx/ui/render/RenderNodeTest.java b/ui/src/test/java/org/mini2Dx/ui/render/RenderNodeTest.java index 2ebba6429..f4801ecac 100644 --- a/ui/src/test/java/org/mini2Dx/ui/render/RenderNodeTest.java +++ b/ui/src/test/java/org/mini2Dx/ui/render/RenderNodeTest.java @@ -37,6 +37,7 @@ public class RenderNodeTest { private Mockery mockery; private LayoutState layoutState; + private UiContainerRenderTree renderTree; private DummyParentUiElement parentElement = new DummyParentUiElement(); private DummyUiElement uiElement = new DummyUiElement(); @@ -59,6 +60,7 @@ public void setUp() { mockery.setImposteriser(ClassImposteriser.INSTANCE); layoutState = mockery.mock(LayoutState.class); + renderTree = mockery.mock(UiContainerRenderTree.class); } @After @@ -190,6 +192,13 @@ public void testRenderCoordinatesWithChildAndParentMarginAndPadding() { @Test public void testPreferredSize() { + mockery.checking(new Expectations() { + { + atLeast(1).of(layoutState).getUiContainerRenderTree(); + will(returnValue(renderTree)); + } + }); + final float preferredWidth = 150f; final float preferredHeight = 200f; @@ -208,6 +217,13 @@ public void testPreferredSize() { @Test public void testPreferredSizeWithPadding() { + mockery.checking(new Expectations() { + { + atLeast(1).of(layoutState).getUiContainerRenderTree(); + will(returnValue(renderTree)); + } + }); + final int padding = 20; final float preferredWidth = 150f; final float preferredHeight = 200f; @@ -228,6 +244,13 @@ public void testPreferredSizeWithPadding() { @Test public void testPreferredSizeWithMargin() { + mockery.checking(new Expectations() { + { + atLeast(1).of(layoutState).getUiContainerRenderTree(); + will(returnValue(renderTree)); + } + }); + final int padding = 20; final int margin = 35; final float preferredWidth = 150f; @@ -250,6 +273,13 @@ public void testPreferredSizeWithMargin() { @Test public void testPreferredSizeWithNegativeMargin() { + mockery.checking(new Expectations() { + { + atLeast(1).of(layoutState).getUiContainerRenderTree(); + will(returnValue(renderTree)); + } + }); + final int padding = 20; final int margin = -35; final float preferredWidth = 150f; @@ -273,6 +303,8 @@ public void testPreferredSizeWithNegativeMargin() { private void configureParentWidth() { mockery.checking(new Expectations() { { + atLeast(1).of(layoutState).getUiContainerRenderTree(); + will(returnValue(renderTree)); atLeast(1).of(layoutState).getParentWidth(); will(returnValue(0f + PARENT_WIDTH)); atLeast(1).of(layoutState).setParentWidth(with(any(Float.class))); diff --git a/ui/src/test/java/org/mini2Dx/ui/render/RowRenderNodeTest.java b/ui/src/test/java/org/mini2Dx/ui/render/RowRenderNodeTest.java index cb6d4edbe..f4dc486df 100644 --- a/ui/src/test/java/org/mini2Dx/ui/render/RowRenderNodeTest.java +++ b/ui/src/test/java/org/mini2Dx/ui/render/RowRenderNodeTest.java @@ -34,6 +34,7 @@ public class RowRenderNodeTest { private Mockery mockery; private UiTheme theme; private LayoutState layoutState; + private UiContainerRenderTree renderTree; private Row row = new Row(); private RowRenderNode rowRenderNode = new RowRenderNode(null, row); @@ -50,6 +51,7 @@ public void setUp() { mockery.setImposteriser(ClassImposteriser.INSTANCE); layoutState = mockery.mock(LayoutState.class); + renderTree = mockery.mock(UiContainerRenderTree.class); theme = mockery.mock(UiTheme.class); row.setVisibility(Visibility.VISIBLE); @@ -314,6 +316,8 @@ public void testPreferredHeightWrappedWithPaddingAndNegativeMargin() { private void configureParentWithWidth(final float parentWidth) { mockery.checking(new Expectations() { { + atLeast(1).of(layoutState).getUiContainerRenderTree(); + will(returnValue(renderTree)); atLeast(1).of(layoutState).getTheme(); will(returnValue(theme)); atLeast(1).of(layoutState).getScreenSize();