Revision 3391 org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/test/java/org/gvsig/vcsgis/lib/impl/Test14UpdateWithConflict.java
| Test14UpdateWithConflict.java | ||
|---|---|---|
| 464 | 464 |
assertEquals("ws2.update-1 status", ERR_NO_ERROR, r);
|
| 465 | 465 |
|
| 466 | 466 |
FeatureStore changes = ws2.getFeatureStore(WorkspaceChangesTable.TABLE_NAME); |
| 467 |
checkLocalChange(store2, changes, "00000000000041abcdef0123456789", OP_INSERT, 4, "DD2", STATE_CONFLICT);
|
|
| 467 |
checkLocalChange(store2, changes, "00000000000037abcdef0123456789", OP_INSERT, 4, "DD2", STATE_CONFLICT);
|
|
| 468 | 468 |
|
| 469 | 469 |
|
| 470 | 470 |
// Actualizamos (update) la tabla "test" en el workspace2 |
| ... | ... | |
| 560 | 560 |
FeatureStore changes = ws2.getFeatureStore(WorkspaceChangesTable.TABLE_NAME); |
| 561 | 561 |
assertEquals("ws2-changes size", 2, changes.size64());
|
| 562 | 562 |
|
| 563 |
checkLocalChange(store2, changes, "00000000000033abcdef0123456789", OP_DELETE, 4, "DD1", -1);
|
|
| 563 |
checkLocalChange(store2, changes, "00000000000029abcdef0123456789", OP_DELETE, 4, "DD1", -1);
|
|
| 564 | 564 |
|
| 565 |
checkLocalChange(store2, changes, "00000000000041abcdef0123456789", OP_INSERT, 4, "DD2", -1);
|
|
| 565 |
checkLocalChange(store2, changes, "00000000000037abcdef0123456789", OP_INSERT, 4, "DD2", -1);
|
|
| 566 | 566 |
|
| 567 | 567 |
} |
| 568 | 568 |
|
Also available in: Unified diff