Revision 3073 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

View differences:

Test13Merge.java
227 227 
        check(features, 5, 8, "HHH");
228 228
229 229 
        FeatureStore changes = ws2.getFeatureStore(WorkspaceChangesTable.TABLE_NAME);
230 
        checkLocalChange(store2, changes, "00000000000065abcdef0123456789", OP_INSERT, 8, "HHH");
231 
        checkLocalChange(store2, changes, "00000000000007abcdef0123456789", OP_UPDATE, 2, "BBB");
232 
        checkLocalChange(store2, changes, "00000000000068abcdef0123456789", OP_INSERT, 5, "EEE");
233 
        checkLocalChange(store2, changes, "00000000000034abcdef0123456789", OP_DELETE, 7, "GGG");
230 
        checkLocalChange(store2, changes, "00000000000066abcdef0123456789", OP_INSERT, 8, "HHH");
231 
        checkLocalChange(store2, changes, "00000000000008abcdef0123456789", OP_UPDATE, 2, "BBB");
232 
        checkLocalChange(store2, changes, "00000000000069abcdef0123456789", OP_INSERT, 5, "EEE");
233 
        checkLocalChange(store2, changes, "00000000000035abcdef0123456789", OP_DELETE, 7, "GGG");
234 234 

  		




  235
  235
  
    
        r = ws2.commit();


  		




  236
  236
  
    
        assertEquals("ws2.commit-1 status", ERR_NO_ERROR, r);


  		












Also available in:  Unified diff