Revision 44685

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/test/java/org/gvsig/fmap/dal/store/h2/TestUtils.java
15 15
import org.gvsig.fmap.dal.feature.FeatureStore;
16 16
import org.gvsig.fmap.dal.feature.impl.DefaultFeature;
17 17
import org.gvsig.fmap.dal.feature.spi.FeatureProvider;
18
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper;
18 19
import org.gvsig.fmap.dal.store.jdbc2.JDBCServerExplorer;
19 20
import org.slf4j.Logger;
20 21
import org.slf4j.LoggerFactory;
......
117 118
    public static FeatureProvider getFeatureProvider(Feature feature) {
118 119
      return ((DefaultFeature)feature).getData();
119 120
    }
121

  
122
    public static JDBCHelper getJDBCHelper() {
123
      H2SpatialHelper helper = new H2SpatialHelper();
124
      return helper;
125
    }
126
    
127

  
120 128
}
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/test/java/org/gvsig/fmap/dal/store/h2/operations/sql/TestCalculateEnvelope.java
4 4
import junit.framework.TestCase;
5 5
import org.gvsig.fmap.dal.feature.FeatureStore;
6 6
import org.gvsig.fmap.dal.feature.FeatureType;
7
import org.gvsig.fmap.dal.store.h2.H2SpatialHelper;
8 7
import org.gvsig.fmap.dal.store.h2.TestUtils;
9 8
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper;
10 9
import org.gvsig.fmap.dal.store.jdbc2.OperationsFactory;
......
38 37
  // public void testHello() {}
39 38
  
