svn commit: r788698 - in /myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago: component/ context/ convert/ layout/ layout/grid/ layout/math/

[lo...@apache.org]

Author: lofwyr
Date: Fri Jun 26 13:36:13 2009
New Revision: 788698

URL: http://svn.apache.org/viewvc?rev=788698&view=rev
Log:
TOBAGO-766
 - Clean up UnitTests

Removed:
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UITreeUnitTest.java
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/math/AssertUtils.java
Modified:
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/ComponentUtilUnitTest.java
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/GridLayoutManagerUnitTest.java
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIDataUnitTest.java
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIMessagesUnitTest.java
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/context/ResourceUtilsUnitTest.java
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/convert/DurationConverterUnitTest.java
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/LayoutTokensUnitTest.java
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/grid/GridArrayUnitTest.java
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/grid/GridUnitTest.java
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/math/EquationManagerUnitTest.java
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/math/SystemOfEquationsUnitTest.java

Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/ComponentUtilUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/ComponentUtilUnitTest.java?rev=788698&r1=788697&r2=788698&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/ComponentUtilUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/ComponentUtilUnitTest.java Fri Jun 26 13:36:13 2009
@@ -17,17 +17,18 @@
  * limitations under the License.
  */
 
-import junit.framework.TestCase;
-import org.junit.Assert;
 import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class ComponentUtilUnitTest extends TestCase {
+public class ComponentUtilUnitTest {
 
-    public void testSplitList() {
-      Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtil.splitList("ab cd"));
-      Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtil.splitList("ab  cd"));
-      Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtil.splitList("ab,  cd"));
-      Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtil.splitList("ab , cd"));
-      Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtil.splitList("ab,,cd"));
-    }
+  @Test
+  public void testSplitList() {
+    Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtil.splitList("ab cd"));
+    Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtil.splitList("ab  cd"));
+    Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtil.splitList("ab,  cd"));
+    Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtil.splitList("ab , cd"));
+    Assert.assertArrayEquals(new String[]{"ab", "cd"}, ComponentUtil.splitList("ab,,cd"));
+  }
 }

Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/GridLayoutManagerUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/GridLayoutManagerUnitTest.java?rev=788698&r1=788697&r2=788698&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/GridLayoutManagerUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/GridLayoutManagerUnitTest.java Fri Jun 26 13:36:13 2009
@@ -17,19 +17,19 @@
  * limitations under the License.
  */
 
-import junit.framework.TestCase;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 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;
 import org.apache.myfaces.tobago.layout.math.SystemOfEquations;
+import org.junit.Assert;
+import org.junit.Test;
 
 import java.util.Arrays;
 
