dion 2004/09/07 22:31:14
Modified: jelly/jelly-tags/sql/src/test/org/apache/commons/jelly/tags/sql
example3.jelly testSql.jelly suite.jelly
example2.jelly
Log:
detab
Revision Changes Path
1.3 +6 -6 jakarta-commons/jelly/jelly-tags/sql/src/test/org/apache/commons/jelly/tags/sql/example3.jelly
Index: example3.jelly
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/test/org/apache/commons/jelly/tags/sql/example3.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- example3.jelly 1 Mar 2004 12:35:18 -0000 1.2
+++ example3.jelly 8 Sep 2004 05:31:14 -0000 1.3
@@ -34,12 +34,12 @@
drop table ${databaseTable}
</sql:update>
</j:catch>
-
+
<sql:update>
- create table ${databaseTable} (
- id integer,
- name varchar(255)
- )
+ create table ${databaseTable} (
+ id integer,
+ name varchar(255)
+ )
</sql:update>
@@ -53,7 +53,7 @@
</sql:update>
</j:forEach>
-
+
<log:info>Now performing a query...</log:info>
<sql:query var="results">
1.3 +1 -1 jakarta-commons/jelly/jelly-tags/sql/src/test/org/apache/commons/jelly/tags/sql/testSql.jelly
Index: testSql.jelly
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/test/org/apache/commons/jelly/tags/sql/testSql.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- testSql.jelly 1 Mar 2004 12:35:18 -0000 1.2
+++ testSql.jelly 8 Sep 2004 05:31:14 -0000 1.3
@@ -17,7 +17,7 @@
<j:jelly xmlns:j="jelly:core" xmlns:sql="jelly:sql">
<sql:setDataSource
- var="db"
+ var="db"
url="${databaseUrl}"
driver="${databaseDriver}"
user="${databaseUser}"
1.3 +17 -17 jakarta-commons/jelly/jelly-tags/sql/src/test/org/apache/commons/jelly/tags/sql/suite.jelly
Index: suite.jelly
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/test/org/apache/commons/jelly/tags/sql/suite.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- suite.jelly 1 Mar 2004 12:35:18 -0000 1.2
+++ suite.jelly 8 Sep 2004 05:31:14 -0000 1.3
@@ -16,23 +16,23 @@
-->
<test:suite xmlns:j="jelly:core" xmlns:test="jelly:junit" xmlns:sql="jelly:sql">
- <test:case name="testResultSet">
-
- <sql:resultSet var="results">
- <sql:row id="abc" name="James"/>
- <sql:row id="def" name="Joe"/>
- </sql:resultSet>
-
- <test:assert test="${results != null}">created a results object</test:assert>
-
- <test:assert test="${results.rowCount == 2}">contains 2 rows</test:assert>
+ <test:case name="testResultSet">
+
+ <sql:resultSet var="results">
+ <sql:row id="abc" name="James"/>
+ <sql:row id="def" name="Joe"/>
+ </sql:resultSet>
+
+ <test:assert test="${results != null}">created a results object</test:assert>
+
+ <test:assert test="${results.rowCount == 2}">contains 2 rows</test:assert>
- <test:assertEquals expected="abc" actual="${results.rows[0].id}"/>
- <test:assertEquals expected="def" actual="${results.rows[1].id}"/>
-
- <test:assertEquals expected="James" actual="${results.rows[0].name}"/>
- <test:assertEquals expected="Joe" actual="${results.rows[1].name}"/>
-
- </test:case>
+ <test:assertEquals expected="abc" actual="${results.rows[0].id}"/>
+ <test:assertEquals expected="def" actual="${results.rows[1].id}"/>
+
+ <test:assertEquals expected="James" actual="${results.rows[0].name}"/>
+ <test:assertEquals expected="Joe" actual="${results.rows[1].name}"/>
+
+ </test:case>
</test:suite>
1.3 +1 -1 jakarta-commons/jelly/jelly-tags/sql/src/test/org/apache/commons/jelly/tags/sql/example2.jelly
Index: example2.jelly
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/test/org/apache/commons/jelly/tags/sql/example2.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- example2.jelly 1 Mar 2004 12:35:18 -0000 1.2
+++ example2.jelly 8 Sep 2004 05:31:14 -0000 1.3
@@ -18,7 +18,7 @@
<j:jelly xmlns:j="jelly:core" xmlns:sql="jelly:sql">
<sql:setDataSource
- var="db"
+ var="db"
url="${databaseUrl}"
driver="${databaseDriver}"
user="${databaseUser}"
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
|