40 39
  public void testCalculateEnvelope() throws Exception {
41
    JDBCHelper helper = new H2SpatialHelper();
40
    JDBCHelper helper = TestUtils.getJDBCHelper();
42 41
    JDBCSQLBuilderBase sqlbuilder = helper.createSQLBuilder();
43 42
    OperationsFactory operations = helper.getOperations();
44 43

  
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/test/java/org/gvsig/fmap/dal/store/h2/operations/sql/TestCreateTable.java
4 4
import junit.framework.TestCase;
5 5
import org.gvsig.fmap.dal.feature.FeatureStore;
6 6
import org.gvsig.fmap.dal.feature.FeatureType;
7
import org.gvsig.fmap.dal.store.h2.H2SpatialHelper;
8 7
import org.gvsig.fmap.dal.store.h2.TestUtils;
9 8
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper;
10 9
import org.gvsig.fmap.dal.store.jdbc2.OperationsFactory;
......
38 37
  // public void testHello() {}
39 38
  
40 39
  public void testCreateTable() throws Exception {
41
    JDBCHelper helper = new H2SpatialHelper();
40
    JDBCHelper helper = TestUtils.getJDBCHelper();
42 41
    JDBCSQLBuilderBase sqlbuilder = helper.createSQLBuilder();
43 42
    OperationsFactory operations = helper.getOperations();
44 43

  
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/test/java/org/gvsig/fmap/dal/store/h2/operations/sql/TestDropTable.java
3 3
import java.util.List;
4 4
import junit.framework.TestCase;
5 5
import org.gvsig.fmap.dal.feature.FeatureStore;
6
import org.gvsig.fmap.dal.store.h2.H2SpatialHelper;
7 6
import org.gvsig.fmap.dal.store.h2.TestUtils;
8 7
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper;
9 8
import org.gvsig.fmap.dal.store.jdbc2.OperationsFactory;
......
37 36
  // public void testHello() {}
38 37
  
39 38
  public void testDropTable() throws Exception {
40
    JDBCHelper helper = new H2SpatialHelper();
39
    JDBCHelper helper = TestUtils.getJDBCHelper();
41 40
    JDBCSQLBuilderBase sqlbuilder = helper.createSQLBuilder();
42 41
    OperationsFactory operations = helper.getOperations();
43 42

  
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/test/java/org/gvsig/fmap/dal/store/h2/operations/sql/TestTableIsEmpty.java
4 4
import junit.framework.TestCase;
5 5
import org.gvsig.fmap.dal.feature.FeatureStore;
6 6
import org.gvsig.fmap.dal.feature.FeatureType;
7
import org.gvsig.fmap.dal.store.h2.H2SpatialHelper;
8 7
import org.gvsig.fmap.dal.store.h2.TestUtils;
9 8
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper;
10 9
import org.gvsig.fmap.dal.store.jdbc2.OperationsFactory;
......
38 37
  // public void testHello() {}
39 38
  
40 39
  public void testTableIsEmpty() throws Exception {
41
    JDBCHelper helper = new H2SpatialHelper();
40
    JDBCHelper helper = TestUtils.getJDBCHelper();
42 41
    JDBCSQLBuilderBase sqlbuilder = helper.createSQLBuilder();
43 42
    OperationsFactory operations = helper.getOperations();
44 43

  
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/test/java/org/gvsig/fmap/dal/store/h2/operations/sql/TestPerformChanges.java
10 10
import org.gvsig.fmap.dal.feature.FeatureStore;
11 11
import org.gvsig.fmap.dal.feature.FeatureType;
12 12
import org.gvsig.fmap.dal.feature.spi.FeatureStoreProvider.FeatureTypeChanged;
13
import org.gvsig.fmap.dal.store.h2.H2SpatialHelper;
14 13
import org.gvsig.fmap.dal.store.h2.TestUtils;
15 14
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper;
16 15
import org.gvsig.fmap.dal.store.jdbc2.OperationsFactory;
......
44 43
  // public void testHello() {}
45 44
  
46 45
  public void testPerformChanges() throws Exception {
47
    JDBCHelper helper = new H2SpatialHelper();
46
    JDBCHelper helper = TestUtils.getJDBCHelper();
48 47
    JDBCSQLBuilderBase sqlbuilder = helper.createSQLBuilder();
49 48
    OperationsFactory operations = helper.getOperations();
50 49

  
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/test/java/org/gvsig/fmap/dal/store/h2/operations/sql/TestUpdateTableStatistics.java
4 4
import junit.framework.TestCase;
5 5
import org.gvsig.fmap.dal.feature.FeatureStore;
6 6
import org.gvsig.fmap.dal.feature.FeatureType;
7
import org.gvsig.fmap.dal.store.h2.H2SpatialHelper;
8 7
import org.gvsig.fmap.dal.store.h2.TestUtils;
9 8
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper;
10 9
import org.gvsig.fmap.dal.store.jdbc2.OperationsFactory;
......
38 37
  // public void testHello() {}
39 38
  
40 39
  public void testUpdateTableStatistics() throws Exception {
41
    JDBCHelper helper = new H2SpatialHelper();
40
    JDBCHelper helper = TestUtils.getJDBCHelper();
42 41
    JDBCSQLBuilderBase sqlbuilder = helper.createSQLBuilder();
43 42
    OperationsFactory operations = helper.getOperations();
44 43

  
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/test/java/org/gvsig/fmap/dal/store/h2/operations/sql/TestAppend.java
8 8
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
9 9
import org.gvsig.fmap.dal.feature.FeatureStore;
10 10
import org.gvsig.fmap.dal.feature.FeatureType;
11
import org.gvsig.fmap.dal.store.h2.H2SpatialHelper;
12 11
import org.gvsig.fmap.dal.store.h2.TestUtils;
13 12
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper;
14 13
import org.gvsig.fmap.dal.store.jdbc2.OperationsFactory;
......
42 41
  // public void testHello() {}
43 42
  
44 43
  public void testAppend() throws Exception {
45
    JDBCHelper helper = new H2SpatialHelper();
44
    JDBCHelper helper = TestUtils.getJDBCHelper();
46 45
    JDBCSQLBuilderBase sqlbuilder = helper.createSQLBuilder();
47 46
    OperationsFactory operations = helper.getOperations();
48 47

  
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/test/java/org/gvsig/fmap/dal/store/h2/operations/sql/TestFetchFeatureType.java
5 5
import junit.framework.TestCase;
6 6
import org.gvsig.fmap.dal.feature.FeatureStore;
7 7
import org.gvsig.fmap.dal.feature.FeatureType;
8
import org.gvsig.fmap.dal.store.h2.H2SpatialHelper;
9 8
import org.gvsig.fmap.dal.store.h2.TestUtils;
10 9
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper;
11 10
import org.gvsig.fmap.dal.store.jdbc2.OperationsFactory;
......
39 38
  // public void testHello() {}
40 39
  
41 40
  public void testFetchFeatureType() throws Exception {
42
    JDBCHelper helper = new H2SpatialHelper();
41
    JDBCHelper helper = TestUtils.getJDBCHelper();
43 42
    JDBCSQLBuilderBase sqlbuilder = helper.createSQLBuilder();
44 43
    OperationsFactory operations = helper.getOperations();
45 44

  
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/test/java/org/gvsig/fmap/dal/store/h2/operations/sql/TestCount.java
4 4
import junit.framework.TestCase;
5 5
import org.gvsig.fmap.dal.feature.FeatureStore;
6 6
import org.gvsig.fmap.dal.feature.FeatureType;
7
import org.gvsig.fmap.dal.store.h2.H2SpatialHelper;
8 7
import org.gvsig.fmap.dal.store.h2.TestUtils;
9 8
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper;
10 9
import org.gvsig.fmap.dal.store.jdbc2.OperationsFactory;
......
38 37
  // public void testHello() {}
39 38
  
40 39
  public void testCount() throws Exception {
41
    JDBCHelper helper = new H2SpatialHelper();
40
    JDBCHelper helper = TestUtils.getJDBCHelper();
42 41
    JDBCSQLBuilderBase sqlbuilder = helper.createSQLBuilder();
43 42
    OperationsFactory operations = helper.getOperations();
44 43

  
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/test/java/org/gvsig/fmap/dal/store/h2/operations/sql/TestResultSetForSetProvider.java
4 4
import junit.framework.TestCase;
5 5
import org.gvsig.fmap.dal.feature.FeatureStore;
6 6
import org.gvsig.fmap.dal.feature.FeatureType;
7
import org.gvsig.fmap.dal.store.h2.H2SpatialHelper;
8 7
import org.gvsig.fmap.dal.store.h2.TestUtils;
9 8
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper;
10 9
import org.gvsig.fmap.dal.store.jdbc2.OperationsFactory;
......
38 37
  // public void testHello() {}
39 38
  
40 39
  public void testResultSetForSetProvider() throws Exception {
41
    JDBCHelper helper = new H2SpatialHelper();
40
    JDBCHelper helper = TestUtils.getJDBCHelper();
42 41
    JDBCSQLBuilderBase sqlbuilder = helper.createSQLBuilder();
43 42
    OperationsFactory operations = helper.getOperations();
44 43

  
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/test/java/org/gvsig/fmap/dal/store/h2/operations/sql/TestFetchFeatureProviderByReference.java
8 8
import org.gvsig.fmap.dal.feature.FeatureType;
9 9
import org.gvsig.fmap.dal.feature.impl.DefaultFeature;
10 10
import org.gvsig.fmap.dal.feature.impl.DefaultFeatureReference;
11
import org.gvsig.fmap.dal.store.h2.H2SpatialHelper;
12 11
import org.gvsig.fmap.dal.store.h2.TestUtils;
13 12
import org.gvsig.fmap.dal.store.jdbc2.JDBCHelper;
14 13
import org.gvsig.fmap.dal.store.jdbc2.OperationsFactory;
......
42 41
  // public void testHello() {}
43 42
  
44 43
  public void testFetchFeatureProviderByReference() throws Exception {
45
    JDBCHelper helper = new H2SpatialHelper();
44
    JDBCHelper helper = TestUtils.getJDBCHelper();
46 45
    JDBCSQLBuilderBase sqlbuilder = helper.createSQLBuilder();
47 46
    OperationsFactory operations = helper.getOperations();
48 47

  

Also available in: Unified diff