stephenh 2002/09/12 19:43:09
Modified: src/test/org/apache/torque/util CriteriaTest.java
src/test/org/apache/torque/om NumberKeyTest.java
src/test/org/apache/torque/engine/database/model
NameFactoryTest.java
src/test/org/apache/torque BaseTestCase.java
Log:
Checkstyle fixes.
Revision Changes Path
1.11 +87 -77
jakarta-turbine-torque/src/test/org/apache/torque/util/CriteriaTest.java
Index: CriteriaTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/test/org/apache/torque/util/CriteriaTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CriteriaTest.java 13 Sep 2002 02:25:03 -0000 1.10
+++ CriteriaTest.java 13 Sep 2002 02:43:08 -0000 1.11
@@ -54,16 +54,10 @@
* <http://www.apache.org/>.
*/
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
+import org.apache.commons.configuration.BaseConfiguration;
+import org.apache.commons.configuration.Configuration;
import org.apache.torque.BaseTestCase;
import org.apache.torque.TorqueException;
-import org.apache.torque.util.BasePeer;
-import org.apache.torque.util.Criteria;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.BaseConfiguration;
import org.apache.torque.adapter.DBFactory;
/**
@@ -75,27 +69,29 @@
*/
public class CriteriaTest extends BaseTestCase
{
+
+ /** The criteria to use in the test. */
private Criteria c;
/**
* Creates a new instance.
+ *
+ * @param name the name of the test to run
*/
public CriteriaTest(String name)
{
super(name);
}
+ /**
+ * Initializes the criteria.
+ */
public void setUp()
{
super.setUp();
c = new Criteria();
}
- public void tearDown()
- {
- c = null;
- }
-
/**
* Test basic adding of strings.
*/
@@ -106,7 +102,7 @@
final String value = "myValue";
// Add the string
- c.add(table, column, (Object)value);
+ c.add(table, column, (Object) value);
// Verify that the key exists
assertTrue(c.containsKey(table, column));
@@ -123,81 +119,95 @@
final String table2 = "myTable2";
final String column2 = "myColumn2";
final String value2 = "myValue2";
-
+
final String table3 = "myTable3";
final String column3 = "myColumn3";
final String value3 = "myValue3";
-
+
final String table4 = "myTable4";
final String column4 = "myColumn4";
final String value4 = "myValue4";
-
+
final String table5 = "myTable5";
final String column5 = "myColumn5";
final String value5 = "myValue5";
Criteria.Criterion crit2 =
- c.getNewCriterion(table2,column2,(Object)value2,Criteria.EQUAL);
+ c.getNewCriterion(table2, column2, (Object) value2, Criteria.EQUAL);
Criteria.Criterion crit3 =
- c.getNewCriterion(table3,column3,(Object)value3,Criteria.EQUAL);
+ c.getNewCriterion(table3, column3, (Object) value3, Criteria.EQUAL);
Criteria.Criterion crit4 =
- c.getNewCriterion(table4,column4,(Object)value4,Criteria.EQUAL);
+ c.getNewCriterion(table4, column4, (Object) value4, Criteria.EQUAL);
Criteria.Criterion crit5 =
- c.getNewCriterion(table5,column5,(Object)value5,Criteria.EQUAL);
-
-
+ c.getNewCriterion(table5, column5, (Object) value5, Criteria.EQUAL);
+
crit2.and(crit3).or(crit4.and(crit5));
- String expect = "((myTable2.myColumn2='myValue2' AND
myTable3.myColumn3='myValue3') OR (myTable4.myColumn4='myValue4' AND
myTable5.myColumn5='myValue5'))";
+ String expect =
+ "((myTable2.myColumn2='myValue2' "
+ + "AND myTable3.myColumn3='myValue3') "
+ + "OR (myTable4.myColumn4='myValue4' "
+ + "AND myTable5.myColumn5='myValue5'))";
String result = crit2.toString();
- assertEquals(expect,result);
-
+ assertEquals(expect, result);
+
Criteria.Criterion crit6 =
- c.getNewCriterion(table2,column2,(Object)value2,Criteria.EQUAL);
+ c.getNewCriterion(table2, column2, (Object) value2, Criteria.EQUAL);
Criteria.Criterion crit7 =
- c.getNewCriterion(table3,column3,(Object)value3,Criteria.EQUAL);
+ c.getNewCriterion(table3, column3, (Object) value3, Criteria.EQUAL);
Criteria.Criterion crit8 =
- c.getNewCriterion(table4,column4,(Object)value4,Criteria.EQUAL);
+ c.getNewCriterion(table4, column4, (Object) value4, Criteria.EQUAL);
Criteria.Criterion crit9 =
- c.getNewCriterion(table5,column5,(Object)value5,Criteria.EQUAL);
+ c.getNewCriterion(table5, column5, (Object) value5, Criteria.EQUAL);
-
crit6.and(crit7).or(crit8).and(crit9);
- expect = "(((myTable2.myColumn2='myValue2' AND
myTable3.myColumn3='myValue3') OR myTable4.myColumn4='myValue4') AND
myTable5.myColumn5='myValue5')";
+ expect =
+ "(((myTable2.myColumn2='myValue2' "
+ + "AND myTable3.myColumn3='myValue3') "
+ + "OR myTable4.myColumn4='myValue4') "
+ + "AND myTable5.myColumn5='myValue5')";
result = crit6.toString();
- assertEquals(expect,result);
-
+ assertEquals(expect, result);
// should make sure we have tests for all possibilities
-
+
Criteria.Criterion[] crita = crit2.getAttachedCriterion();
-
- assertEquals(crit2,crita[0]);
- assertEquals(crit3,crita[1]);
- assertEquals(crit4,crita[2]);
- assertEquals(crit5,crita[3]);
-
+
+ assertEquals(crit2, crita[0]);
+ assertEquals(crit3, crita[1]);
+ assertEquals(crit4, crita[2]);
+ assertEquals(crit5, crita[3]);
+
String[] tables = crit2.getAllTables();
-
- assertEquals(crit2.getTable(),tables[0]);
- assertEquals(crit3.getTable(),tables[1]);
- assertEquals(crit4.getTable(),tables[2]);
- assertEquals(crit5.getTable(),tables[3]);
-
+
+ assertEquals(crit2.getTable(), tables[0]);
+ assertEquals(crit3.getTable(), tables[1]);
+ assertEquals(crit4.getTable(), tables[2]);
+ assertEquals(crit5.getTable(), tables[3]);
+
// simple confirmations that equality operations work
assertTrue(crit2.hashCode() == crit2.hashCode());
- assertEquals(crit2.toString(),crit2.toString());
+ assertEquals(crit2.toString(), crit2.toString());
}
+ /**
+ * Tests <= and =>.
+ */
public void testBetweenCriterion()
{
- Criteria.Criterion cn1 = c.getNewCriterion("INVOICE.COST",
- new Integer(1000),
- Criteria.GREATER_EQUAL);
- Criteria.Criterion cn2 = c.getNewCriterion("INVOICE.COST",
- new Integer(5000),
- Criteria.LESS_EQUAL);
+ Criteria.Criterion cn1 =
+ c.getNewCriterion(
+ "INVOICE.COST",
+ new Integer(1000),
+ Criteria.GREATER_EQUAL);
+ Criteria.Criterion cn2 =
+ c.getNewCriterion(
+ "INVOICE.COST",
+ new Integer(5000),
+ Criteria.LESS_EQUAL);
c.add(cn1.and(cn2));
- String expect = "SELECT FROM INVOICE WHERE (INVOICE.COST>=1000 AND
INVOICE.COST<=5000)";
+ String expect =
+ "SELECT FROM INVOICE WHERE "
+ + "(INVOICE.COST>=1000 AND INVOICE.COST<=5000)";
String result = null;
try
{
@@ -208,7 +218,7 @@
fail("TorqueException thrown in BasePeer.createQueryString()");
}
- assertEquals(expect,result);
+ assertEquals(expect, result);
}
/**
@@ -216,22 +226,21 @@
*/
public void testPrecedence()
{
- Criteria.Criterion cn1 = c.getNewCriterion("INVOICE.COST",
- "1000",
- Criteria.GREATER_EQUAL);
- Criteria.Criterion cn2 = c.getNewCriterion("INVOICE.COST",
- "2000",
- Criteria.LESS_EQUAL);
- Criteria.Criterion cn3 = c.getNewCriterion("INVOICE.COST",
- "8000",
- Criteria.GREATER_EQUAL);
- Criteria.Criterion cn4 = c.getNewCriterion("INVOICE.COST",
- "9000",
- Criteria.LESS_EQUAL);
+ Criteria.Criterion cn1 =
+ c.getNewCriterion("INVOICE.COST", "1000", Criteria.GREATER_EQUAL);
+ Criteria.Criterion cn2 =
+ c.getNewCriterion("INVOICE.COST", "2000", Criteria.LESS_EQUAL);
+ Criteria.Criterion cn3 =
+ c.getNewCriterion("INVOICE.COST", "8000", Criteria.GREATER_EQUAL);
+ Criteria.Criterion cn4 =
+ c.getNewCriterion("INVOICE.COST", "9000", Criteria.LESS_EQUAL);
c.add(cn1.and(cn2));
c.or(cn3.and(cn4));
- String expect = "SELECT FROM INVOICE WHERE ((INVOICE.COST>='1000' AND
INVOICE.COST<='2000') OR (INVOICE.COST>='8000' AND INVOICE.COST<='9000'))";
+ String expect =
+ "SELECT FROM INVOICE WHERE "
+ + "((INVOICE.COST>='1000' AND INVOICE.COST<='2000') "
+ + "OR (INVOICE.COST>='8000' AND INVOICE.COST<='9000'))";
String result = null;
try
@@ -243,14 +252,16 @@
fail("TorqueException thrown in BasePeer.createQueryString()");
}
- assertEquals(expect,result);
+ assertEquals(expect, result);
}
+ /**
+ * Test that true is evaluated correctly.
+ */
public void testBoolean()
{
- Criteria c = new Criteria()
- .add("TABLE.COLUMN", true);
-
+ Criteria c = new Criteria().add("TABLE.COLUMN", true);
+
String expect = "SELECT FROM TABLE WHERE TABLE.COLUMN=1";
String result = null;
@@ -263,11 +274,11 @@
fail("TorqueException thrown in BasePeer.createQueryString()");
}
- assertEquals(expect,result);
+ assertEquals(expect, result);
// test the postgresql variation
c = new Criteria();
- Criteria.Criterion cc =
+ Criteria.Criterion cc =
c.getNewCriterion("TABLE.COLUMN", Boolean.TRUE, Criteria.EQUAL);
Configuration conf = new BaseConfiguration();
@@ -284,4 +295,3 @@
assertEquals("TABLE.COLUMN=1", cc.toString());
}
}
-
1.3 +20 -1
jakarta-turbine-torque/src/test/org/apache/torque/om/NumberKeyTest.java
Index: NumberKeyTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/test/org/apache/torque/om/NumberKeyTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NumberKeyTest.java 31 Jul 2002 02:04:22 -0000 1.2
+++ NumberKeyTest.java 13 Sep 2002 02:43:09 -0000 1.3
@@ -68,9 +68,13 @@
public class NumberKeyTest extends TestCase
{
+ /** Test value. */
private NumberKey n1a = new NumberKey(1);
+ /** Test value. */
private NumberKey n1b = new NumberKey(1);
+ /** Test value. */
private NumberKey n1c = new NumberKey(1);
+ /** Test value. */
private NumberKey n2a = new NumberKey(2);
/**
@@ -83,11 +87,17 @@
super(name);
}
+ /**
+ * Test a.equals(a)
+ */
public void testReflexive()
{
Assert.assertTrue(n1a.equals(n1a));
}
+ /**
+ * Test a.equals(b) = b.equals(a)
+ */
public void testSymmetric()
{
Assert.assertTrue(n1a.equals(n1b));
@@ -110,6 +120,9 @@
Assert.assertTrue(!new Integer(1).equals(n1a));
}
+ /**
+ * Test a.equals(b) = b.equals(c) = c.equals(a)
+ */
public void testTransitive()
{
Assert.assertTrue(n1a.equals(n1b));
@@ -117,11 +130,17 @@
Assert.assertTrue(n1c.equals(n1a));
}
+ /**
+ * Test !a.equals(null)
+ */
public void testNull()
{
Assert.assertTrue(!n1a.equals(null));
}
+ /**
+ * Test sorting.
+ */
public void testList()
{
Object[] array = new Object[] { n1a, n2a, n1b };
1.6 +45 -28
jakarta-turbine-torque/src/test/org/apache/torque/engine/database/model/NameFactoryTest.java
Index: NameFactoryTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/test/org/apache/torque/engine/database/model/NameFactoryTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NameFactoryTest.java 29 Apr 2002 17:51:24 -0000 1.5
+++ NameFactoryTest.java 13 Sep 2002 02:43:09 -0000 1.6
@@ -54,15 +54,14 @@
* <http://www.apache.org/>.
*/
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.torque.BaseTestCase;
-import org.apache.torque.engine.database.model.NameGenerator;
/**
* <p>Unit tests for class <code>NameFactory</code> and known
@@ -81,6 +80,8 @@
*/
public class NameFactoryTest extends BaseTestCase
{
+
+ /** The database to mimic in generating the SQL. */
private static final String DATABASE_TYPE = "mysql";
/**
@@ -89,36 +90,42 @@
* implementations.
*/
private static final String[] ALGORITHMS =
- {
- NameFactory.CONSTRAINT_GENERATOR, NameFactory.JAVA_GENERATOR
- };
+ { NameFactory.CONSTRAINT_GENERATOR, NameFactory.JAVA_GENERATOR };
/**
* Two dimensional arrays of inputs for each algorithm.
*/
private static final Object[][][] INPUTS =
- {
- { { makeString(61), "I", new Integer(1) },
- { makeString(61), "I", new Integer(2) },
- { makeString(65), "I", new Integer(3) },
- { makeString(4), "FK", new Integer(1) },
- { makeString(5), "FK", new Integer(2) } },
- { { "MY_USER", NameGenerator.CONV_METHOD_UNDERSCORE },
- { "MY_USER", NameGenerator.CONV_METHOD_JAVANAME },
- { "MY_USER", NameGenerator.CONV_METHOD_NOCHANGE } }
+ { { { makeString(61), "I", new Integer(1)}, {
+ makeString(61), "I", new Integer(2)
+ }, {
+ makeString(65), "I", new Integer(3)
+ }, {
+ makeString(4), "FK", new Integer(1)
+ }, {
+ makeString(5), "FK", new Integer(2)
+ }
+ }, {
+ {
+ "MY_USER", NameGenerator.CONV_METHOD_UNDERSCORE }, {
+ "MY_USER", NameGenerator.CONV_METHOD_JAVANAME }, {
+ "MY_USER", NameGenerator.CONV_METHOD_NOCHANGE }
+ }
};
/**
* Given the known inputs, the expected name outputs.
*/
private static final String[][] OUTPUTS =
- {
- { makeString(60) + "_I_1",
- makeString(60) + "_I_2",
- makeString(60) + "_I_3",
- makeString(4) + "_FK_1",
- makeString(5) + "_FK_2" },
- { "MyUser", "MYUSER", "MY_USER" }
+ {
+ {
+ makeString(60) + "_I_1",
+ makeString(60) + "_I_2",
+ makeString(60) + "_I_3",
+ makeString(4) + "_FK_1",
+ makeString(5) + "_FK_2" },
+ {
+ "MyUser", "MYUSER", "MY_USER" }
};
/**
@@ -128,6 +135,8 @@
/**
* Creates a new instance.
+ *
+ * @param name the name of the test to run
*/
public NameFactoryTest(String name)
{
@@ -138,6 +147,9 @@
* Creates a string of the specified length consisting entirely of
* the character <code>A</code>. Useful for simulating table
* names, etc.
+ *
+ * @param len the number of characters to include in the string
+ * @return a string of length <code>len</code> with every character an 'A'
*/
private static final String makeString(int len)
{
@@ -161,10 +173,10 @@
return suite;
}
+ /** Sets up the Torque model. */
public void setUp()
{
- AppData appData =
- new AppData(DATABASE_TYPE, "src/templates/sql/base/");
+ AppData appData = new AppData(DATABASE_TYPE, "src/templates/sql/base/");
database = new Database();
database.setDatabaseType(DATABASE_TYPE);
appData.addDatabase(database);
@@ -172,9 +184,10 @@
/**
* Runs this test case.
+ *
+ * @throws Exception on fail
*/
- protected void runTest()
- throws Throwable
+ protected void testNames() throws Exception
{
for (int algoIndex = 0; algoIndex < ALGORITHMS.length; algoIndex++)
{
@@ -185,8 +198,10 @@
List inputs = makeInputs(algo, algoInputs[i]);
String generated = NameFactory.generateName(algo, inputs);
String expected = OUTPUTS[algoIndex][i];
- assertEquals("Algorithm " + algo + " failed to generate an " +
- "unique name", generated, expected);
+ assertEquals(
+ "Algorithm " + algo + " failed to generate an unique name",
+ generated,
+ expected);
}
}
}
@@ -199,6 +214,7 @@
* create an argument list for.
* @param inputs The (possibly partial) list inputs from which to
* generate the final list.
+ * @return the list of arguments to pass to the <code>NameGenerator</code>
*/
private final List makeInputs(String algo, Object[] inputs)
{
@@ -215,4 +231,5 @@
}
return list;
}
+
}
1.7 +3 -1
jakarta-turbine-torque/src/test/org/apache/torque/BaseTestCase.java
Index: BaseTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/test/org/apache/torque/BaseTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BaseTestCase.java 29 Apr 2002 17:45:01 -0000 1.6
+++ BaseTestCase.java 13 Sep 2002 02:43:09 -0000 1.7
@@ -84,6 +84,8 @@
/**
* Creates a new instance.
+ *
+ * @param name the name of the test case to run
*/
public BaseTestCase(String name)
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