-public class GridLayoutManagerUnitTest extends TestCase {
+public class GridLayoutManagerUnitTest {
 
   private static final Log LOG = LogFactory.getLog(GridLayoutManagerUnitTest.class);
 
@@ -43,6 +43,7 @@
    * +---------+----------+  -----
    * </pre>
    */
+  @Test
   public void testSimple() {
     MockContainer container = new MockContainer();
     MockComponent c1 = new MockComponent();
@@ -63,15 +64,15 @@
 
     double[] result = layoutContext.getHorizontal().getResult();
     LOG.info("result: " + Arrays.toString(result));
-    AssertUtils.assertEquals(new double[]{300, 100, 200, 100, 200}, result, 0.000001);
+    Assert.assertArrayEquals(new double[]{300, 100, 200, 100, 200}, result, 0.000001);
 
     result = layoutContext.getVertical().getResult();
     LOG.info("result: " + Arrays.toString(result));
-    AssertUtils.assertEquals(new double[]{20, 20, 20, 20}, result, 0.000001);
+    Assert.assertArrayEquals(new double[]{20, 20, 20, 20}, result, 0.000001);
 
-    assertEquals("width of container", 300, container.getWidth().getPixel());
-    assertEquals("width of component 1", 100, c1.getWidth().getPixel());
-    assertEquals("width of component 2", 200, c2.getWidth().getPixel());
+    Assert.assertEquals("width of container", 300, container.getWidth().getPixel());
+    Assert.assertEquals("width of component 1", 100, c1.getWidth().getPixel());
+    Assert.assertEquals("width of component 2", 200, c2.getWidth().getPixel());
   }
 
   /**
@@ -84,6 +85,7 @@
    * +---------+----------+---------+  -----
    * </pre>
    */
+  @Test
   public void testSpan() {
     MockContainer container = new MockContainer();
     MockComponent c = new MockComponent();
@@ -105,15 +107,15 @@
 
     double[] result = layoutContext.getHorizontal().getResult();
     LOG.info("result: " + Arrays.toString(result));
-    AssertUtils.assertEquals(new double[]{300, 100, 100, 100, 100, 200}, result, 0.000001);
+    Assert.assertArrayEquals(new double[]{300, 100, 100, 100, 100, 200}, result, 0.000001);
 
     result = layoutContext.getVertical().getResult();
     LOG.info("result: " + Arrays.toString(result));
-    AssertUtils.assertEquals(new double[]{20, 20, 20, 20}, result, 0.000001);
+    Assert.assertArrayEquals(new double[]{20, 20, 20, 20}, result, 0.000001);
 
-    assertEquals("width of container", 300, container.getWidth().getPixel());
-    assertEquals("width of component", 100, c.getWidth().getPixel());
-    assertEquals("width of span", 200, span.getWidth().getPixel());
+    Assert.assertEquals("width of container", 300, container.getWidth().getPixel());
+    Assert.assertEquals("width of component", 100, c.getWidth().getPixel());
+    Assert.assertEquals("width of span", 200, span.getWidth().getPixel());
   }
 
   /**
@@ -133,6 +135,7 @@
    * +---------+----------+--------+--------+  ----- ----- -----
    * </pre>
    */
+  @Test
   public void testSpanAndSubLayout() {
     MockContainer container = new MockContainer();
     MockComponent span = new MockComponent();
@@ -169,19 +172,19 @@
 
     double[] result = layoutContext.getHorizontal().getResult();
     LOG.info("result: " + Arrays.toString(result));
-    AssertUtils.assertEquals(new double[]{
+    Assert.assertArrayEquals(new double[]{
         800, 100, 200, 500, 100, 700, 100, 200, 500, 350, 150, 350, 150, 350, 150
     }, result, 0.000001);
 
 
     result = layoutContext.getVertical().getResult();
     LOG.info("result: " + Arrays.toString(result));
-    AssertUtils.assertEquals(new double[]{
+    Assert.assertArrayEquals(new double[]{
         800, 200, 600, 200, 200, 600, 600, 600, 300, 300, 300, 300, 300, 300
     }, result, 0.000001);
 
-    assertEquals("width of container", 800, container.getWidth().getPixel());
-    assertEquals("width of span", 700, span.getWidth().getPixel());
+    Assert.assertEquals("width of container", 800, container.getWidth().getPixel());
+    Assert.assertEquals("width of span", 700, span.getWidth().getPixel());
   }
 
   /**
@@ -192,6 +195,7 @@
    * |   *   |   *   |   *   |           |
    * </pre>
    */
+  @Test
   public void testSpanOverlapsSpan() {
     MockContainer container = new MockContainer();
 
@@ -233,18 +237,18 @@
 
     double[] result = layoutContext.getHorizontal().getResult();
     LOG.info("result: " + Arrays.toString(result));
-    AssertUtils.assertEquals(new double[]{
+    Assert.assertArrayEquals(new double[]{
         900, 300, 300, 300, 300, 600, 200, 200, 200, 600, 200, 200, 200, 300
     }, result, 0.000001);
 
 
     result = layoutContext.getVertical().getResult();
     LOG.info("result: " + Arrays.toString(result));
-    AssertUtils.assertEquals(new double[]{200, 100, 100, 100, 100, 100, 100, 100, 100}, result, 0.000001);
+    Assert.assertArrayEquals(new double[]{200, 100, 100, 100, 100, 100, 100, 100, 100}, result, 0.000001);
 
-    assertEquals("width of container", 900, container.getWidth().getPixel());
-    assertEquals("width of span 1", 600, span1.getWidth().getPixel());
-    assertEquals("width of span 2", 600, span2.getWidth().getPixel());
+    Assert.assertEquals("width of container", 900, container.getWidth().getPixel());
+    Assert.assertEquals("width of span 1", 600, span1.getWidth().getPixel());
+    Assert.assertEquals("width of span 2", 600, span2.getWidth().getPixel());
   }
 
   /**
@@ -264,6 +268,7 @@
    * +---------+----------+ ----- -----
    * </pre>
    */
+  @Test
   public void testRowSpan() {
     MockContainer container = new MockContainer();
     MockComponent span = new MockComponent();
@@ -286,17 +291,17 @@
 
     double[] result = layoutContext.getHorizontal().getResult();
     LOG.info("result: " + Arrays.toString(result));
-    AssertUtils.assertEquals(new double[]{800.0, 400.0, 400.0, 400.0, 400.0, 400.0}, result, SystemOfEquations.EPSILON);
+    Assert.assertArrayEquals(new double[]{800.0, 400.0, 400.0, 400.0, 400.0, 400.0}, result, SystemOfEquations.EPSILON);
 
 
     result = layoutContext.getVertical().getResult();
     LOG.info("result: " + Arrays.toString(result));
-    AssertUtils.assertEquals(new double[]{800.0, 400.0, 400.0, 800.0, 400.0, 400.0}, result, SystemOfEquations.EPSILON);
+    Assert.assertArrayEquals(new double[]{800.0, 400.0, 400.0, 800.0, 400.0, 400.0}, result, SystemOfEquations.EPSILON);
 
-    assertEquals("width of container", 800, container.getWidth().getPixel());
-    assertEquals("height of container", 800, container.getHeight().getPixel());
-    assertEquals("width of span", 400, span.getWidth().getPixel());
-    assertEquals("height of span", 800, span.getHeight().getPixel());
+    Assert.assertEquals("width of container", 800, container.getWidth().getPixel());
+    Assert.assertEquals("height of container", 800, container.getHeight().getPixel());
+    Assert.assertEquals("width of span", 400, span.getWidth().getPixel());
+    Assert.assertEquals("height of span", 800, span.getHeight().getPixel());
   }
 
 }

Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIDataUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIDataUnitTest.java?rev=788698&r1=788697&r2=788698&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIDataUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIDataUnitTest.java Fri Jun 26 13:36:13 2009
@@ -17,90 +17,86 @@
  * limitations under the License.
  */
 
-import junit.framework.TestCase;
-
+import org.junit.Assert;
+import org.junit.Test;
 
 import javax.faces.model.ListDataModel;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
-/**
- * @author bommel (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-public class UIDataUnitTest extends TestCase {
-  String [] nineRows =
-      { "one", "two", "three", "four", "five",
-          "six", "seven" , "eight", "nine" };
+public class UIDataUnitTest {
+  String[] nineRows =
+      {"one", "two", "three", "four", "five",
+          "six", "seven", "eight", "nine"};
 
+  @Test
   public void testPage() {
-    List list = new ArrayList();
-    for (String nineRow : nineRows) {
-      list.add(nineRow);
-    }
+    List<String> list = new ArrayList<String>();
+    list.addAll(Arrays.asList(nineRows));
     UIData data = new UIData();
     data.setValue(new ListDataModel(list));
     data.setRows(5);
-    assertEquals(1, data.getPage());
-    assertEquals(2, data.getPages());
+    Assert.assertEquals(1, data.getPage());
+    Assert.assertEquals(2, data.getPages());
 
     data.setRows(9);
-    assertEquals(1, data.getPage());
-    assertEquals(1, data.getPages());
+    Assert.assertEquals(1, data.getPage());
+    Assert.assertEquals(1, data.getPages());
 
     data.setRows(2);
-    assertEquals(1, data.getPage());
-    assertEquals(5, data.getPages());
+    Assert.assertEquals(1, data.getPage());
+    Assert.assertEquals(5, data.getPages());
 
     data.setRows(3);
-    assertEquals(1, data.getPage());
-    assertEquals(3, data.getPages());
+    Assert.assertEquals(1, data.getPage());
+    Assert.assertEquals(3, data.getPages());
 
 
     data.setRows(1);
-    assertEquals(1, data.getPage());
-    assertEquals(9, data.getPages());
+    Assert.assertEquals(1, data.getPage());
+    Assert.assertEquals(9, data.getPages());
 
     data.setRows(5);
     data.setFirst(5);
-    assertEquals(2, data.getPage());
+    Assert.assertEquals(2, data.getPage());
 
     data.setRows(9);
     data.setFirst(6);
-    assertEquals(1, data.getPage());
+    Assert.assertEquals(1, data.getPage());
 
     data.setRows(2);
     data.setFirst(0);
-    assertEquals(1, data.getPage());
+    Assert.assertEquals(1, data.getPage());
 
     data.setRows(2);
     data.setFirst(1);
-    assertEquals(1, data.getPage());
+    Assert.assertEquals(1, data.getPage());
 
     data.setRows(2);
     data.setFirst(2);
-    assertEquals(2, data.getPage());
+    Assert.assertEquals(2, data.getPage());
 
     data.setRows(2);
     data.setFirst(3);
-    assertEquals(2, data.getPage());
+    Assert.assertEquals(2, data.getPage());
 
     data.setRows(2);
     data.setFirst(6);
-    assertEquals(4, data.getPage());
-     //TODO enable this
+    Assert.assertEquals(4, data.getPage());
+    //TODO enable this
     /*data.setRows(1);
     data.setFirst(8);
     data.setRowIndex(8);
-    assertEquals(data.getRowData(), list.get(8));
-    assertEquals(9, data.getPage());
-    assertEquals(9, data.getPages());
+    Assert.assertEquals(data.getRowData(), list.get(8));
+    Assert.assertEquals(9, data.getPage());
+    Assert.assertEquals(9, data.getPages());
 
     list.remove(8);
-    assertEquals(list.size(), data.getRowCount());
+    Assert.assertEquals(list.size(), data.getRowCount());
     data.setFirst(0);
-    assertEquals(1, data.getPage());
-    assertEquals(8, data.getPages());
+    Assert.assertEquals(1, data.getPage());
+    Assert.assertEquals(8, data.getPages());
       */
   }
 }

Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIMessagesUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIMessagesUnitTest.java?rev=788698&r1=788697&r2=788698&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIMessagesUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/component/UIMessagesUnitTest.java Fri Jun 26 13:36:13 2009
@@ -17,70 +17,69 @@
  * limitations under the License.
  */
 
-import junit.framework.TestCase;
+import org.apache.shale.test.mock.MockFacesContext;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 import javax.faces.application.FacesMessage;
 import javax.faces.context.FacesContext;
 import java.util.List;
 
-import org.apache.shale.test.mock.MockFacesContext;
-
-/**
- * @author lofwyr (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-public class UIMessagesUnitTest extends TestCase {
+public class UIMessagesUnitTest {
 
   private FacesContext facesContext;
 
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
-
+  @Before
+  public void setUp() throws Exception {
     facesContext = new MockFacesContext();
     facesContext.addMessage("id0", new FacesMessage(FacesMessage.SEVERITY_INFO, "test", "a test"));
     facesContext.addMessage("id0", new FacesMessage(FacesMessage.SEVERITY_WARN, "test", "a test"));
     facesContext.addMessage("id1", new FacesMessage(FacesMessage.SEVERITY_ERROR, "test", "a test"));
     facesContext.addMessage("id1", new FacesMessage(FacesMessage.SEVERITY_FATAL, "test", "a test"));
     facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_FATAL, "test", "a test"));
-
   }
 
+  @Test
   public void testCreateMessageListAll() {
 
     UIMessages component = new UIMessages();
     List<UIMessages.Item> messages = component.createMessageList(facesContext);
 
-    assertEquals(5, messages.size());
+    Assert.assertEquals(5, messages.size());
   }
 
+  @Test
   public void testCreateMessageListGlobalOnly() {
 
     UIMessages component = new UIMessages();
     component.setGlobalOnly(true);
     List<UIMessages.Item> messages = component.createMessageList(facesContext);
 
-    assertEquals(1, messages.size());
+    Assert.assertEquals(1, messages.size());
   }
 
+  @Test
   public void testCreateMessageListForId0() {
 
     UIMessages component = new UIMessages();
     component.setFor("id0");
     List<UIMessages.Item> messages = component.createMessageList(facesContext);
 
-    assertEquals(2, messages.size());
+    Assert.assertEquals(2, messages.size());
   }
 
+  @Test
   public void testCreateMessageListInfoToWarn() {
 
     UIMessages component = new UIMessages();
     component.setMaxSeverity(FacesMessage.SEVERITY_WARN);
     List<UIMessages.Item> messages = component.createMessageList(facesContext);
 
-    assertEquals(2, messages.size());
+    Assert.assertEquals(2, messages.size());
   }
 
+  @Test
   public void testCreateMessageListWarnToError() {
 
     UIMessages component = new UIMessages();
@@ -88,31 +87,34 @@
     component.setMaxSeverity(FacesMessage.SEVERITY_ERROR);
     List<UIMessages.Item> messages = component.createMessageList(facesContext);
 
-    assertEquals(2, messages.size());
+    Assert.assertEquals(2, messages.size());
   }
 
+  @Test
   public void testCreateMessageListErrorToFatal() {
 
     UIMessages component = new UIMessages();
     component.setMinSeverity(FacesMessage.SEVERITY_ERROR);
     List<UIMessages.Item> messages = component.createMessageList(facesContext);
 
-    assertEquals(3, messages.size());
+    Assert.assertEquals(3, messages.size());
   }
 
+  @Test
   public void testCreateMessageListMaxNumber() {
 
     UIMessages component = new UIMessages();
 
     component.setMaxNumber(3);
     List<UIMessages.Item> messages = component.createMessageList(facesContext);
-    assertEquals(3, messages.size());
+    Assert.assertEquals(3, messages.size());
 
     component.setMaxNumber(30000);
     messages = component.createMessageList(facesContext);
-    assertEquals(5, messages.size());
+    Assert.assertEquals(5, messages.size());
   }
 
+  @Test
   public void testCreateMessageListOrderBySeverity() {
 
     UIMessages component = new UIMessages();
@@ -122,15 +124,16 @@
     int mustShrink = FacesMessage.SEVERITY_FATAL.getOrdinal();
     for (UIMessages.Item message : messages) {
       int newValue = message.getFacesMessage().getSeverity().getOrdinal();
-      assertTrue(mustShrink >= newValue);
+      Assert.assertTrue(mustShrink >= newValue);
       mustShrink = newValue;
     }
   }
 
+  @Test
   public void testOrderByEnum() {
-    assertEquals(2, UIMessages.OrderBy.values().length);
-    assertEquals(UIMessages.OrderBy.OCCURENCE, UIMessages.OrderBy.parse(UIMessages.OrderBy.OCCURENCE_STRING));
-    assertEquals(UIMessages.OrderBy.SEVERITY, UIMessages.OrderBy.parse(UIMessages.OrderBy.SEVERITY_STRING));
+    Assert.assertEquals(2, UIMessages.OrderBy.values().length);
+    Assert.assertEquals(UIMessages.OrderBy.OCCURENCE, UIMessages.OrderBy.parse(UIMessages.OrderBy.OCCURENCE_STRING));
+    Assert.assertEquals(UIMessages.OrderBy.SEVERITY, UIMessages.OrderBy.parse(UIMessages.OrderBy.SEVERITY_STRING));
   }
 
 }

Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/context/ResourceUtilsUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/context/ResourceUtilsUnitTest.java?rev=788698&r1=788697&r2=788698&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/context/ResourceUtilsUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/context/ResourceUtilsUnitTest.java Fri Jun 26 13:36:13 2009
@@ -1,7 +1,5 @@
 package org.apache.myfaces.tobago.context;
 
-import junit.framework.TestCase;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,15 +17,20 @@
  * limitations under the License.
  */
 
-public class ResourceUtilsUnitTest extends TestCase {
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ResourceUtilsUnitTest {
 
+  @Test
   public void testCreateString() {
-    assertEquals("folder/treeNode-icon-open.gif",
+    Assert.assertEquals("folder/treeNode-icon-open.gif",
         ResourceUtils.createString("folder", "treeNode", "icon", "open", "gif"));
   }
 
+  @Test
   public void testCreateString2() {
-        assertEquals("folder/treeNode-icon.gif",
+    Assert.assertEquals("folder/treeNode-icon.gif",
         ResourceUtils.createString("folder", "treeNode", "icon", "gif"));
   }
 }

Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/convert/DurationConverterUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/convert/DurationConverterUnitTest.java?rev=788698&r1=788697&r2=788698&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/convert/DurationConverterUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/convert/DurationConverterUnitTest.java Fri Jun 26 13:36:13 2009
@@ -17,53 +17,44 @@
  * limitations under the License.
  */
 
-import junit.framework.TestCase;
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.UIInput;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 import javax.faces.convert.Converter;
 
-public class DurationConverterUnitTest extends TestCase {
-
-// ///////////////////////////////////////////// constant
-
-// ///////////////////////////////////////////// attribute
+public class DurationConverterUnitTest {
 
   private Converter converter;
 
-// ///////////////////////////////////////////// constructor
-
-  public DurationConverterUnitTest(String string) {
-    super(string);
-  }
-
-// ///////////////////////////////////////////// code
-
-  protected void setUp() throws Exception {
-    super.setUp();
+  @Before
+  public void setUp() throws Exception {
     converter = new DurationConverter();
   }
 
-
+  @Test
   public void testFormat() {
 
-    format(null, new Long(1000L), "0:01");
-    format("second", new Long(1000L), "16:40");
-    format("minute", new Long(-100L), "-1:40:00");
-    format("hour", new Long(1L), "1:00:00");
-    format("day", new Long(1L), "24:00:00");
-    format("year", new Long(1L), "8765:45:36");
+    format(null, 1000L, "0:01");
+    format("second", 1000L, "16:40");
+    format("minute", -100L, "-1:40:00");
+    format("hour", 1L, "1:00:00");
+    format("day", 1L, "24:00:00");
+    format("year", 1L, "8765:45:36");
 
   }
 
+  @Test
   public void testParse() {
 
-    parse(null, new Long(1000L), "0:01");
-    parse("second", new Long(1001L), "16:41");
-    parse("minute", new Long(-16L), "-16:41");
-    parse("hour", new Long(1L), "1:00:00");
-    parse("day", new Long(1L), "24:00:00");
-    parse("year", new Long(1L), "8765:45:36");
+    parse(null, 1000L, "0:01");
+    parse("second", 1001L, "16:41");
+    parse("minute", -16L, "-16:41");
+    parse("hour", 1L, "1:00:00");
+    parse("day", 1L, "24:00:00");
+    parse("year", 1L, "8765:45:36");
   }
 
   private void format(String unit, Long aLong, String string) {
@@ -76,7 +67,7 @@
       input.getAttributes().put(Attributes.UNIT, unit);
     }
     result = converter.getAsString(null, input, aLong);
-    assertEquals(info, string, result);
+    Assert.assertEquals(info, string, result);
   }
 
   private void parse(String unit, Long aLong, String string) {
@@ -89,10 +80,7 @@
       input.getAttributes().put(Attributes.UNIT, unit);
     }
     result = (Long) converter.getAsObject(null, input, string);
-    assertEquals(info, aLong, result);
+    Assert.assertEquals(info, aLong, result);
   }
 
-
-// ///////////////////////////////////////////// bean getter + setter
-
 }

Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/LayoutTokensUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/LayoutTokensUnitTest.java?rev=788698&r1=788697&r2=788698&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/LayoutTokensUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/LayoutTokensUnitTest.java Fri Jun 26 13:36:13 2009
@@ -17,32 +17,38 @@
  * limitations under the License.
  */
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class LayoutTokensUnitTest extends TestCase {
+public class LayoutTokensUnitTest {
 
+  @Test
   public void testIsPixelToken() {
-    assertTrue(LayoutTokens.isPixelToken("120px"));
+    Assert.assertTrue(LayoutTokens.isPixelToken("120px"));
   }
 
+  @Test
   public void testIsPercentToken() {
-    assertTrue(LayoutTokens.isPercentToken("50%"));
+    Assert.assertTrue(LayoutTokens.isPercentToken("50%"));
   }
 
+  @Test
   public void testIsRelativeToken() {
-    assertTrue(LayoutTokens.isRelativeToken("3*"));
+    Assert.assertTrue(LayoutTokens.isRelativeToken("3*"));
   }
 
+  @Test
   public void testIsNumberAndSuffix() {
-    assertTrue(LayoutTokens.isNumberAndSuffix("34cm", "cm"));
-    assertFalse(LayoutTokens.isNumberAndSuffix("acm", "cm"));
-    assertFalse(LayoutTokens.isNumberAndSuffix("cm", "cm"));
+    Assert.assertTrue(LayoutTokens.isNumberAndSuffix("34cm", "cm"));
+    Assert.assertFalse(LayoutTokens.isNumberAndSuffix("acm", "cm"));
+    Assert.assertFalse(LayoutTokens.isNumberAndSuffix("cm", "cm"));
   }
 
+  @Test
   public void testParseToken() {
-    assertEquals(RelativeLayoutToken.DEFAULT_INSTANCE, LayoutTokens.parseToken("*"));
-    assertEquals(new RelativeLayoutToken(3), LayoutTokens.parseToken("3*"));
-    assertEquals(new PercentLayoutToken(33), LayoutTokens.parseToken("33%"));
-    assertEquals(new PixelLayoutToken(120), LayoutTokens.parseToken("120px"));
+    Assert.assertEquals(RelativeLayoutToken.DEFAULT_INSTANCE, LayoutTokens.parseToken("*"));
+    Assert.assertEquals(new RelativeLayoutToken(3), LayoutTokens.parseToken("3*"));
+    Assert.assertEquals(new PercentLayoutToken(33), LayoutTokens.parseToken("33%"));
+    Assert.assertEquals(new PixelLayoutToken(120), LayoutTokens.parseToken("120px"));
   }
 }

Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/grid/GridArrayUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/grid/GridArrayUnitTest.java?rev=788698&r1=788697&r2=788698&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/grid/GridArrayUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/grid/GridArrayUnitTest.java Fri Jun 26 13:36:13 2009
@@ -17,21 +17,20 @@
  * limitations under the License.
  */
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
-/*
- * Date: 25.01.2008 17:05:52
- */
-public class GridArrayUnitTest extends TestCase {
+public class GridArrayUnitTest {
 
+  @Test
   public void test() {
 
     GridArray gridArray = new GridArray(1, 1);
-    gridArray.get(0,0);
-    assertEquals (1, gridArray.getRowCount());
-    gridArray.get(0,1);
-    assertEquals (1, gridArray.getRowCount());
-    gridArray.set(0,1, null);
-    assertEquals (2, gridArray.getRowCount());
+    gridArray.get(0, 0);
+    Assert.assertEquals(1, gridArray.getRowCount());
+    gridArray.get(0, 1);
+    Assert.assertEquals(1, gridArray.getRowCount());
+    gridArray.set(0, 1, null);
+    Assert.assertEquals(2, gridArray.getRowCount());
   }
 }

Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/grid/GridUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/grid/GridUnitTest.java?rev=788698&r1=788697&r2=788698&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/grid/GridUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/grid/GridUnitTest.java Fri Jun 26 13:36:13 2009
@@ -17,35 +17,34 @@
  * limitations under the License.
  */
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
-/*
- * Date: 24.01.2008 16:31:58
- */
-public class GridUnitTest extends TestCase {
+public class GridUnitTest {
 
+  @Test
   public void test1x1() {
 
     Grid grid = new Grid(1, 1);
-    assertEquals(1, grid.getColumnCount());
-    assertEquals(1, grid.getRowCount());
-    assertEquals(""
+    Assert.assertEquals(1, grid.getColumnCount());
+    Assert.assertEquals(1, grid.getRowCount());
+    Assert.assertEquals(""
         + "┌─┐\n"
         + "│◌│\n"
         + "└─┘\n", grid.toString());
 
     grid.add(new RealCell(null), 1, 1);
-    assertEquals(1, grid.getColumnCount());
-    assertEquals(1, grid.getRowCount());
-    assertEquals(""
+    Assert.assertEquals(1, grid.getColumnCount());
+    Assert.assertEquals(1, grid.getRowCount());
+    Assert.assertEquals(""
         + "┏━┓\n"
         + "┃█┃\n"
         + "┗━┛\n", grid.toString());
 
     grid.add(new RealCell(null), 1, 1);
-    assertEquals(1, grid.getColumnCount());
-    assertEquals(2, grid.getRowCount());
-    assertEquals(""
+    Assert.assertEquals(1, grid.getColumnCount());
+    Assert.assertEquals(2, grid.getRowCount());
+    Assert.assertEquals(""
         + "┏━┓\n"
         + "┃█┃\n"
         + "┣━┫\n"
@@ -53,9 +52,9 @@
         + "┗━┛\n", grid.toString());
 
     grid.add(new RealCell(null), 1, 2);
-    assertEquals(1, grid.getColumnCount());
-    assertEquals(4, grid.getRowCount());
-    assertEquals(""
+    Assert.assertEquals(1, grid.getColumnCount());
+    Assert.assertEquals(4, grid.getRowCount());
+    Assert.assertEquals(""
         + "┏━┓\n"
         + "┃█┃\n"
         + "┣━┫\n"
@@ -68,9 +67,9 @@
 
     // with warning
     grid.add(new RealCell(null), 2, 1);
-    assertEquals(1, grid.getColumnCount());
-    assertEquals(5, grid.getRowCount());
-    assertEquals(""
+    Assert.assertEquals(1, grid.getColumnCount());
+    Assert.assertEquals(5, grid.getRowCount());
+    Assert.assertEquals(""
         + "┏━┓\n"
         + "┃█┃\n"
         + "┣━┫\n"
@@ -84,36 +83,37 @@
         + "┗━┛\n", grid.toString());
   }
 
+  @Test
   public void test2x1() {
 
     Grid grid = new Grid(2, 1);
-    assertEquals(2, grid.getColumnCount());
-    assertEquals(1, grid.getRowCount());
-    assertEquals(""
+    Assert.assertEquals(2, grid.getColumnCount());
+    Assert.assertEquals(1, grid.getRowCount());
+    Assert.assertEquals(""
         + "┌─┬─┐\n"
         + "│◌│◌│\n"
         + "└─┴─┘\n", grid.toString());
 
     grid.add(new RealCell(null), 1, 1);
-    assertEquals(2, grid.getColumnCount());
-    assertEquals(1, grid.getRowCount());
-    assertEquals(""
+    Assert.assertEquals(2, grid.getColumnCount());
+    Assert.assertEquals(1, grid.getRowCount());
+    Assert.assertEquals(""
         + "┏━┱─┐\n"
         + "┃█┃◌│\n"
         + "┗━┹─┘\n", grid.toString());
 
     grid.add(new RealCell(null), 1, 1);
-    assertEquals(2, grid.getColumnCount());
-    assertEquals(1, grid.getRowCount());
-    assertEquals(""
+    Assert.assertEquals(2, grid.getColumnCount());
+    Assert.assertEquals(1, grid.getRowCount());
+    Assert.assertEquals(""
         + "┏━┳━┓\n"
         + "┃█┃█┃\n"
         + "┗━┻━┛\n", grid.toString());
 
     grid.add(new RealCell(null), 2, 2);
-    assertEquals(2, grid.getColumnCount());
-    assertEquals(3, grid.getRowCount());
-    assertEquals(""
+    Assert.assertEquals(2, grid.getColumnCount());
+    Assert.assertEquals(3, grid.getRowCount());
+    Assert.assertEquals(""
         + "┏━┳━┓\n"
         + "┃█┃█┃\n"
         + "┣━╇━┫\n"
@@ -123,9 +123,9 @@
         + "┗━┷━┛\n", grid.toString());
 
     grid.add(new RealCell(null), 1, 2);
-    assertEquals(2, grid.getColumnCount());
-    assertEquals(5, grid.getRowCount());
-    assertEquals(""
+    Assert.assertEquals(2, grid.getColumnCount());
+    Assert.assertEquals(5, grid.getRowCount());
+    Assert.assertEquals(""
         + "┏━┳━┓\n"
         + "┃█┃█┃\n"
         + "┣━╇━┫\n"
@@ -139,9 +139,9 @@
         + "┗━┹─┘\n", grid.toString());
 
     grid.add(new RealCell(null), 1, 1);
-    assertEquals(2, grid.getColumnCount());
-    assertEquals(5, grid.getRowCount());
-    assertEquals(""
+    Assert.assertEquals(2, grid.getColumnCount());
+    Assert.assertEquals(5, grid.getRowCount());
+    Assert.assertEquals(""
         + "┏━┳━┓\n"
         + "┃█┃█┃\n"
         + "┣━╇━┫\n"
@@ -155,9 +155,9 @@
         + "┗━┹─┘\n", grid.toString());
 
     grid.add(new RealCell(null), 1, 2);
-    assertEquals(2, grid.getColumnCount());
-    assertEquals(6, grid.getRowCount());
-    assertEquals(""
+    Assert.assertEquals(2, grid.getColumnCount());
+    Assert.assertEquals(6, grid.getRowCount());
+    Assert.assertEquals(""
         + "┏━┳━┓\n"
         + "┃█┃█┃\n"
         + "┣━╇━┫\n"
@@ -174,16 +174,17 @@
 
     grid.add(new RealCell(null), 2, 1);
     // fehler
-    assertEquals(2, grid.getColumnCount());
-    assertEquals(6, grid.getRowCount());
+    Assert.assertEquals(2, grid.getColumnCount());
+    Assert.assertEquals(6, grid.getRowCount());
   }
 
+  @Test
   public void test5x5() {
 
     Grid grid = new Grid(5, 5);
-    assertEquals(5, grid.getColumnCount());
-    assertEquals(5, grid.getRowCount());
-    assertEquals(""
+    Assert.assertEquals(5, grid.getColumnCount());
+    Assert.assertEquals(5, grid.getRowCount());
+    Assert.assertEquals(""
         + "┌─┬─┬─┬─┬─┐\n"
         + "│◌│◌│◌│◌│◌│\n"
         + "├─┼─┼─┼─┼─┤\n"
@@ -209,9 +210,9 @@
     grid.add(new RealCell(null), 1, 2);
     grid.add(new RealCell(null), 2, 1);
     grid.add(new RealCell(null), 1, 1);
-    assertEquals(5, grid.getColumnCount());
-    assertEquals(5, grid.getRowCount());
-    assertEquals(""
+    Assert.assertEquals(5, grid.getColumnCount());
+    Assert.assertEquals(5, grid.getRowCount());
+    Assert.assertEquals(""
         + "┏━┳━┳━┳━┯━┓\n"
         + "┃█┃█┃█┃█│➞┃\n"
         + "┠─╂─╊━╇━┿━┫\n"

Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/math/EquationManagerUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/math/EquationManagerUnitTest.java?rev=788698&r1=788697&r2=788698&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/math/EquationManagerUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/math/EquationManagerUnitTest.java Fri Jun 26 13:36:13 2009
@@ -1,11 +1,5 @@
 package org.apache.myfaces.tobago.layout.math;
 
-import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.util.Arrays;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -23,10 +17,17 @@
  * limitations under the License.
  */
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Arrays;
+
 /**
  * Manages the relation between the Tree of LayoutManagers and the Linear System of Equations
  */
-public class EquationManagerUnitTest extends TestCase {
+public class EquationManagerUnitTest {
 
   private static final Log LOG = LogFactory.getLog(EquationManagerUnitTest.class);
 
@@ -241,6 +242,7 @@
    x<sub>26</sub> = 180<br/>
    x<sub>27</sub> = 450<br/>
    */
+  @Test
   public void test() {
     EquationManager equationManager = new EquationManager();
 
@@ -250,54 +252,54 @@
     // create
 
     index = equationManager.addComponentRoot();
-    assertEquals(0, index);
+    Assert.assertEquals(0, index);
     equationManager.setFixedLength(index, 630);        // the first (current) index has a fix size of 600
     indices = equationManager.divide(index, 4);                     // this index is divided into 4 parts
-    AssertUtils.assertEquals(new int[]{1, 2, 3, 4}, indices);
+    Assert.assertArrayEquals(new int[]{1, 2, 3, 4}, indices);
     equationManager.setProportion(indices[2], indices[3], 1, 2);     // the value on index 2 has factor 1,
     //                                                the value on position 3 has factor 2
     {
       equationManager.setFixedLength(indices[0], 100);        // the first one has a fix size of 100
       index = equationManager.addComponent(indices[0], 1);
-      assertEquals(5, index);
+      Assert.assertEquals(5, index);
     }
     {
       equationManager.setFixedLength(indices[1], 200);        // the second one has a fix size of 200
       index = equationManager.addComponent(indices[1], 1);
-      assertEquals(6, index);
+      Assert.assertEquals(6, index);
 
       index = equationManager.addComponent(indices[1], 1);
-      assertEquals(7, index);
+      Assert.assertEquals(7, index);
       int[] i7 = equationManager.divide(7, 2);
-      AssertUtils.assertEquals(new int[]{8, 9}, i7);
+      Assert.assertArrayEquals(new int[]{8, 9}, i7);
       equationManager.setProportion(i7[0], i7[1], 1, 2);
 
       index = equationManager.addComponent(indices[1], 1);
-      assertEquals(10, index);
+      Assert.assertEquals(10, index);
       int[] i10 = equationManager.divide(10, 2);
-      AssertUtils.assertEquals(new int[]{11, 12}, i10);
+      Assert.assertArrayEquals(new int[]{11, 12}, i10);
       equationManager.setProportion(i10[0], i10[1], 4, 1);
     }
     {
       index = equationManager.addComponent(indices[2], 1);
-      assertEquals(13, index);
+      Assert.assertEquals(13, index);
     }
     {
       index = equationManager.addComponent(indices[3], 1);
-      assertEquals(14, index);
+      Assert.assertEquals(14, index);
       int[] i14 = equationManager.divide(14, 2);
-      AssertUtils.assertEquals(new int[]{15, 16}, i14);
+      Assert.assertArrayEquals(new int[]{15, 16}, i14);
       equationManager.setFixedLength(i14[0], 130);        // the second one has a fix size of 200
     }
     {
       int iSpan2 = equationManager.addComponent(indices[2], 2);
-      assertEquals(17, iSpan2);
+      Assert.assertEquals(17, iSpan2);
     }
     {
       int iSpan4 = equationManager.addComponent(indices[0], 4);
-      assertEquals(18, iSpan4);
+      Assert.assertEquals(18, iSpan4);
       int[] i18 = equationManager.divide(18, 6);
-      AssertUtils.assertEquals(new int[]{19, 20, 21, 22, 23, 24}, i18);
+      Assert.assertArrayEquals(new int[]{19, 20, 21, 22, 23, 24}, i18);
       equationManager.setProportion(i18[0], i18[1], 1, 2);
       equationManager.setProportion(i18[0], i18[2], 1, 3);
       equationManager.setProportion(i18[0], i18[3], 1, 4);
@@ -306,11 +308,11 @@
     }
     {
       int i19_1 = equationManager.addComponent(19, 6);
-      assertEquals(25, i19_1);
+      Assert.assertEquals(25, i19_1);
       int i19_2 = equationManager.addComponent(19, 3);
-      assertEquals(26, i19_2);
+      Assert.assertEquals(26, i19_2);
       int i22 = equationManager.addComponent(22, 3);
-      assertEquals(27, i22);
+      Assert.assertEquals(27, i22);
     }
 
     LOG.info("tree: " + equationManager.toString());
@@ -320,7 +322,7 @@
     equationManager.solve();
     double[] result = equationManager.getResult();
     LOG.info("result: " + Arrays.toString(result));
-    AssertUtils.assertEquals(new double[]{
+    Assert.assertArrayEquals(new double[]{
        630,        // x_0
        100,        // x_1
        200,        // x_2

Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/math/SystemOfEquationsUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/math/SystemOfEquationsUnitTest.java?rev=788698&r1=788697&r2=788698&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/math/SystemOfEquationsUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/layout/math/SystemOfEquationsUnitTest.java Fri Jun 26 13:36:13 2009
@@ -17,17 +17,19 @@
  * limitations under the License.
  */
 
-import junit.framework.TestCase;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.junit.Assert;
+import org.junit.Test;
 
 import java.text.DecimalFormat;
 import java.util.Arrays;
 
-public class SystemOfEquationsUnitTest extends TestCase {
+public class SystemOfEquationsUnitTest {
 
   private static final Log LOG = LogFactory.getLog(SystemOfEquationsUnitTest.class);
 
+  @Test
   public void test2To3() {
 
     long begin = System.nanoTime();
@@ -46,9 +48,10 @@
     LOG.info("result: " + Arrays.toString(result));
     LOG.info("Duration: " + new DecimalFormat().format(end - begin) + " ns");
 
-    AssertUtils.assertEquals(new double[]{1000, 400, 600}, result, SystemOfEquations.EPSILON);
+    Assert.assertArrayEquals(new double[]{1000, 400, 600}, result, SystemOfEquations.EPSILON);
   }
 
+  @Test
   public void test1To2To3To4() {
 
     long begin = System.nanoTime();
@@ -69,9 +72,10 @@
     LOG.info("result: " + Arrays.toString(result));
     LOG.info("Duration: " + new DecimalFormat().format(end - begin) + " ns");
 
-    AssertUtils.assertEquals(new double[]{1000, 100, 200, 300, 400}, result, SystemOfEquations.EPSILON);
+    Assert.assertArrayEquals(new double[]{1000, 100, 200, 300, 400}, result, SystemOfEquations.EPSILON);
   }
 
+  @Test
   public void test1To2To3To4To5To6To7To8To9To10() {
 
     long begin = System.nanoTime();
@@ -99,9 +103,10 @@
     LOG.info("result: " + Arrays.toString(result));
     LOG.info("Duration: " + new DecimalFormat().format(end - begin) + " ns");
 
-    AssertUtils.assertEquals(new double[]{1100, 20, 40, 60, 80, 100, 120, 140, 160, 180, 200}, result, SystemOfEquations.EPSILON);
+    Assert.assertArrayEquals(new double[]{1100, 20, 40, 60, 80, 100, 120, 140, 160, 180, 200}, result, SystemOfEquations.EPSILON);
   }
 
+  @Test
   public void test1To___To100() {
 
     long begin = System.nanoTime();
@@ -130,7 +135,7 @@
     for (int i = 0; i < n; i++) {
       expected[i + 1] = i + 1;
     }
-    AssertUtils.assertEquals(expected, result, SystemOfEquations.EPSILON);
+    Assert.assertArrayEquals(expected, result, SystemOfEquations.EPSILON);
   }
 
   /**
@@ -140,6 +145,7 @@
    * |           |   *   |   *   |   *   |
    * </pre>
    */
+  @Test
   public void testSubPartition() {
 
     long begin = System.nanoTime();
@@ -162,17 +168,18 @@
     LOG.info("result: " + Arrays.toString(result));
     LOG.info("Duration: " + new DecimalFormat().format(end - begin) + " ns");
 
-    AssertUtils.assertEquals(new double[]{900, 300, 300, 300, 200, 200, 200}, result, SystemOfEquations.EPSILON);
+    Assert.assertArrayEquals(new double[]{900, 300, 300, 300, 200, 200, 200}, result, SystemOfEquations.EPSILON);
   }
 
+  @Test
   public void testAddVariables() {
 
     SystemOfEquations equations = new SystemOfEquations(0);
-    assertEquals(0, equations.getNumberOfVariables());
+    Assert.assertEquals(0, equations.getNumberOfVariables());
     equations.addVariables(1);
-    assertEquals(1, equations.getNumberOfVariables());
+    Assert.assertEquals(1, equations.getNumberOfVariables());
     equations.addVariables(4);
-    assertEquals(5, equations.getNumberOfVariables());
+    Assert.assertEquals(5, equations.getNumberOfVariables());
   }
 
   /**
@@ -182,6 +189,7 @@
    * |           |   *   |   *   |   *   |
    * </pre>
    */
+  @Test
   public void testTooManyVariables() {
 
     long begin = System.nanoTime();
@@ -204,7 +212,7 @@
     LOG.info("result: " + Arrays.toString(result));
     LOG.info("Duration: " + new DecimalFormat().format(end - begin) + " ns");
 
-    AssertUtils.assertEquals(new double[]{450, 150, 150, 150, 100, 100, 100}, result, SystemOfEquations.EPSILON);
+    Assert.assertArrayEquals(new double[]{450, 150, 150, 150, 100, 100, 100}, result, SystemOfEquations.EPSILON);
   }
 
   /**
@@ -213,6 +221,7 @@
    * |     50px     |     50px     |
    * </pre>
    */
+  @Test
   public void testTooManyEquations() {
 
     long begin = System.nanoTime();
@@ -234,7 +243,7 @@
     LOG.info("result: " + Arrays.toString(result));
     LOG.info("Duration: " + new DecimalFormat().format(end - begin) + " ns");
 
-    AssertUtils.assertEquals(new double[]{100, 50, 50, 50}, result, SystemOfEquations.EPSILON);
+    Assert.assertArrayEquals(new double[]{100, 50, 50, 50}, result, SystemOfEquations.EPSILON);
   }
 
   /**
@@ -244,6 +253,7 @@
    * |   100px   |     *     |
    * </pre>
    */
+  @Test
   public void testTwoSubs() {
 
     long begin = System.nanoTime();
@@ -266,7 +276,7 @@
     LOG.info("result: " + Arrays.toString(result));
     LOG.info("Duration: " + new DecimalFormat().format(end - begin) + " ns");
 
-    AssertUtils.assertEquals(new double[]{450, 150, 150, 150, 100, 100, 100}, result, SystemOfEquations.EPSILON);
+    Assert.assertArrayEquals(new double[]{450, 150, 150, 150, 100, 100, 100}, result, SystemOfEquations.EPSILON);
   }