cleaned up DataTablesAjaxSimple & DataTableAjaxSimpleTest

felixscheffer · felixscheffer · commit 00d9897b573d · 2013-07-13T17:03:26.000+02:00
diff --git a/src/test/java/org/got5/tapestry5/jquery/DataTableAjaxSimpleTest.java b/src/test/java/org/got5/tapestry5/jquery/DataTableAjaxSimpleTest.java
@@ -7,37 +7,6 @@
 
 public class DataTableAjaxSimpleTest extends SeleniumTestCase {
 
-    @Test
-    public void testHeaderOverride() {
-        this.open("/DataTablesAjaxSimple");
-
-        new Wait() {
-
-            @Override
-            public boolean until() {
-                return DataTableAjaxSimpleTest.this.getText("//table[@id='datatableAjax']/thead/tr/th[2]/div[@class='DataTables_sort_wrapper']")
-                                                   .contains("Header");
-            }
-        }.wait("The Header is wrong : "
-                   + this.getText("//table[@id='datatableAjax']/thead/tr/th[2]/div[@class='DataTables_sort_wrapper']"),
-               JQueryTestConstants.TIMEOUT);
-    }
-
-    @Test
-    public void testFooterOverride() {
-        this.open("/DataTablesAjaxSimple");
-
-        new Wait() {
-
-            @Override
-            public boolean until() {
-                return DataTableAjaxSimpleTest.this.getText("//table[@id='datatableAjax']/tfoot/tr/th[2]")
-                                                   .contains("Footer");
-            }
-        }.wait("The Footer is wrong : " + this.getText("//table[@id='datatableAjax']/tfoot/tr/th[2]"),
-               JQueryTestConstants.TIMEOUT);
-    }
-
     @Test
     public void testNumberRows5() {
         this.open("/DataTablesAjaxSimple");
diff --git a/src/test/java/org/got5/tapestry5/jquery/pages/DataTablesAjaxSimple.java b/src/test/java/org/got5/tapestry5/jquery/pages/DataTablesAjaxSimple.java
@@ -39,9 +39,6 @@ public class DataTablesAjaxSimple {
     @Property
     private Celebrity   current;
 
-    @Property
-    private int         index;
-
     public List<Celebrity> getAllCelebrities() {
         System.out.println("Getting all celebrities...");
         return this.dataSource.getAllCelebrities();
@@ -57,17 +54,6 @@ public void setCelebrity(Celebrity celebrity) {
 
     public JSONObject getOptions() {
 
-        return new JSONObject("bJQueryUI", "true"/*, "sDom", "TC<\"clear\">Rlfrtip"*/);
+        return new JSONObject("bJQueryUI", "true", "sDom", "TC<\"clear\">Rlfrtip");
     }
-
-    /**
-     * Event handler method called when datatable's search field is used
-     * Gives a chance to the user to filter data in lazy-loading mode (mode=true)
-     * */
-    //    @OnEvent(value = JQueryEventConstants.FILTER_DATA, component = "datatableAjax")
-    //    public void filterData() {
-    //        String val = this.request.getParameter(DataTableConstants.SEARCH);
-    //        this.dataSource.filter(val);
-    //    }
-
 }
diff --git a/src/test/resources/org/got5/tapestry5/jquery/pages/DataTablesAjaxSimple.tml b/src/test/resources/org/got5/tapestry5/jquery/pages/DataTablesAjaxSimple.tml
@@ -1,6 +1,6 @@
 <html t:type="layout" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
 
-	<table t:type="jquery/datatable" t:source="allCelebrities" rowsPerPage="5" exclude="id, biography, birthDateVerified" reorder="link,firstName,lastName,occupation,dateOfBirth" options="options"  t:mode="true" t:add="link" t:id="datatableAjax" id="datatableAjax">
+	<table t:type="jquery/datatable" t:source="allCelebrities" rowsPerPage="5" exclude="id, biography, birthDateVerified" reorder="link,firstName,lastName,occupation,dateOfBirth" options="options"  t:mode="true" t:row="current" t:add="link" t:id="datatableAjax" id="datatableAjax">
 
 		<p:firstNameHeader>Prénom Header</p:firstNameHeader>
 
