Last commit before renaming.

This commit is contained in:
Christian P. MOMON 2013-06-21 02:55:52 +02:00
parent 798c755293
commit b59663a45f
4 changed files with 216 additions and 196 deletions

View file

@ -7,5 +7,6 @@
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"/> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/> <classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
<classpathentry kind="lib" path="lib/servlet-api.jar"/>
<classpathentry kind="output" path="build/classes"/> <classpathentry kind="output" path="build/classes"/>
</classpath> </classpath>

4
.gitignore vendored Normal file
View file

@ -0,0 +1,4 @@
/build
/dist
/build_demo
/build_test

View file

@ -26,7 +26,7 @@
<!-- ******* build ******* --> <!-- ******* build ******* -->
<target name="build_xid" depends="init"> <target name="build_xid" depends="init">
<javac srcdir="${src}" destdir="${build}/classes" debug="${debug}" deprecation="on"> <javac srcdir="${src}" destdir="${build}/classes" debug="${debug}" deprecation="on" includeantruntime="false">
<classpath> <classpath>
<fileset dir="lib" includes="**/*.jar"/> <fileset dir="lib" includes="**/*.jar"/>
</classpath> </classpath>
@ -37,15 +37,15 @@
<!-- ****** dist_xid ****** --> <!-- ****** dist_xid ****** -->
<target name="dist_xid" depends="build_xid"> <target name="dist_xid" depends="build_xid">
<jar update="no" jarfile="dist/xid.jar"> <jar update="no" jarfile="dist/xid.jar">
<fileset dir="build/classes" includes="xid/**.class" /> <fileset dir="build/classes" />
<fileset dir="resources" includes="**" /> <fileset dir="resources" />
</jar> </jar>
</target> </target>
<!-- ******* build_test ******* --> <!-- ******* build_test ******* -->
<target name="build_test" depends="dist_xid"> <target name="build_test" depends="dist_xid">
<javac srcdir="test" destdir="build_test/classes" debug="${debug}" deprecation="on"> <javac srcdir="test" destdir="build_test/classes" debug="${debug}" deprecation="on" includeantruntime="false">
<classpath> <classpath>
<fileset dir="lib" includes="**/*.jar"/> <fileset dir="lib" includes="**/*.jar"/>
<pathelement path="dist/xid.jar"/> <pathelement path="dist/xid.jar"/>
@ -57,8 +57,8 @@
<!-- ****** dist_test ****** --> <!-- ****** dist_test ****** -->
<target name="dist_test" depends="build_test"> <target name="dist_test" depends="build_test">
<jar update="no" jarfile="dist/test.jar"> <jar update="no" jarfile="dist/test.jar">
<fileset dir="build_tests/classes" includes="xid/tests/**.class" /> <fileset dir="build_test/classes" />
<fileset dir="resources" includes="**" /> <fileset dir="resources" />
</jar> </jar>
</target> </target>
@ -78,7 +78,7 @@
<!-- ******* build_demo ******* --> <!-- ******* build_demo ******* -->
<target name="build_demo" depends="dist_xid"> <target name="build_demo" depends="dist_xid">
<javac srcdir="demo" destdir="build_demo/classes" debug="${debug}" deprecation="on"> <javac srcdir="demo" destdir="build_demo/classes" debug="${debug}" deprecation="on" includeantruntime="false">
<classpath> <classpath>
<fileset dir="lib" includes="**/*.jar"/> <fileset dir="lib" includes="**/*.jar"/>
<pathelement path="dist/xid.jar"/> <pathelement path="dist/xid.jar"/>
@ -90,8 +90,8 @@
<!-- ****** dist_demo ****** --> <!-- ****** dist_demo ****** -->
<target name="dist_demo" depends="build_demo"> <target name="dist_demo" depends="build_demo">
<jar update="no" jarfile="dist/demo.jar"> <jar update="no" jarfile="dist/demo.jar">
<fileset dir="build_demo/classes" includes="**.class" /> <fileset dir="build_demo/classes" />
<fileset dir="resources" includes="**" /> <fileset dir="resources" />
</jar> </jar>
</target> </target>

View file

