You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2008/10/16 09:14:38 UTC
svn commit: r705149 -
/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/grid/GridLayoutManagerUnitTest.java
Author: lofwyr
Date: Thu Oct 16 00:14:38 2008
New Revision: 705149
URL: http://svn.apache.org/viewvc?rev=705149&view=rev
Log:
TOBAGO-606: Layout
* fixing test with span
Modified:
myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/grid/GridLayoutManagerUnitTest.java
Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/grid/GridLayoutManagerUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/grid/GridLayoutManagerUnitTest.java?rev=705149&r1=705148&r2=705149&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/grid/GridLayoutManagerUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/grid/GridLayoutManagerUnitTest.java Thu Oct 16 00:14:38 2008
@@ -113,16 +113,16 @@
LayoutContainer span1 = new LayoutContainerImpl();
GridComponentConstraints constraint1 = GridComponentConstraints.getConstraints(span1);
- constraint1.setRowSpan(2);
+ constraint1.setColumnSpan(2);
LayoutContainer span2 = new LayoutContainerImpl();
GridComponentConstraints constraint2 = GridComponentConstraints.getConstraints(span2);
- constraint2.setRowSpan(2);
+ constraint2.setColumnSpan(2);
- container.getComponents().add(span1);
- container.getComponents().add(new LayoutComponentImpl());
container.getComponents().add(new LayoutComponentImpl());
+ container.getComponents().add(span1);
container.getComponents().add(span2);
+ container.getComponents().add(new LayoutComponentImpl());
container.setLayoutManager(new GridLayoutManager(container, "*;*;*", "*;*"));
span1.setLayoutManager(new GridLayoutManager(span1, "*;*;*", "*"));
@@ -135,7 +135,7 @@
horizontal.descend(0, 1);
EquationManager vertial = layoutContext.getVertical();
- vertial.setFixedLength(0, 900);
+ vertial.setFixedLength(0, 200);
vertial.descend(0, 1);
LOG.info(((GridLayoutManager)container.getLayoutManager()).getGrid());
@@ -146,11 +146,11 @@
double[] result = layoutContext.getHorizontal().solve();
LOG.info("result: " + Arrays.toString(result));
-//fixme AssertUtils.assertEquals(new double[]{900, 300, 300, 300, 200, 200, 200, 200, 200, 200}, result, 0.000001);
+ AssertUtils.assertEquals(new double[]{900, 300, 300, 300, 200, 200, 200, 200, 200, 200}, result, 0.000001);
result = layoutContext.getVertical().solve();
LOG.info("result: " + Arrays.toString(result));
-//fixme AssertUtils.assertEquals(new double[]{900, 450, 450}, result, 0.000001);
+ AssertUtils.assertEquals(new double[]{200, 100, 100, 100, 100}, result, 0.000001);
}
}