Revision: 3499
Author: [email protected]
Date: Wed May 5 14:57:41 2010
Log: Changes to tests to support changes to user defined types.
http://code.google.com/p/power-architect/source/detail?r=3499
Modified:
/trunk/regress/ca/sqlpower/architect/ArchitectUtilsTest.java
/trunk/regress/ca/sqlpower/architect/ddl/GenericDDLGeneratorTest.java
=======================================
--- /trunk/regress/ca/sqlpower/architect/ArchitectUtilsTest.java Wed Feb 24
14:00:05 2010
+++ /trunk/regress/ca/sqlpower/architect/ArchitectUtilsTest.java Wed May 5
14:57:41 2010
@@ -71,28 +71,28 @@
}
public void testColumnsDiffer() {
- SQLColumn col1 = new SQLColumn(null, "column_1",
Types.VARCHAR, "VARCHAR", 25, 0, 0, "remarks", null, false);
- SQLColumn col2 = new SQLColumn(null, "column_1",
Types.VARCHAR, "VARCHAR", 25, -1, 0, "remarks", null, false);
+ SQLColumn col1 = new SQLColumn(null, "column_1",
Types.VARCHAR, "VARCHAR", 25, 0, 0, "remarks", null, false, null);
+ SQLColumn col2 = new SQLColumn(null, "column_1",
Types.VARCHAR, "VARCHAR", 25, -1, 0, "remarks", null, false, null);
assertFalse(ArchitectUtils.columnsDiffer(col1, col2));
- col1 = new SQLColumn(null, "column_1", Types.CHAR, "CHAR", 25, 0,
0, "remarks", null, false);
- col2 = new SQLColumn(null, "column_1", Types.CHAR, "CHAR", 25, -1,
0, "remarks", null, false);
+ col1 = new SQLColumn(null, "column_1", Types.CHAR, "CHAR", 25, 0,
0, "remarks", null, false, null);
+ col2 = new SQLColumn(null, "column_1", Types.CHAR, "CHAR", 25, -1,
0, "remarks", null, false, null);
assertFalse(ArchitectUtils.columnsDiffer(col1, col2));
- col1 = new SQLColumn(null, "column_1", Types.INTEGER, "INTEGER", 33, 0,
0, "remarks", null, false);
- col2 = new SQLColumn(null, "column_1", Types.INTEGER, "LONGINT", 42, -1,
0, "remarks", null, false);
+ col1 = new SQLColumn(null, "column_1", Types.INTEGER, "INTEGER", 33, 0,
0, "remarks", null, false, null);
+ col2 = new SQLColumn(null, "column_1", Types.INTEGER, "LONGINT", 42, -1,
0, "remarks", null, false, null);
assertFalse(ArchitectUtils.columnsDiffer(col1, col2));
- col1 = new SQLColumn(null, "column_1", Types.DECIMAL, "NUMBER", 1, 0,
0, "remarks", null, false);
- col2 = new SQLColumn(null, "column_1", Types.DECIMAL, "NUMBER", 2, 0,
0, "remarks", null, false);
+ col1 = new SQLColumn(null, "column_1", Types.DECIMAL, "NUMBER", 1, 0,
0, "remarks", null, false, null);
+ col2 = new SQLColumn(null, "column_1", Types.DECIMAL, "NUMBER", 2, 0,
0, "remarks", null, false, null);
assertTrue(ArchitectUtils.columnsDiffer(col1, col2));
- col1 = new SQLColumn(null, "column_1", Types.NUMERIC, "NUMBER", 1, 0,
0, "remarks", null, false);
- col2 = new SQLColumn(null, "column_1", Types.DECIMAL, "NUMBER", 2, 0,
0, "remarks", null, false);
+ col1 = new SQLColumn(null, "column_1", Types.NUMERIC, "NUMBER", 1, 0,
0, "remarks", null, false, null);
+ col2 = new SQLColumn(null, "column_1", Types.DECIMAL, "NUMBER", 2, 0,
0, "remarks", null, false, null);
assertTrue(ArchitectUtils.columnsDiffer(col1, col2));
- col1 = new SQLColumn(null, "column_1", Types.NUMERIC, "NUMBER", 10, 5,
0, "remarks", null, false);
- col2 = new SQLColumn(null, "column_1", Types.DECIMAL, "NUMBER", 10, 5,
0, "remarks", null, false);
+ col1 = new SQLColumn(null, "column_1", Types.NUMERIC, "NUMBER", 10, 5,
0, "remarks", null, false, null);
+ col2 = new SQLColumn(null, "column_1", Types.DECIMAL, "NUMBER", 10, 5,
0, "remarks", null, false, null);
assertFalse(ArchitectUtils.columnsDiffer(col1, col2));
}
/*
=======================================
--- /trunk/regress/ca/sqlpower/architect/ddl/GenericDDLGeneratorTest.java
Mon Feb 8 10:12:47 2010
+++ /trunk/regress/ca/sqlpower/architect/ddl/GenericDDLGeneratorTest.java
Wed May 5 14:57:41 2010
@@ -83,17 +83,17 @@
tbl.setPhysicalName("test_table");
SQLColumn col1 = new SQLColumn(tbl, "N_TEST",
SQLType.NVARCHAR, "NVARCHAR", 1000, 0, 0, "",
- null, false);
+ null, false, null);
assertEquals("NVARCHAR(1000)", ddl.getColumnDataTypeName(col1));
assertEquals("NVARCHAR(1000)", ddl.columnType(col1));
SQLColumn col2 = new SQLColumn(tbl, "N_CHARTEST",
SQLType.NCHAR, "NCHAR", 1000, 0, 0, "",
- null, false);
+ null, false, null);
assertEquals("NCHAR(1000)", ddl.getColumnDataTypeName(col2));
assertEquals("NCHAR(1000)", ddl.columnType(col2));
SQLColumn col3 = new SQLColumn(tbl, "N_CLOB_TEST",
SQLType.NCLOB, "NCLOB", 1000, 0, 0, "",
- null, false);
+ null, false, null);
assertEquals("NCLOB", ddl.getColumnDataTypeName(col3));
assertEquals("NCLOB", ddl.columnType(col3));