Revision 47283 trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.xml2db/org.gvsig.xml2db.lib/org.gvsig.xml2db.lib.impl/src/test/java/org/gvsig/xml2db/lib/impl/TestCopyXml2db.java

View differences:

TestCopyXml2db.java
2 2

  
3 3
import java.io.File;
4 4
import java.io.InputStream;
5
import java.util.Map;
6 5
import org.apache.commons.io.FilenameUtils;
7
import org.gvsig.fmap.dal.feature.FeatureType;
8 6
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters;
9 7
import org.gvsig.tools.junit.AbstractLibraryAutoInitTestCase;
10 8
import org.gvsig.xml2db.lib.api.Xml2dbManager;
......
40 38
        Xml2dbManager manager = new DefaultXml2dbManager();
41 39
        
42 40
        InputStream xml = this.getClass().getResourceAsStream("Declaracion4.xml");
43
        XMLInfo xmlinfo = manager.extractStructure(xml, null, null);
41
        XMLInfo xmlinfo = manager.extractStructure(xml, null, null, null);
44 42
        
45 43
        File dbfile = utils().getFile(new File("databases/declaracion4"));
46
        JDBCServerExplorerParameters dbparams = manager.createDatabase(dbfile, xmlinfo);
44
        JDBCServerExplorerParameters dbparams = manager.createDatabase(dbfile, xmlinfo, null);
47 45
        
48 46
        xml = this.getClass().getResourceAsStream("Declaracion4.xml");
49
        manager.copyXml2Db(xml, null, dbparams);
47
        manager.copyXml2Db(xml, null, dbparams, null);
50 48
    }
51 49

  
52 50
    public void testCopyR10graf() throws Exception {
......
56 54
        try {
57 55
            Xml2dbManager manager = new DefaultXml2dbManager();
58 56
            InputStream xml = this.getClass().getResourceAsStream(xmlfname);
59
            XMLInfo xmlinfo = manager.extractStructure(xml, null, null);
57
            XMLInfo xmlinfo = manager.extractStructure(xml, null, null, null);
60 58

  
61 59
            File dbfile = utils().getFile(new File("databases/"+FilenameUtils.removeExtension(xmlfname)));
62
            JDBCServerExplorerParameters dbparams = manager.createDatabase(dbfile, xmlinfo);
60
            JDBCServerExplorerParameters dbparams = manager.createDatabase(dbfile, xmlinfo, null);
63 61

  
64 62
            xml = this.getClass().getResourceAsStream(xmlfname);
65
            manager.copyXml2Db(xml, null, dbparams);
63
            manager.copyXml2Db(xml, null, dbparams, null);
66 64
        } catch(Throwable t) {
67 65
            LOGGER.warn("Test testCopyR10graf failed",t);
68 66
            throw t;
......
77 75
            Xml2dbManager manager = new DefaultXml2dbManager();
78 76

  
79 77
            InputStream xml = this.getClass().getResourceAsStream("victimas.xml");
80
            XMLInfo xmlinfo = manager.extractStructure(xml, null, null);
78
            XMLInfo xmlinfo = manager.extractStructure(xml, null, null, null);
81 79

  
82 80
            File dbfile = utils().getFile(new File("databases/victimas"));
83
            JDBCServerExplorerParameters dbparams = manager.createDatabase(dbfile, xmlinfo);
81
            JDBCServerExplorerParameters dbparams = manager.createDatabase(dbfile, xmlinfo, null);
84 82

  
85 83
            xml = this.getClass().getResourceAsStream("victimas.xml");
86 84
//            manager.copyXml2Db(xml, null, dbparams);

Also available in: Unified diff