Revision 2741 org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/test/java/org/gvsig/vcsgis/lib/impl/Test13Merge.java
| Test13Merge.java | ||
|---|---|---|
| 24 | 24 |
import static org.gvsig.vcsgis.lib.VCSGisManager.OP_INSERT; |
| 25 | 25 |
import static org.gvsig.vcsgis.lib.VCSGisManager.OP_UPDATE; |
| 26 | 26 |
import org.gvsig.vcsgis.lib.repository.VCSGisRepository; |
| 27 |
import org.gvsig.vcsgis.lib.vcsgis; |
|
| 28 | 27 |
import org.gvsig.vcsgis.lib.vcsgisadmin; |
| 29 | 28 |
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspace; |
| 30 | 29 |
import org.gvsig.vcsgis.lib.workspace.tables.RemoteChangesTable; |
| ... | ... | |
| 143 | 142 |
|
| 144 | 143 |
// ------------------------------------------------------------ |
| 145 | 144 |
// Creamos workspace1 y lo abrimos. |
| 146 |
r = vcsgis.init_workspace(ws1file, repo, "Test update1");
|
|
| 145 |
r = manager.initWorkspace(ws1file, repo, "Test update1", null);
|
|
| 147 | 146 |
assertEquals("init_ws1 status", ERR_NO_ERROR, r);
|
| 148 | 147 |
|
| 149 |
VCSGisWorkspace ws1 = vcsgis.open_workspace(ws1file);
|
|
| 148 |
VCSGisWorkspace ws1 = manager.openWorkspace(ws1file);
|
|
| 150 | 149 |
TestUtils.h2sql_workspace(ws1); |
| 151 | 150 |
|
| 152 | 151 |
// ------------------------------------------------------------ |
| ... | ... | |
| 171 | 170 |
// ------------------------------------------------------------ |
| 172 | 171 |
// Inicializamos el workspace2 asociandolo al mismo repositorio que |
| 173 | 172 |
// workspace1 y lo abrimos. |
| 174 |
r = vcsgis.init_workspace(ws2file, repo, "Test update2");
|
|
| 173 |
r = manager.initWorkspace(ws2file, repo, "Test update2",null);
|
|
| 175 | 174 |
assertEquals("init_ws2 status", ERR_NO_ERROR, r);
|
| 176 |
VCSGisWorkspace ws2 = vcsgis.open_workspace(ws2file);
|
|
| 175 |
VCSGisWorkspace ws2 = manager.openWorkspace(ws2file);
|
|
| 177 | 176 |
TestUtils.h2sql_workspace(ws2); |
| 178 | 177 |
|
| 179 | 178 |
ws2.checkout("test");
|
Also available in: Unified diff