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/24 09:07:32 UTC
svn commit: r707567 - in
/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout:
MockComponent.java MockContainer.java grid/GridLayoutManagerUnitTest.java
Author: lofwyr
Date: Fri Oct 24 00:07:31 2008
New Revision: 707567
URL: http://svn.apache.org/viewvc?rev=707567&view=rev
Log:
TOBAGO-606: Layout
* rename Impl to Mock
Added:
myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockComponent.java (contents, props changed)
- copied, changed from r707566, myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/ComponentImpl.java
myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockContainer.java (contents, props changed)
- copied, changed from r707566, myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/ContainerImpl.java
Modified:
myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/grid/GridLayoutManagerUnitTest.java
Copied: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockComponent.java (from r707566, myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/ComponentImpl.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockComponent.java?p2=myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockComponent.java&p1=myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/ComponentImpl.java&r1=707566&r2=707567&rev=707567&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/ComponentImpl.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockComponent.java Fri Oct 24 00:07:31 2008
@@ -22,11 +22,11 @@
/*
* Date: 14.02.2008 12:08:52
*/
-public class ComponentImpl implements Component {
+public class MockComponent implements Component {
private Constraints constraints;
- public ComponentImpl() {
+ public MockComponent() {
constraints = new GridConstraints();
}
Propchange: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockComponent.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockContainer.java (from r707566, myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/ContainerImpl.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockContainer.java?p2=myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockContainer.java&p1=myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/ContainerImpl.java&r1=707566&r2=707567&rev=707567&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/ContainerImpl.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockContainer.java Fri Oct 24 00:07:31 2008
@@ -23,13 +23,13 @@
/*
* Date: 14.02.2008 12:03:31
*/
-public class ContainerImpl extends ComponentImpl implements Container {
+public class MockContainer extends MockComponent implements Container {
private LayoutManager layoutManager;
private List<Component> components;
- public ContainerImpl() {
+ public MockContainer() {
components = new ArrayList<Component>();
}
Propchange: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockContainer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/MockContainer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
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=707567&r1=707566&r2=707567&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 Fri Oct 24 00:07:31 2008
@@ -21,10 +21,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.layout.Component;
-import org.apache.myfaces.tobago.layout.ComponentImpl;
import org.apache.myfaces.tobago.layout.Container;
-import org.apache.myfaces.tobago.layout.ContainerImpl;
import org.apache.myfaces.tobago.layout.LayoutContext;
+import org.apache.myfaces.tobago.layout.MockComponent;
+import org.apache.myfaces.tobago.layout.MockContainer;
import org.apache.myfaces.tobago.layout.PixelMeasure;
import org.apache.myfaces.tobago.layout.math.AssertUtils;
@@ -45,10 +45,10 @@
* </pre>
*/
public void testSimple() {
- Container container = new ContainerImpl();
- ComponentImpl c1 = new ComponentImpl();
+ Container container = new MockContainer();
+ MockComponent c1 = new MockComponent();
container.getComponents().add(c1);
- ComponentImpl c2 = new ComponentImpl();
+ MockComponent c2 = new MockComponent();
container.getComponents().add(c2);
GridLayoutManager manager = new GridLayoutManager("*;2*", "*");
@@ -83,10 +83,10 @@
* </pre>
*/
public void testSpan() {
- Container container = new ContainerImpl();
- ComponentImpl c = new ComponentImpl();
+ Container container = new MockContainer();
+ MockComponent c = new MockComponent();
container.getComponents().add(c);
- ComponentImpl span = new ComponentImpl();
+ MockComponent span = new MockComponent();
container.getComponents().add(span);
((GridConstraints) span.getConstraints()).setColumnSpan(2);
@@ -129,17 +129,17 @@
* </pre>
*/
public void testSpanAndSubLayout() {
- Container container = new ContainerImpl();
- Component span = new ComponentImpl();
+ Container container = new MockContainer();
+ Component span = new MockComponent();
GridConstraints bConstraint = GridConstraints.getConstraints(span);
bConstraint.setColumnSpan(2);
- container.getComponents().add(new ComponentImpl());
+ container.getComponents().add(new MockComponent());
container.getComponents().add(span);
- container.getComponents().add(new ComponentImpl());
- container.getComponents().add(new ComponentImpl());
+ container.getComponents().add(new MockComponent());
+ container.getComponents().add(new MockComponent());
- Container subContainer = new ContainerImpl();
+ Container subContainer = new MockContainer();
container.getComponents().add(subContainer);
GridLayoutManager manager = new GridLayoutManager("*;2*;500px", "*;600px");
@@ -147,10 +147,10 @@
GridLayoutManager subManager = new GridLayoutManager("7*;3*", "*;*");
subContainer.setLayoutManager(subManager);
- subContainer.getComponents().add(new ComponentImpl());
- subContainer.getComponents().add(new ComponentImpl());
- subContainer.getComponents().add(new ComponentImpl());
- subContainer.getComponents().add(new ComponentImpl());
+ subContainer.getComponents().add(new MockComponent());
+ subContainer.getComponents().add(new MockComponent());
+ subContainer.getComponents().add(new MockComponent());
+ subContainer.getComponents().add(new MockComponent());
((GridConstraints) container.getConstraints()).setWidth(new PixelMeasure(800));
((GridConstraints) container.getConstraints()).setHeight(new PixelMeasure(800));
@@ -179,20 +179,20 @@
* </pre>
*/
public void testSpanOverlapsSpan() {
- Container container = new ContainerImpl();
+ Container container = new MockContainer();
- Container span1 = new ContainerImpl();
+ Container span1 = new MockContainer();
GridConstraints constraint1 = GridConstraints.getConstraints(span1);
constraint1.setColumnSpan(2);
- Container span2 = new ContainerImpl();
+ Container span2 = new MockContainer();
GridConstraints constraint2 = GridConstraints.getConstraints(span2);
constraint2.setColumnSpan(2);
- container.getComponents().add(new ComponentImpl());
+ container.getComponents().add(new MockComponent());
container.getComponents().add(span1);
container.getComponents().add(span2);
- container.getComponents().add(new ComponentImpl());
+ container.getComponents().add(new MockComponent());
container.setLayoutManager(new GridLayoutManager("*;*;*", "*;*"));
span1.setLayoutManager(new GridLayoutManager("*;*;*", "*"));