Revision 47580 trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.sqlite/org.gvsig.sqlite.provider/src/test/java/org/gvsig/sqlite/dal/operations/sql/TestCreateTable.java

View differences:

TestCreateTable.java
6 6
import org.gvsig.fmap.dal.feature.EditableFeatureType;
7 7
import org.gvsig.fmap.dal.feature.FeatureStore;
8 8
import org.gvsig.fmap.dal.feature.FeatureType;
9
import org.gvsig.fmap.dal.store.jdbc2.AbstractTestUtils;
10
import org.gvsig.fmap.dal.store.jdbc2.AbstractTestUtils.Expecteds;
9 11
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper;
10 12
import org.gvsig.fmap.dal.store.jdbc2.OperationsFactory;
11 13
import org.gvsig.fmap.dal.store.jdbc2.OperationsFactory.TableReference;
12 14
import org.gvsig.fmap.dal.store.jdbc2.spi.JDBCSQLBuilderBase;
13 15
import org.gvsig.fmap.dal.store.jdbc2.spi.operations.CreateTableOperation;
14 16
import org.gvsig.sqlite.dal.TestUtils;
17
import org.gvsig.sqlite.dal.TestUtilsSQLite;
15 18
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer;
16 19
import org.slf4j.Logger;
17 20
import org.slf4j.LoggerFactory;
......
44 47
        JDBCSQLBuilderBase sqlbuilder = helper.createSQLBuilder();
45 48
        OperationsFactory operations = helper.getOperations();
46 49

  
47
        List<String> expectedSQLs = TestUtils.getSQLs("createTable.sql");
50
        TestUtilsSQLite utils = new TestUtilsSQLite();
51
        Expecteds expecteds = utils.getExpecteds("createTable.sql");
52
        
53
        List<String> expectedSQLs = expecteds.getAll("createTable");
48 54

  
49 55
        FeatureStore sourceStore = TestUtils.openSourceStore1();
50 56

  
......
62 68
                null
63 69
        );
64 70
        List<String> SQLs = createTable.getSQLs();
65
        for (int i = 0; i < SQLs.size(); i++) {
66
            System.out.println("###### testCreateTable");
67
            System.out.println("###### SQL:" + SQLs.get(i) + ";");
68
        }
71
//        for (int i = 0; i < SQLs.size(); i++) {
72
//            System.out.println("###### testCreateTable");
73
//            System.out.println("###### SQL:" + SQLs.get(i) + ";");
74
//        }
69 75

  
70 76
        assertEquals("CreateTable num. SQLs", expectedSQLs.size(), SQLs.size());
71
        for (int i = 0; i < expectedSQLs.size(); i++) {
72
            System.out.println("###### testCreateTable");
73
            System.out.println("###### SQL:" + SQLs.get(i) + ";");
74
            System.out.println("###### EXP:" + expectedSQLs.get(i) + ";");
75

  
76
          assertEquals("CreateTable SQL "+i, expectedSQLs.get(i), SQLs.get(i));
77
        }
77
          for (int i = 0; i < expectedSQLs.size(); i++) {
78
              System.out.println("###### SQL" + i + ":" + SQLs.get(i) + ";");
79
              System.out.println("###### EXP" + i + ":" + expectedSQLs.get(i) + ";");
80
              if (i != 3) {
81
                  assertEquals("CreateTable SQL " + i, expectedSQLs.get(i), SQLs.get(i));
82
              } else {
83
                  assertTrue(expecteds.match("createTable", i, SQLs.get(i)));
84
              }
85
          }
78 86
      } catch(Exception ex) {
79 87
          LOGGER.warn("Error",ex);
80 88
          throw ex;
......
87 95
        JDBCSQLBuilderBase sqlbuilder = helper.createSQLBuilder();
88 96
        OperationsFactory operations = helper.getOperations();
89 97

  
90
        List<String> expectedSQLs = TestUtils.getSQLs("createTable.sql");
98
        TestUtilsSQLite utils = new TestUtilsSQLite();
99
        Expecteds expecteds = utils.getExpecteds("createTable.sql");
91 100

  
101
        List<String> expectedSQLs = expecteds.getAll("createTable");
102

  
92 103
        FeatureStore sourceStore = TestUtils.openSourceStore1();
93 104

  
94 105
        TableReference table = operations.createTableReference(
......
108 119
                null
109 120
        );
110 121
        List<String> SQLs = createTable.getSQLs();
111
        for (int i = 0; i < SQLs.size(); i++) {
112
            System.out.println("###### testCreateTable");
113
            System.out.println("###### SQL:" + SQLs.get(i) + ";");
114
        }
115

  
116 122
        assertEquals("CreateTable num. SQLs", expectedSQLs.size(), SQLs.size());
117 123
        for (int i = 0; i < expectedSQLs.size(); i++) {
118
          assertEquals("CreateTable SQL "+i, expectedSQLs.get(i), SQLs.get(i));
124
          System.out.println("###### SQL" + i + ":" + SQLs.get(i) + ";");
125
          System.out.println("###### EXP" + i + ":" + expectedSQLs.get(i) + ";");
126
          if (i != 3) {
127
            assertEquals("CreateTable SQL "+i, expectedSQLs.get(i), SQLs.get(i));
128
          } else {
129
            assertTrue(expecteds.match("createTable", i, SQLs.get(i)));
130
          }
131

  
119 132
        }
120 133
      } catch(Exception ex) {
121 134
          LOGGER.warn("Error",ex);

Also available in: Unified diff