Revision 19976
trunk/libraries/libDataSourceBaseDrivers/src-test/org/gvsig/data/datastores/vectorial/file/dxf/DXFTest.java | ||
---|---|---|
6 | 6 |
import junit.framework.TestCase; |
7 | 7 |
|
8 | 8 |
import org.cresques.cts.IProjection; |
9 |
import org.gvsig.data.DataManager; |
|
9 | 10 |
import org.gvsig.data.datastores.vectorial.file.DataStoreTest; |
10 | 11 |
import org.gvsig.data.datastores.vectorial.file.dxf.DXFStore; |
11 | 12 |
import org.gvsig.data.datastores.vectorial.file.dxf.DXFStoreParameters; |
... | ... | |
24 | 25 |
import com.iver.cit.gvsig.fmap.crs.CRSFactory; |
25 | 26 |
|
26 | 27 |
public class DXFTest extends TestCase { |
27 |
DXFStore store = new DXFStore(); |
|
28 | 28 |
private File file = new File(DataStoreTest.class.getResource("data/prueba.dxf").getFile()); |
29 | 29 |
|
30 | 30 |
|
... | ... | |
37 | 37 |
|
38 | 38 |
public void testInitialize() { |
39 | 39 |
Register.selfRegister(); |
40 |
DXFStoreParameters dxfParameters=new DXFStoreParameters(); |
|
40 |
DataManager manager = DataManager.getManager(); |
|
41 |
DXFStore store =null; |
|
42 |
|
|
43 |
DXFStoreParameters dxfParameters=null; |
|
44 |
dxfParameters=(DXFStoreParameters)manager.createDataStoreParameters(DXFStore.DATASTORE_NAME); |
|
41 | 45 |
dxfParameters.setDXFFile(file); |
42 | 46 |
IProjection proj = CRSFactory.getCRS("EPSG:23030"); |
43 | 47 |
dxfParameters.setProjection(proj); |
44 | 48 |
try { |
45 |
store.init(dxfParameters);
|
|
49 |
store=(DXFStore)manager.createDataStore(dxfParameters);
|
|
46 | 50 |
} catch (InitializeException e) { |
47 | 51 |
// TODO Auto-generated catch block |
48 | 52 |
e.printStackTrace(); |
... | ... | |
93 | 97 |
} |
94 | 98 |
} |
95 | 99 |
} |
100 |
iter = null; |
|
101 |
featureCollection.dispose(); |
|
96 | 102 |
|
97 | 103 |
try { |
98 | 104 |
store.close(); |
trunk/libraries/libDataSourceBaseDrivers/src-test/org/gvsig/data/datastores/vectorial/file/DataStoreTest.java | ||
---|---|---|
1024 | 1024 |
fail("Exception: "+e1); |
1025 | 1025 |
} |
1026 | 1026 |
|
1027 |
featureCollection.dispose(); |
|
1028 |
|
|
1027 | 1029 |
if (fs.isEditable() && testEdit){ |
1028 | 1030 |
try { |
1029 | 1031 |
fs.finishEditing(); |
trunk/libraries/libDataSourceBaseDrivers/src-test/org/gvsig/data/datastores/vectorial/file/dgn/DGNTest.java | ||
---|---|---|
5 | 5 |
|
6 | 6 |
import junit.framework.TestCase; |
7 | 7 |
|
8 |
import org.gvsig.data.DataManager; |
|
8 | 9 |
import org.gvsig.data.datastores.vectorial.file.DataStoreTest; |
9 | 10 |
import org.gvsig.data.datastores.vectorial.file.dgn.DGNStore; |
10 | 11 |
import org.gvsig.data.datastores.vectorial.file.dgn.DGNStoreParameters; |
... | ... | |
21 | 22 |
import org.gvsig.data.vectorial.expansionadapter.MemoryExpansionAdapter; |
22 | 23 |
|
23 | 24 |
public class DGNTest extends TestCase { |
24 |
DGNStore store = new DGNStore(); |
|
25 |
|
|
25 | 26 |
private File file = new File(DataStoreTest.class.getResource("data/cv_300_todo.dgn").getFile()); |
26 | 27 |
|
27 | 28 |
|
... | ... | |
34 | 35 |
|
35 | 36 |
public void testInitialize() { |
36 | 37 |
Register.selfRegister(); |
37 |
DGNStoreParameters dgnParameters=new DGNStoreParameters(); |
|
38 |
DataManager manager = DataManager.getManager(); |
|
39 |
DGNStore store = null; |
|
40 |
|
|
41 |
DGNStoreParameters dgnParameters; |
|
42 |
dgnParameters=(DGNStoreParameters)manager.createDataStoreParameters(DGNStore.DATASTORE_NAME); |
|
38 | 43 |
dgnParameters.setDGNFile(file); |
39 | 44 |
try { |
40 |
store.init(dgnParameters);
|
|
45 |
store = (DGNStore)manager.createDataStore(dgnParameters);
|
|
41 | 46 |
} catch (InitializeException e) { |
42 | 47 |
// TODO Auto-generated catch block |
43 | 48 |
e.printStackTrace(); |
... | ... | |
87 | 92 |
} |
88 | 93 |
} |
89 | 94 |
} |
95 |
iter = null; |
|
96 |
featureCollection.dispose(); |
|
90 | 97 |
|
91 | 98 |
try { |
92 | 99 |
store.close(); |
trunk/libraries/libDataSourceBaseDrivers/src-test/org/gvsig/data/datastores/vectorial/file/DataExplorerTest.java | ||
---|---|---|
39 | 39 |
|
40 | 40 |
assertEquals(2, params.length); |
41 | 41 |
|
42 |
String file=dbffile.getParent()+"\\pruebaCrear.dbf";
|
|
42 |
String file=dbffile.getParent()+File.separator+"pruebaCrear.dbf";
|
|
43 | 43 |
DBFStoreParameters parameters=new DBFStoreParameters(); |
44 | 44 |
parameters.setDBFFile(new File(file)); |
45 | 45 |
|
... | ... | |
63 | 63 |
|
64 | 64 |
assertEquals(0, fc.size()); |
65 | 65 |
|
66 |
fc.dispose(); |
|
67 |
|
|
66 | 68 |
fs.close(); |
67 | 69 |
fs.dispose(); |
68 | 70 |
} catch (Exception e) { |
... | ... | |
90 | 92 |
|
91 | 93 |
assertEquals(2, params.length); |
92 | 94 |
|
93 |
String file=shpfile.getParent()+"\\pruebaCrear.shp";
|
|
95 |
String file=shpfile.getParent()+File.separator+"pruebaCrear.shp";
|
|
94 | 96 |
SHPStoreParameters parameters=new SHPStoreParameters(); |
95 | 97 |
parameters.setSHPFile(new File(file)); |
96 | 98 |
parameters.setDBFFile(SHP.getDbfFile(new File(file))); |
trunk/libraries/libDataSourceBaseDrivers/src-test/org/gvsig/data/datastores/vectorial/file/shp/SHPTest.java | ||
---|---|---|
5 | 5 |
|
6 | 6 |
import junit.framework.TestCase; |
7 | 7 |
|
8 |
import org.gvsig.data.DataManager; |
|
9 |
import org.gvsig.data.IDataStoreParameters; |
|
8 | 10 |
import org.gvsig.data.datastores.vectorial.file.DataStoreTest; |
9 | 11 |
import org.gvsig.data.datastores.vectorial.file.shp.Register; |
10 | 12 |
import org.gvsig.data.datastores.vectorial.file.shp.SHPStore; |
... | ... | |
24 | 26 |
import com.iver.cit.gvsig.fmap.drivers.dbf.TestDbf; |
25 | 27 |
|
26 | 28 |
public class SHPTest extends TestCase { |
27 |
SHPStore store = new SHPStore(); |
|
29 |
|
|
28 | 30 |
private File fileNormal = new File(DataStoreTest.class.getResource("data/prueba.shp").getFile()); |
29 | 31 |
private File fileGeometryNull = new File(DataStoreTest.class.getResource("data/pruebaNull.shp").getFile()); |
30 | 32 |
|
... | ... | |
43 | 45 |
shp(fileGeometryNull); |
44 | 46 |
} |
45 | 47 |
private void shp(File file){ |
46 |
SHPStoreParameters shpParameters=new SHPStoreParameters(); |
|
48 |
DataManager manager = DataManager.getManager(); |
|
49 |
SHPStore store = null; |
|
50 |
SHPStoreParameters shpParameters=null; |
|
51 |
shpParameters=(SHPStoreParameters)manager.createDataStoreParameters(SHPStore.DATASTORE_NAME); |
|
47 | 52 |
shpParameters.setSHPFile(file); |
48 | 53 |
shpParameters.setDBFFile(SHP.getDbfFile(file)); |
49 | 54 |
shpParameters.setSHXFile(SHP.getShxFile(file)); |
55 |
|
|
50 | 56 |
try { |
51 |
store.init(shpParameters);
|
|
57 |
store= (SHPStore)manager.createDataStore((IDataStoreParameters)shpParameters);
|
|
52 | 58 |
} catch (InitializeException e) { |
53 | 59 |
// TODO Auto-generated catch block |
54 | 60 |
e.printStackTrace(); |
... | ... | |
98 | 104 |
} |
99 | 105 |
} |
100 | 106 |
} |
107 |
iter=null; |
|
108 |
featureCollection.dispose(); |
|
101 | 109 |
|
102 | 110 |
try { |
103 | 111 |
store.close(); |
trunk/libraries/libDataSourceBaseDrivers/src-test/org/gvsig/data/datastores/vectorial/file/dbf/DBFTest.java | ||
---|---|---|
5 | 5 |
|
6 | 6 |
import junit.framework.TestCase; |
7 | 7 |
|
8 |
import org.gvsig.data.DataManager; |
|
8 | 9 |
import org.gvsig.data.datastores.vectorial.file.DataStoreTest; |
9 | 10 |
import org.gvsig.data.datastores.vectorial.file.dbf.DBFStore; |
10 | 11 |
import org.gvsig.data.datastores.vectorial.file.dbf.DBFStoreParameters; |
... | ... | |
22 | 23 |
import com.iver.cit.gvsig.fmap.drivers.dbf.TestDbf; |
23 | 24 |
|
24 | 25 |
public class DBFTest extends TestCase { |
25 |
DBFStore store = new DBFStore(); |
|
26 | 26 |
private File file = new File(DataStoreTest.class.getResource("data/prueba.dbf").getFile()); |
27 | 27 |
|
28 | 28 |
|
... | ... | |
35 | 35 |
} |
36 | 36 |
|
37 | 37 |
public void testInitialize() { |
38 |
DBFStoreParameters dbfParameters=new DBFStoreParameters(); |
|
38 |
DataManager manager = DataManager.getManager(); |
|
39 |
Register.selfRegister(); |
|
40 |
|
|
41 |
DBFStore store=null; |
|
42 |
DBFStoreParameters dbfParameters; |
|
43 |
|
|
44 |
dbfParameters=(DBFStoreParameters)manager.createDataStoreParameters(DBFStore.DATASTORE_NAME); |
|
39 | 45 |
dbfParameters.setDBFFile(file); |
46 |
|
|
47 |
|
|
40 | 48 |
try { |
41 |
store.init(dbfParameters);
|
|
49 |
store = (DBFStore)manager.createDataStore(dbfParameters);
|
|
42 | 50 |
} catch (InitializeException e) { |
43 | 51 |
// TODO Auto-generated catch block |
44 | 52 |
e.printStackTrace(); |
... | ... | |
85 | 93 |
} |
86 | 94 |
} |
87 | 95 |
} |
96 |
iter = null; |
|
97 |
featureCollection.dispose(); |
|
88 | 98 |
|
89 | 99 |
try { |
90 | 100 |
store.close(); |
trunk/libraries/libDataSourceBaseDrivers/src/org/gvsig/data/datastores/vectorial/file/dbf/DBFFeatureCollection.java | ||
---|---|---|
239 | 239 |
this.featureIDs = null; |
240 | 240 |
this.featureType = null; |
241 | 241 |
this.store = null; |
242 |
this.parser.clear(); |
|
243 | 242 |
this.parser = null; |
244 | 243 |
this.featureManager = null; |
245 | 244 |
; |
Also available in: Unified diff