Changeset 888 for MetadataBeans/trunk/src/test/java/org/eobjects/metamodel/MetadataBeansHelperTest.java

Timestamp:

02/04/10 21:57:54 (2 years ago)

Author:

kasper

Message:

 

File:

• MetadataBeans/trunk/src/test/java/org/eobjects/metamodel/MetadataBeansHelperTest.java (moved) (moved from MetadataBeans/trunk/src/test/java/org/eobjects/metamodel/MetaModelHelperTest.java) (12 diffs)

MetadataBeans/trunk/src/test/java/org/eobjects/metamodel/MetadataBeansHelperTest.java

@@ -37 +37 @@
 
 
-public class MetaModelHelperTest extends MetaModelTestCase {
+public class MetadataBeansHelperTest extends MetadataBeansTestCase {
 
         public void testLeftJoin() throws Exception {
@@ -72 +72 @@
                 onConditions[0] = new FilterItem(si4, OperatorType.EQUALS_TO, si5);
 
-                DataSet result = MetaModelHelper.getLeftJoin(ds1, ds2, onConditions);
+                DataSet result = MetadataBeansHelper.getLeftJoin(ds1, ds2, onConditions);
                 List<Object[]> objectArrays = result.toObjectArrays();
                 assertEquals("{1,peter,18,1,1,class president,clpr}", ArrayUtils
@@ -119 +119 @@
                 onConditions[0] = new FilterItem(si4, OperatorType.EQUALS_TO, si5);
 
-                DataSet result = MetaModelHelper.getRightJoin(ds1, ds2, onConditions);
+                DataSet result = MetadataBeansHelper.getRightJoin(ds1, ds2, onConditions);
                 List<Object[]> objectArrays = result.toObjectArrays();
                 assertEquals("{1,peter,18,1,1,class president,clpr}", ArrayUtils
@@ -131 +131 @@
 
         public void testSimpleCarthesianProduct() throws Exception {
-                DataSet dataSet = MetaModelHelper.getCarthesianProduct(
+                DataSet dataSet = MetadataBeansHelper.getCarthesianProduct(
                                 createDataSet1(), createDataSet2());
 
@@ -151 +151 @@
 
         public void testTripleCarthesianProduct() throws Exception {
-                DataSet dataSet = MetaModelHelper.getCarthesianProduct(
+                DataSet dataSet = MetadataBeansHelper.getCarthesianProduct(
                                 createDataSet1(), createDataSet2(), createDataSet3());
                 assertEquals(4, dataSet.getSelectItems().length);
@@ -166 +166 @@
                 FilterItem w1 = new FilterItem(ds1.getSelectItems()[0],
                                 OperatorType.EQUALS_TO, "f");
-                DataSet dataSet = MetaModelHelper.getCarthesianProduct(dataSets, w1);
+                DataSet dataSet = MetadataBeansHelper.getCarthesianProduct(dataSets, w1);
                 assertEquals(2, dataSet.getSelectItems().length);
                 for (int i = 0; i < 1 * 3; i++) {
@@ -176 +176 @@
 
         public void testGetCarthesianProductNoRows() throws Exception {
-                DataSet dataSet = MetaModelHelper.getCarthesianProduct(
+                DataSet dataSet = MetadataBeansHelper.getCarthesianProduct(
                                 createDataSet4(), createDataSet2(), createDataSet3());
                 assertEquals(4, dataSet.getSelectItems().length);
                 assertFalse(dataSet.next());
 
-                dataSet = MetaModelHelper.getCarthesianProduct(createDataSet1(),
+                dataSet = MetadataBeansHelper.getCarthesianProduct(createDataSet1(),
                                 createDataSet4(), createDataSet3());
                 assertEquals(4, dataSet.getSelectItems().length);
                 assertFalse(dataSet.next());
 
-                dataSet = MetaModelHelper.getCarthesianProduct(createDataSet1(),
+                dataSet = MetadataBeansHelper.getCarthesianProduct(createDataSet1(),
                                 createDataSet2(), createDataSet4());
                 assertEquals(3, dataSet.getSelectItems().length);
@@ -197 +197 @@
                 orderByItems.add(new OrderByItem(dataSet.getSelectItems()[0]));
 
-                dataSet = MetaModelHelper.getOrdered(dataSet, orderByItems);
+                dataSet = MetadataBeansHelper.getOrdered(dataSet, orderByItems);
                 assertTrue(dataSet.next());
                 assertEquals("Row[values={w00p,true}]", dataSet.getRow().toString());
@@ -261 +261 @@
                 columnList.add(t2column1);
 
-                Table[] tables = MetaModelHelper.getTables(tableList, columnList);
+                Table[] tables = MetadataBeansHelper.getTables(tableList, columnList);
                 assertEquals(2, tables.length);
                 assertTrue(ArrayUtils.indexOf(tables, table1) != -1);
@@ -281 +281 @@
                 ArrayList<Column> columnList = new ArrayList<Column>();
 
-                Column[] columns = MetaModelHelper.getTableColumns(table1, columnList);
+                Column[] columns = MetadataBeansHelper.getTableColumns(table1, columnList);
                 assertEquals(0, columns.length);
 
@@ -287 +287 @@
                 columnList.add(column3);
 
-                columns = MetaModelHelper.getTableColumns(table1, columnList);
+                columns = MetadataBeansHelper.getTableColumns(table1, columnList);
                 assertEquals(2, columns.length);
                 assertSame(column1, columns[0]);
@@ -307 +307 @@
                 Query q = new Query().from(fromItem);
 
-                FromItem[] fromItems = MetaModelHelper.getTableFromItems(q);
+                FromItem[] fromItems = MetadataBeansHelper.getTableFromItems(q);
                 assertEquals(3, fromItems.length);
                 assertEquals(