You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by dl...@apache.org on 2001/08/22 22:12:38 UTC
cvs commit: jakarta-turbine-torque/src/test/org/apache/torque/engine/database/model NameFactoryTest.java
dlr 01/08/22 13:12:38
Modified: src/test/org/apache/torque/engine/database/model
NameFactoryTest.java
Log:
Now tests only ConstraintNameGenerator -- the other two have been
removed.
Revision Changes Path
1.2 +30 -23 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.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- NameFactoryTest.java 2001/08/21 00:21:41 1.1
+++ NameFactoryTest.java 2001/08/22 20:12:38 1.2
@@ -72,10 +72,12 @@
* characters.</p>
*
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @version $Id: NameFactoryTest.java,v 1.1 2001/08/21 00:21:41 dlr Exp $
+ * @version $Id: NameFactoryTest.java,v 1.2 2001/08/22 20:12:38 dlr Exp $
*/
public class NameFactoryTest extends BaseTestCase
{
+ private static final String DATABASE_TYPE = "mysql";
+
/**
* The list of known name generation algorithms, specified as the
* fully qualified class names to <code>NameGenerator</code>
@@ -83,17 +85,19 @@
*/
private static final String[] ALGORITHMS =
{
- NameFactory.DEFAULT_GENERATOR, NameFactory.GLOBAL_GENERATOR
+ NameFactory.CONSTRAINT_GENERATOR
};
/**
* Two dimensional arrays of inputs for each algorithm.
*/
- private static final String[][][] INPUTS =
+ private static final Object[][][] INPUTS =
{
- { { "FOO", "BAR" }, { "FOO", "BAR", "BAZ" } },
- { { makeString(62), "I" }, { makeString(62), "I" },
- { makeString(62), "I" } }
+ { { 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) } }
};
/**
@@ -101,15 +105,17 @@
*/
private static final String[][] OUTPUTS =
{
- { "FOO" + NameGenerator.STD_SEPARATOR_CHAR + "BAR",
- "FOO" + NameGenerator.STD_SEPARATOR_CHAR + "BAR" +
- NameGenerator.STD_SEPARATOR_CHAR + "BAZ" },
- { makeString(62) + NameGenerator.STD_SEPARATOR_CHAR + "I",
- makeString(61) + NameGenerator.STD_SEPARATOR_CHAR + "I0",
- makeString(61) + NameGenerator.STD_SEPARATOR_CHAR + "I1" }
+ { makeString(60) + "_I_1",
+ makeString(60) + "_I_2",
+ makeString(60) + "_I_3",
+ makeString(4) + "_FK_1",
+ makeString(5) + "_FK_2" }
};
- private AppData appData;
+ /**
+ * Used as an input.
+ */
+ private Database database;
/**
* Creates a new instance.
@@ -121,7 +127,8 @@
/**
* Creates a string of the specified length consisting entirely of
- * the character <code>A</code>.
+ * the character <code>A</code>. Useful for simulating table
+ * names, etc.
*/
private static final String makeString(int len)
{
@@ -147,7 +154,11 @@
protected void setUp()
{
- appData = new AppData();
+ AppData appData =
+ new AppData(DATABASE_TYPE, "src/templates/sql/base/");
+ database = new Database();
+ database.setDatabaseType(DATABASE_TYPE);
+ appData.addDatabase(database);
}
/**
@@ -159,7 +170,7 @@
for (int algoIndex = 0; algoIndex < ALGORITHMS.length; algoIndex++)
{
String algo = ALGORITHMS[algoIndex];
- String[][] algoInputs = INPUTS[algoIndex];
+ Object[][] algoInputs = INPUTS[algoIndex];
for (int i = 0; i < algoInputs.length; i++)
{
List inputs = makeInputs(algo, algoInputs[i]);
@@ -180,17 +191,13 @@
* @param inputs The (possibly partial) list inputs from which to
* generate the final list.
*/
- private final List makeInputs(String algo, String[] inputs)
+ private final List makeInputs(String algo, Object[] inputs)
{
List list = null;
- if (NameFactory.DEFAULT_GENERATOR.equals(algo))
- {
- list = Arrays.asList(inputs);
- }
- else if (NameFactory.GLOBAL_GENERATOR.equals(algo))
+ if (NameFactory.CONSTRAINT_GENERATOR.equals(algo))
{
list = new ArrayList(inputs.length + 1);
- list.add(0, appData);
+ list.add(0, database);
list.addAll(Arrays.asList(inputs));
}
return list;
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org