[displaytag-cvs] displaytag/src/test/java/org/displaytag/jsptests RequestUriTest.java,1.2,1.3 Partia
Brought to you by:
fgiust
Menu
▾
▴
[displaytag-cvs] displaytag/src/test/java/org/displaytag/jsptests RequestUriTest.java,1.2,1.3 PartialListSortFullTest.java,1.1,1.2 MediaSupportHtmlTest.java,1.2,1.3 ExternalSortTest.java,1.2,1.3 DataSourceMapAutoColumnTest.java,1.2,1.3 PartialListMissingSizeTest.java,1.1,1.2 DataSourceMapTest.java,1.2,1.3
|
From: fabrizio g. <fg...@us...> - 2005-10-16 20:35:00
|
Update of /cvsroot/displaytag/displaytag/src/test/java/org/displaytag/jsptests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18315/src/test/java/org/displaytag/jsptests Modified Files: RequestUriTest.java PartialListSortFullTest.java MediaSupportHtmlTest.java ExternalSortTest.java DataSourceMapAutoColumnTest.java PartialListMissingSizeTest.java DataSourceMapTest.java Log Message: committing DISPL-245 WYSIWYG Exports - from Jorge L. Barroso + some changes and fixes Index: ExternalSortTest.java =================================================================== RCS file: /cvsroot/displaytag/displaytag/src/test/java/org/displaytag/jsptests/ExternalSortTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExternalSortTest.java 17 Sep 2005 07:38:51 -0000 1.2 --- ExternalSortTest.java 16 Oct 2005 20:34:38 -0000 1.3 *************** *** 1,7 **** package org.displaytag.jsptests; import org.displaytag.test.DisplaytagCase; import org.displaytag.util.ParamEncoder; - import org.displaytag.tags.TableTagParameters; import com.meterware.httpunit.GetMethodWebRequest; --- 1,7 ---- package org.displaytag.jsptests; + import org.displaytag.tags.TableTagParameters; import org.displaytag.test.DisplaytagCase; import org.displaytag.util.ParamEncoder; import com.meterware.httpunit.GetMethodWebRequest; *************** *** 10,14 **** import com.meterware.httpunit.WebResponse; import com.meterware.httpunit.WebTable; - import junit.framework.TestCase; --- 10,13 ---- Index: DataSourceMapAutoColumnTest.java =================================================================== RCS file: /cvsroot/displaytag/displaytag/src/test/java/org/displaytag/jsptests/DataSourceMapAutoColumnTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DataSourceMapAutoColumnTest.java 17 Sep 2005 07:38:51 -0000 1.2 --- DataSourceMapAutoColumnTest.java 16 Oct 2005 20:34:38 -0000 1.3 *************** *** 51,59 **** assertEquals("Bad value in column header.", // ! StringUtils.capitalize(KnownValue.ANT), tables[0].getCellAsText(0, 0)); assertEquals("Bad value in column header.", // ! StringUtils.capitalize(KnownValue.BEE), tables[0].getCellAsText(0, 1)); assertEquals("Bad value in column header.", // ! "camel title", tables[0].getCellAsText(0, 2)); // localized text assertEquals("Bad value in column content.", KnownValue.ANT, tables[0].getCellAsText(1, 0)); --- 51,62 ---- assertEquals("Bad value in column header.", // ! StringUtils.capitalize(KnownValue.ANT), ! tables[0].getCellAsText(0, 0)); assertEquals("Bad value in column header.", // ! StringUtils.capitalize(KnownValue.BEE), ! tables[0].getCellAsText(0, 1)); assertEquals("Bad value in column header.", // ! "camel title", ! tables[0].getCellAsText(0, 2)); // localized text assertEquals("Bad value in column content.", KnownValue.ANT, tables[0].getCellAsText(1, 0)); Index: PartialListMissingSizeTest.java =================================================================== RCS file: /cvsroot/displaytag/displaytag/src/test/java/org/displaytag/jsptests/PartialListMissingSizeTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PartialListMissingSizeTest.java 13 Jul 2005 21:03:26 -0000 1.1 --- PartialListMissingSizeTest.java 16 Oct 2005 20:34:38 -0000 1.2 *************** *** 1,9 **** package org.displaytag.jsptests; import com.meterware.httpunit.GetMethodWebRequest; import com.meterware.httpunit.WebRequest; import com.meterware.httpunit.WebResponse; - import org.displaytag.test.DisplaytagCase; - import junit.framework.TestCase; --- 1,9 ---- package org.displaytag.jsptests; + import org.displaytag.test.DisplaytagCase; + import com.meterware.httpunit.GetMethodWebRequest; import com.meterware.httpunit.WebRequest; import com.meterware.httpunit.WebResponse; *************** *** 39,44 **** try { ! response = runner.getResponse(request); ! TestCase.fail("Should have thrown an exception, missing size attribute"); } catch (Throwable t) --- 39,44 ---- try { ! response = runner.getResponse(request); ! fail("Should have thrown an exception, missing size attribute"); } catch (Throwable t) Index: MediaSupportHtmlTest.java =================================================================== RCS file: /cvsroot/displaytag/displaytag/src/test/java/org/displaytag/jsptests/MediaSupportHtmlTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MediaSupportHtmlTest.java 17 Sep 2005 07:38:51 -0000 1.2 --- MediaSupportHtmlTest.java 16 Oct 2005 20:34:38 -0000 1.3 *************** *** 51,57 **** assertEquals("Bad value in column header.", // ! StringUtils.capitalize(KnownValue.ANT), tables[0].getCellAsText(0, 0)); assertEquals("Bad value in column header.", // ! StringUtils.capitalize(KnownValue.CAMEL), tables[0].getCellAsText(0, 1)); } --- 51,59 ---- assertEquals("Bad value in column header.", // ! StringUtils.capitalize(KnownValue.ANT), ! tables[0].getCellAsText(0, 0)); assertEquals("Bad value in column header.", // ! StringUtils.capitalize(KnownValue.CAMEL), ! tables[0].getCellAsText(0, 1)); } Index: PartialListSortFullTest.java =================================================================== RCS file: /cvsroot/displaytag/displaytag/src/test/java/org/displaytag/jsptests/PartialListSortFullTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PartialListSortFullTest.java 13 Jul 2005 21:03:26 -0000 1.1 --- PartialListSortFullTest.java 16 Oct 2005 20:34:38 -0000 1.2 *************** *** 1,9 **** package org.displaytag.jsptests; import com.meterware.httpunit.GetMethodWebRequest; import com.meterware.httpunit.WebRequest; import com.meterware.httpunit.WebResponse; - import org.displaytag.test.DisplaytagCase; - import junit.framework.TestCase; --- 1,9 ---- package org.displaytag.jsptests; + import org.displaytag.test.DisplaytagCase; + import com.meterware.httpunit.GetMethodWebRequest; import com.meterware.httpunit.WebRequest; import com.meterware.httpunit.WebResponse; *************** *** 39,44 **** try { ! response = runner.getResponse(request); ! TestCase.fail("Should have thrown an exception, its invalid to have sort=full when partialList=true"); } catch (Throwable t) --- 39,44 ---- try { ! response = runner.getResponse(request); ! fail("Should have thrown an exception, its invalid to have sort=full when partialList=true"); } catch (Throwable t) Index: DataSourceMapTest.java =================================================================== RCS file: /cvsroot/displaytag/displaytag/src/test/java/org/displaytag/jsptests/DataSourceMapTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DataSourceMapTest.java 17 Sep 2005 07:38:51 -0000 1.2 --- DataSourceMapTest.java 16 Oct 2005 20:34:38 -0000 1.3 *************** *** 51,59 **** assertEquals("Bad value in column header.", // ! StringUtils.capitalize(KnownValue.ANT), tables[0].getCellAsText(0, 0)); assertEquals("Bad value in column header.", // ! StringUtils.capitalize(KnownValue.BEE), tables[0].getCellAsText(0, 1)); assertEquals("Bad value in column header.", // ! StringUtils.capitalize(KnownValue.CAMEL), tables[0].getCellAsText(0, 2)); assertEquals("Bad value in column content.", KnownValue.ANT, tables[0].getCellAsText(1, 0)); --- 51,62 ---- assertEquals("Bad value in column header.", // ! StringUtils.capitalize(KnownValue.ANT), ! tables[0].getCellAsText(0, 0)); assertEquals("Bad value in column header.", // ! StringUtils.capitalize(KnownValue.BEE), ! tables[0].getCellAsText(0, 1)); assertEquals("Bad value in column header.", // ! StringUtils.capitalize(KnownValue.CAMEL), ! tables[0].getCellAsText(0, 2)); assertEquals("Bad value in column content.", KnownValue.ANT, tables[0].getCellAsText(1, 0)); Index: RequestUriTest.java =================================================================== RCS file: /cvsroot/displaytag/displaytag/src/test/java/org/displaytag/jsptests/RequestUriTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RequestUriTest.java 17 Sep 2005 07:38:51 -0000 1.2 --- RequestUriTest.java 16 Oct 2005 20:34:38 -0000 1.3 *************** *** 50,54 **** WebLink[] links = response.getLinks(); assertEquals("Wrong number of links in result.", MediaTypeEnum.getSize() - 1 // MediaTypeEnum also lists html ! , links.length); URLAssert.assertEquals(CONTEXT --- 50,55 ---- WebLink[] links = response.getLinks(); assertEquals("Wrong number of links in result.", MediaTypeEnum.getSize() - 1 // MediaTypeEnum also lists html ! , ! links.length); URLAssert.assertEquals(CONTEXT |
