demo and test update.
This commit is contained in:
parent
5db4b83fcf
commit
9f332f76f5
8 changed files with 6 additions and 260 deletions
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" path="src"/>
|
<classpathentry kind="src" path="src"/>
|
||||||
<classpathentry kind="src" path="tests"/>
|
<classpathentry kind="src" path="test"/>
|
||||||
<classpathentry kind="src" path="demo"/>
|
<classpathentry kind="src" path="demo"/>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_11"/>
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_11"/>
|
||||||
<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"/>
|
||||||
|
|
|
@ -57,7 +57,7 @@
|
||||||
<!-- ****** 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_test/classes" includes="xid/test/**.class" />
|
<fileset dir="build_tests/classes" includes="xid/tests/**.class" />
|
||||||
<fileset dir="resources" includes="**" />
|
<fileset dir="resources" includes="**" />
|
||||||
</jar>
|
</jar>
|
||||||
</target>
|
</target>
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -9,30 +9,13 @@ import fr.devinsy.xid.*;
|
||||||
*/
|
*/
|
||||||
class XidDemo
|
class XidDemo
|
||||||
{
|
{
|
||||||
static private org.apache.log4j.Logger logger;
|
|
||||||
|
|
||||||
static
|
static
|
||||||
{
|
{
|
||||||
// Initialize logger.
|
// Initialize logger.
|
||||||
org.apache.log4j.Logger log = null;
|
|
||||||
|
|
||||||
org.apache.log4j.BasicConfigurator.configure ();
|
org.apache.log4j.BasicConfigurator.configure ();
|
||||||
|
|
||||||
|
org.apache.log4j.Logger log = null;
|
||||||
log = org.apache.log4j.Logger.getRootLogger ();
|
log = org.apache.log4j.Logger.getRootLogger ();
|
||||||
//logger.setLevel (org.apache.log4j.Level.INFO);
|
|
||||||
logger.setLevel (org.apache.log4j.Level.INFO);
|
|
||||||
|
|
||||||
logger.info ("Enter");
|
|
||||||
|
|
||||||
//
|
|
||||||
logger.info ("Set the log file format...");
|
|
||||||
|
|
||||||
|
|
||||||
// log = org.apache.log4j.Category.getInstance(Application.class.getName());
|
|
||||||
logger.info ("... done.");
|
|
||||||
|
|
||||||
logger.debug ("Exit");
|
|
||||||
log = org.apache.log4j.Logger.getLogger (XidDemo.class);
|
log = org.apache.log4j.Logger.getLogger (XidDemo.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
3
rundemo
Executable file → Normal file
3
rundemo
Executable file → Normal file
|
@ -1 +1,2 @@
|
||||||
$JAVA_HOME/bin/java -classpath lib/activation.jar:lib/log4j-1.2.14.jar:lib/mail.jar:servlet-api.jar:dist/xid.jar:dist/demo.jar Demo
|
#$JAVA_HOME/bin/java -classpath lib/activation.jar:lib/log4j-1.2.14.jar:lib/mail.jar:servlet-api.jar:dist/xid.jar:dist/demo.jar XidDemo
|
||||||
|
$JAVA_HOME/bin/java -classpath lib/activation.jar:lib/log4j-1.2.14.jar:lib/mail.jar:servlet-api.jar:build/classes/ XidDemo
|
||||||
|
|
|
@ -1,238 +0,0 @@
|
||||||
/**
|
|
||||||
* XidTest.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
import fr.devinsy.xid.*;
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
class XidTest
|
|
||||||
{
|
|
||||||
static private org.apache.log4j.Logger logger;
|
|
||||||
|
|
||||||
static
|
|
||||||
{
|
|
||||||
// Initialize logger.
|
|
||||||
org.apache.log4j.Logger log = null;
|
|
||||||
|
|
||||||
org.apache.log4j.BasicConfigurator.configure ();
|
|
||||||
|
|
||||||
|
|
||||||
log = org.apache.log4j.Logger.getRootLogger ();
|
|
||||||
//logger.setLevel (org.apache.log4j.Level.INFO);
|
|
||||||
logger.setLevel (org.apache.log4j.Level.INFO);
|
|
||||||
|
|
||||||
logger.info ("Enter");
|
|
||||||
|
|
||||||
//
|
|
||||||
logger.info ("Set the log file format...");
|
|
||||||
|
|
||||||
|
|
||||||
// log = org.apache.log4j.Category.getInstance(Application.class.getName());
|
|
||||||
logger.info ("... done.");
|
|
||||||
|
|
||||||
logger.debug ("Exit");
|
|
||||||
log = org.apache.log4j.Logger.getLogger (XidTest.class.getName ());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public static String check (String title, StringBuffer source, String model)
|
|
||||||
{
|
|
||||||
String result;
|
|
||||||
|
|
||||||
if (source.indexOf (model) == -1)
|
|
||||||
{
|
|
||||||
result = String.format ("%-40s -> KO <-", title) + "\nGet:\n" + source + "\nWaiting:\n" + model;
|
|
||||||
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
result = String.format ("%-40s [ OK ] ", title);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//
|
|
||||||
return (result);
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum MONTHS {JANUARY, FEBRUARY, MARCH, APRIL, MAY, JUNE, JULY, AUGUST, SEPTEMBER, OCTOBER, NOVEMBRE, DECEMBRE};
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public static void main(String[] args)
|
|
||||||
{
|
|
||||||
System.out.println("Automatic test action for Xid!");
|
|
||||||
|
|
||||||
|
|
||||||
Data datas;
|
|
||||||
IdData tag;
|
|
||||||
|
|
||||||
|
|
||||||
String htmlSource;
|
|
||||||
StringBuffer html;
|
|
||||||
StringBuffer errorMessage;
|
|
||||||
|
|
||||||
// Populate attributes of Test 03.
|
|
||||||
System.out.println ("----------------------------");
|
|
||||||
datas = new Data ();
|
|
||||||
datas.setContent ("name", "Superman");
|
|
||||||
errorMessage = new StringBuffer ();
|
|
||||||
|
|
||||||
html = StringPresenter.doXid ("<div id='name'>a name</div >", datas, errorMessage);
|
|
||||||
|
|
||||||
System.out.println (check ("only content change", html, "<div id=\"name\">Superman</div>"));
|
|
||||||
|
|
||||||
|
|
||||||
// Populate attributes of Test 03.
|
|
||||||
System.out.println ("----------------------------");
|
|
||||||
datas = new Data ();
|
|
||||||
datas.setContent ("lastname", "Spiderman");
|
|
||||||
datas.appendAttribute ("lastname", "style", "background: blue;");
|
|
||||||
datas.appendAttribute ("lastname", "style", "foreground: red;");
|
|
||||||
datas.setAttribute ("lastname", "class", "nameClass");
|
|
||||||
|
|
||||||
errorMessage = new StringBuffer ();
|
|
||||||
html = StringPresenter.doXid ("<div id='lastname'>a last name</div >", datas, errorMessage);
|
|
||||||
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.
|
|
||||||
System.out.println ("----------------------------");
|
|
||||||
datas = new Data ();
|
|
||||||
datas.setContent ("words", 0, "alpha");
|
|
||||||
datas.setContent ("words", 1, "bravo");
|
|
||||||
datas.setContent ("words", 2, "charlie");
|
|
||||||
datas.setContent ("words", 3, "delta");
|
|
||||||
datas.setContent ("words", 4, "echo");
|
|
||||||
datas.setContent ("words", 5, "fox");
|
|
||||||
|
|
||||||
|
|
||||||
errorMessage = new StringBuffer ();
|
|
||||||
html = StringPresenter.doXid ("<ul>\n <li id='words'>a word</li>\n</ul>", datas, errorMessage);
|
|
||||||
|
|
||||||
System.out.println (check ("list assertion 1", html, "<li id=\"words_0\">alpha</li>"));
|
|
||||||
System.out.println (check ("list assertion 2", html, "<li id=\"words_1\">bravo</li>"));
|
|
||||||
System.out.println (check ("list assertion 3", html, "<li id=\"words_2\">charlie</li>"));
|
|
||||||
System.out.println (check ("list assertion 4", html, "<li id=\"words_3\">delta</li>"));
|
|
||||||
System.out.println (check ("list assertion 5", html, "<li id=\"words_4\">echo</li>"));
|
|
||||||
System.out.println (check ("list assertion 6", html, "<li id=\"words_5\">fox</li>"));
|
|
||||||
|
|
||||||
// Populate attributes of Test 03.
|
|
||||||
System.out.println ("----------------------------");
|
|
||||||
datas = new Data ();
|
|
||||||
datas.setContent ("identity", 0, "nom", "Jemba");
|
|
||||||
datas.setContent ("identity", 0, "prenom", "Epo");
|
|
||||||
datas.setContent ("identity", 1, "nom", "Momon");
|
|
||||||
datas.setContent ("identity", 1, "prenom", "Christian");
|
|
||||||
datas.setContent ("identity", 2, "nom", "Tronche");
|
|
||||||
datas.setContent ("identity", 2, "prenom", "Christophe");
|
|
||||||
|
|
||||||
|
|
||||||
errorMessage = new StringBuffer ();
|
|
||||||
StringBuffer source = new StringBuffer ();
|
|
||||||
source.append ("<table>\n");
|
|
||||||
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>");
|
|
||||||
htmlSource = source.toString ();
|
|
||||||
html = StringPresenter.doXid (htmlSource, datas, errorMessage);
|
|
||||||
|
|
||||||
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.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.
|
|
||||||
System.out.println ("----------------------------");
|
|
||||||
datas = new Data ();
|
|
||||||
datas.setContent ("identity", 0, "nom", "Jemba");
|
|
||||||
datas.setContent ("identity", 0, "prenom", "Epo");
|
|
||||||
datas.setContent ("identity", 1, "nom", "Momon");
|
|
||||||
datas.setContent ("identity", 1, "prenom", "Christian");
|
|
||||||
datas.setContent ("identity", 2, "nom", "Tronche");
|
|
||||||
datas.setContent ("identity", 2, "prenom", "Christophe");
|
|
||||||
datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_FIRST_ROW);
|
|
||||||
//datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITH_ID);
|
|
||||||
//datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITHOUT_ID);
|
|
||||||
//datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ALL_ROWS);
|
|
||||||
|
|
||||||
|
|
||||||
errorMessage = new StringBuffer ();
|
|
||||||
source = new StringBuffer ();
|
|
||||||
source.append ("<table>\n");
|
|
||||||
source.append (" <tr id='identity'><td>noid</td><td id='nom'>un nom</td><td id='prenom'>un prenom</td></tr>\n");
|
|
||||||
source.append (" <tr id='identity2'><td>noid</td><td id='nom2'>un nom</td><td id='prenom2'>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 ("</table>");
|
|
||||||
htmlSource = source.toString ();
|
|
||||||
|
|
||||||
System.out.println ("datas = new Data ();");
|
|
||||||
System.out.println ("datas.setContent (\"identity\", 0, \"nom\", \"Jemba\");");
|
|
||||||
System.out.println ("datas.setContent (\"identity\", 0, \"prenom\", \"Epo\");");
|
|
||||||
System.out.println ("datas.setContent (\"identity\", 1, \"nom\", \"Momon\");");
|
|
||||||
System.out.println ("datas.setContent (\"identity\", 1, \"prenom\", \"Christian\");");
|
|
||||||
System.out.println ("datas.setContent (\"identity\", 2, \"nom\", \"Tronche\");");
|
|
||||||
System.out.println ("datas.setContent (\"identity\", 2, \"prenom\", \"Christophe\");");
|
|
||||||
|
|
||||||
System.out.println ("+");
|
|
||||||
System.out.println (htmlSource);
|
|
||||||
System.out.println ("=>");
|
|
||||||
|
|
||||||
|
|
||||||
datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_FIRST_ROW);
|
|
||||||
System.out.println ("ONLY_FIRST_ROW:");
|
|
||||||
html = Presenter.doXid (htmlSource, datas, "", errorMessage);
|
|
||||||
System.out.println (html);
|
|
||||||
|
|
||||||
datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITH_ID);
|
|
||||||
System.out.println ("ONLY_ROWS_WITH_ID:");
|
|
||||||
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:");
|
|
||||||
html = Presenter.doXid (htmlSource, datas, "", errorMessage);
|
|
||||||
System.out.println (html);
|
|
||||||
|
|
||||||
datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ALL_ROWS);
|
|
||||||
System.out.println ("ALL_ROWS:");
|
|
||||||
html = Presenter.doXid (htmlSource, datas, "", errorMessage);
|
|
||||||
System.out.println (html);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Populate attributes of Test 03.
|
|
||||||
System.out.println ("----------------------------");
|
|
||||||
datas = new Data ();
|
|
||||||
datas.setAttribute ("<div>", "class", "aDivClass");
|
|
||||||
datas.setAttribute ("<div>", "style", "background-color: #000000;");
|
|
||||||
datas.setAttribute ("number", "style", "background-color: #0000FF;");
|
|
||||||
|
|
||||||
errorMessage = new StringBuffer ();
|
|
||||||
source = new StringBuffer ();
|
|
||||||
source.append ("<div>\n");
|
|
||||||
source.append (" <h1>one</h1>\n");
|
|
||||||
source.append ("</div>\n");
|
|
||||||
source.append ("<div id=\"number\">\n");
|
|
||||||
source.append (" <h1>three</h1>\n");
|
|
||||||
source.append ("</div>");
|
|
||||||
htmlSource = source.toString ();
|
|
||||||
html = Presenter.doXid (htmlSource, datas, "", errorMessage);
|
|
||||||
|
|
||||||
System.out.println (htmlSource);
|
|
||||||
System.out.println ("+");
|
|
||||||
System.out.println ("datas = new Data ();");
|
|
||||||
System.out.println ("datas.setAttribute (\"<div>\", \"class\", \"aDivClass\");");
|
|
||||||
System.out.println ("datas.setAttribute (\"<div>\", \"style\", \"background-color: #000000;\");");
|
|
||||||
System.out.println ("datas.setAttribute (\"number\", \"style\", \"background-color: #0000FF;\");");
|
|
||||||
|
|
||||||
System.out.println ("=>");
|
|
||||||
System.out.println (html);
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in a new issue