@ -2,14 +2,31 @@
* XidTest. * XidTest.
*/ */
import fr.devinsy.xid.Data;
import fr.devinsy.xid.*; import fr.devinsy.xid.IdData;
import fr.devinsy.xid.StringPresenter;
/** /**
* *
*/ */
class XidTest class XidTest
{ {
public enum MONTHS
{
JANUARY,
FEBRUARY,
MARCH,
APRIL,
MAY,
JUNE,
JULY,
AUGUST,
SEPTEMBER,
OCTOBER,
NOVEMBRE,
DECEMBRE
}
static static
{ {
// Initialize logger. // Initialize logger.
@ -17,15 +34,13 @@ class XidTest
org.apache.log4j.Logger log = null; org.apache.log4j.Logger log = null;
log = org.apache.log4j.Logger.getRootLogger(); log = org.apache.log4j.Logger.getRootLogger();
log = org.apache.log4j.Logger.getLogger (XidDemo.class); log = org.apache.log4j.Logger.getLogger(XidTest.class);
} }
/** /**
* *
*/ */
public static String check (String title, StringBuffer source, String model) public static String check(final String title, final StringBuffer source, final String model)
{ {
String result; String result;
@ -39,25 +54,20 @@ class XidTest
result = String.format("%-40s [ OK ] ", title); result = String.format("%-40s [ OK ] ", title);
} }
// //
return (result); return (result);
} };
public enum MONTHS {JANUARY, FEBRUARY, MARCH, APRIL, MAY, JUNE, JULY, AUGUST, SEPTEMBER, OCTOBER, NOVEMBRE, DECEMBRE};
/** /**
* *
*/ */
public static void main(String[] args) public static void main(final String[] args)
{ {
System.out.println("Automatic test action for Xid!"); System.out.println("Automatic test action for Xid!");
Data datas; Data datas;
IdData tag; IdData tag;
String htmlSource; String htmlSource;
StringBuffer html; StringBuffer html;
@ -77,7 +87,6 @@ class XidTest
System.out.println(check("only content change", html, "<div id=\"name\">Superman</div>")); System.out.println(check("only content change", html, "<div id=\"name\">Superman</div>"));
// Populate attributes of Test 03. // Populate attributes of Test 03.
System.out.println("----------------------------"); System.out.println("----------------------------");
datas = new Data(); datas = new Data();
@ -95,7 +104,8 @@ class XidTest
System.out.println(exception.getMessage()); System.out.println(exception.getMessage());
html = null; html = null;
} }
System.out.println (check ("content and attributes", html, "<div id=\"lastname\" style=\"background: blue;foreground: red;\" class=\"nameClass\">Spiderman</div>")); System.out.println(check("content and attributes", html,
"<div id=\"lastname\" style=\"background: blue;foreground: red;\" class=\"nameClass\">Spiderman</div>"));
// Populate attributes of Test 03. // Populate attributes of Test 03.
System.out.println("----------------------------"); System.out.println("----------------------------");
@ -149,97 +159,102 @@ class XidTest
html = null; html = null;
} }
System.out.println (check ("table 1 assertion 1", html, "<tr id=\"identity_0\"><td>noid</td><td id=\"nom_0\">Jemba</td><td id=\"prenom_0\">Epo</td></tr>")); System.out
System.out.println (check ("table 1 assertion 2", html, "<tr id=\"identity_1\"><td>noid</td><td id=\"nom_1\">Momon</td><td id=\"prenom_1\">Christian</td></tr>")); .println(check("table 1 assertion 1", html, "<tr id=\"identity_0\"><td>noid</td><td id=\"nom_0\">Jemba</td><td id=\"prenom_0\">Epo</td></tr>"));
System.out.println (check ("table 1 assertion 3", html, "<tr id=\"identity_2\"><td>noid</td><td id=\"nom_2\">Tronche</td><td id=\"prenom_2\">Christophe</td></tr>")); System.out.println(check("table 1 assertion 2", html,
"<tr id=\"identity_1\"><td>noid</td><td id=\"nom_1\">Momon</td><td id=\"prenom_1\">Christian</td></tr>"));
System.out.println(check("table 1 assertion 3", html,
"<tr id=\"identity_2\"><td>noid</td><td id=\"nom_2\">Tronche</td><td id=\"prenom_2\">Christophe</td></tr>"));
/* /*
// Populate attributes of Test 03. * // Populate attributes of Test 03. System.out.println
System.out.println ("----------------------------"); * ("----------------------------"); datas = new Data ();
datas = new Data (); * datas.setContent ("identity", 0, "nom", "Jemba"); datas.setContent
datas.setContent ("identity", 0, "nom", "Jemba"); * ("identity", 0, "prenom", "Epo"); datas.setContent ("identity", 1,
datas.setContent ("identity", 0, "prenom", "Epo"); * "nom", "Momon"); datas.setContent ("identity", 1, "prenom",
datas.setContent ("identity", 1, "nom", "Momon"); * "Christian"); datas.setContent ("identity", 2, "nom", "Tronche");
datas.setContent ("identity", 1, "prenom", "Christian"); * datas.setContent ("identity", 2, "prenom", "Christophe");
datas.setContent ("identity", 2, "nom", "Tronche"); * datas.setIterationStrategy ("identity",
datas.setContent ("identity", 2, "prenom", "Christophe"); * IdsDataByIndex.IterationStrategy.ONLY_FIRST_ROW);
datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_FIRST_ROW); * //datas.setIterationStrategy ("identity",
//datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITH_ID); * IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITH_ID);
//datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITHOUT_ID); * //datas.setIterationStrategy ("identity",
//datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ALL_ROWS); * IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITHOUT_ID);
* //datas.setIterationStrategy ("identity",
* IdsDataByIndex.IterationStrategy.ALL_ROWS);
errorMessage = new StringBuffer (); *
source = new StringBuffer (); *
source.append ("<table>\n"); * errorMessage = new StringBuffer (); source = new StringBuffer ();
source.append (" <tr id='identity'><td>noid</td><td id='nom'>un nom</td><td id='prenom'>un prenom</td></tr>\n"); * source.append ("<table>\n"); source.append (
source.append (" <tr id='identity2'><td>noid</td><td id='nom2'>un nom</td><td id='prenom2'>un prenom</td></tr>\n"); * " <tr id='identity'><td>noid</td><td id='nom'>un nom</td><td id='prenom'>un prenom</td></tr>\n"
source.append (" <tr><td>noid</td><td id='nom3'>un nom</td><td id='prenom3'>un prenom</td></tr>\n"); * ); source.append (
source.append ("</table>"); * " <tr id='identity2'><td>noid</td><td id='nom2'>un nom</td><td id='prenom2'>un prenom</td></tr>\n"
htmlSource = source.toString (); * ); source.append (
* " <tr><td>noid</td><td id='nom3'>un nom</td><td id='prenom3'>un prenom</td></tr>\n"
System.out.println ("datas = new Data ();"); * ); source.append ("</table>"); htmlSource = source.toString ();
System.out.println ("datas.setContent (\"identity\", 0, \"nom\", \"Jemba\");"); *
System.out.println ("datas.setContent (\"identity\", 0, \"prenom\", \"Epo\");"); * System.out.println ("datas = new Data ();"); System.out.println
System.out.println ("datas.setContent (\"identity\", 1, \"nom\", \"Momon\");"); * ("datas.setContent (\"identity\", 0, \"nom\", \"Jemba\");");
System.out.println ("datas.setContent (\"identity\", 1, \"prenom\", \"Christian\");"); * System.out.println
System.out.println ("datas.setContent (\"identity\", 2, \"nom\", \"Tronche\");"); * ("datas.setContent (\"identity\", 0, \"prenom\", \"Epo\");");
System.out.println ("datas.setContent (\"identity\", 2, \"prenom\", \"Christophe\");"); * System.out.println
* ("datas.setContent (\"identity\", 1, \"nom\", \"Momon\");");
System.out.println ("+"); * System.out.println
System.out.println (htmlSource); * ("datas.setContent (\"identity\", 1, \"prenom\", \"Christian\");");
System.out.println ("=>"); * System.out.println
* ("datas.setContent (\"identity\", 2, \"nom\", \"Tronche\");");
* System.out.println
datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_FIRST_ROW); * ("datas.setContent (\"identity\", 2, \"prenom\", \"Christophe\");");
System.out.println ("ONLY_FIRST_ROW:"); *
html = Presenter.doXid (htmlSource, datas, "", errorMessage); * System.out.println ("+"); System.out.println (htmlSource);
System.out.println (html); * System.out.println ("=>");
*
datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITH_ID); *
System.out.println ("ONLY_ROWS_WITH_ID:"); * datas.setIterationStrategy ("identity",
html = Presenter.doXid (htmlSource, datas, "", errorMessage); * IdsDataByIndex.IterationStrategy.ONLY_FIRST_ROW); System.out.println
System.out.println (html); * ("ONLY_FIRST_ROW:"); html = Presenter.doXid (htmlSource, datas, "",
* errorMessage); System.out.println (html);
datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITHOUT_ID); *
System.out.println ("ONLY_ROWS_WITHOUT_ID:"); * datas.setIterationStrategy ("identity",
html = Presenter.doXid (htmlSource, datas, "", errorMessage); * IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITH_ID);
System.out.println (html); * System.out.println ("ONLY_ROWS_WITH_ID:"); html = Presenter.doXid
* (htmlSource, datas, "", errorMessage); System.out.println (html);
datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ALL_ROWS); *
System.out.println ("ALL_ROWS:"); * datas.setIterationStrategy ("identity",
html = Presenter.doXid (htmlSource, datas, "", errorMessage); * IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITHOUT_ID);
System.out.println (html); * System.out.println ("ONLY_ROWS_WITHOUT_ID:"); html = Presenter.doXid
* (htmlSource, datas, "", errorMessage); System.out.println (html);
*
* datas.setIterationStrategy ("identity",
// Populate attributes of Test 03. * IdsDataByIndex.IterationStrategy.ALL_ROWS); System.out.println
System.out.println ("----------------------------"); * ("ALL_ROWS:"); html = Presenter.doXid (htmlSource, datas, "",
datas = new Data (); * errorMessage); System.out.println (html);
datas.setAttribute ("<div>", "class", "aDivClass"); *
datas.setAttribute ("<div>", "style", "background-color: #000000;"); *
datas.setAttribute ("number", "style", "background-color: #0000FF;"); *
* // Populate attributes of Test 03. System.out.println
errorMessage = new StringBuffer (); * ("----------------------------"); datas = new Data ();
source = new StringBuffer (); * datas.setAttribute ("<div>", "class", "aDivClass");
source.append ("<div>\n"); * datas.setAttribute ("<div>", "style", "background-color: #000000;");
source.append (" <h1>one</h1>\n"); * datas.setAttribute ("number", "style", "background-color: #0000FF;");
source.append ("</div>\n"); *
source.append ("<div id=\"number\">\n"); * errorMessage = new StringBuffer (); source = new StringBuffer ();
source.append (" <h1>three</h1>\n"); * source.append ("<div>\n"); source.append (" <h1>one</h1>\n");
source.append ("</div>"); * source.append ("</div>\n"); source.append ("<div id=\"number\">\n");
htmlSource = source.toString (); * source.append (" <h1>three</h1>\n"); source.append ("</div>");
html = Presenter.doXid (htmlSource, datas, "", errorMessage); * htmlSource = source.toString (); html = Presenter.doXid (htmlSource,
* datas, "", errorMessage);
System.out.println (htmlSource); *
System.out.println ("+"); * System.out.println (htmlSource); System.out.println ("+");
System.out.println ("datas = new Data ();"); * System.out.println ("datas = new Data ();"); System.out.println
System.out.println ("datas.setAttribute (\"<div>\", \"class\", \"aDivClass\");"); * ("datas.setAttribute (\"<div>\", \"class\", \"aDivClass\");");
System.out.println ("datas.setAttribute (\"<div>\", \"style\", \"background-color: #000000;\");"); * System.out.println (
System.out.println ("datas.setAttribute (\"number\", \"style\", \"background-color: #0000FF;\");"); * "datas.setAttribute (\"<div>\", \"style\", \"background-color: #000000;\");"
* ); System.out.println (
System.out.println ("=>"); * "datas.setAttribute (\"number\", \"style\", \"background-color: #0000FF;\");"
System.out.println (html); * );
*
* System.out.println ("=>"); System.out.println (html);
*/ */
} }
} }