Changeset 30095

Show
Ignore:
Timestamp:
02/12/08 18:45:08 (9 months ago)
Author:
bstefanescu
Message:

merged from trunk: 29682

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • org.nuxeo.ecm.core/branches/1.4/nuxeo-core-jcr-connector-test/src/test/java/org/nuxeo/ecm/core/repository/jcr/model/TestQuery.java

    r22682 r30095  
    182182    @SuppressWarnings("unchecked") 
    183183    public void testResultQueryGetObject() throws Exception { 
    184         Map<String, Map<String, Object>> map; 
    185         Map<String, Object> subMap; 
    186184 
    187185        Document parent = root.addChild("root", "Folder"); 
    …… 
    196194        QueryResult qr = session.createQuery(queryStr, Query.Type.NXQL).execute(); 
    197195        qr.next(); 
    198         map = (Map<String, Map<String, Object>>) qr.getObject(); 
     196        Map<String, Map<String, Object>> map = (Map<String, Map<String, Object>>) qr.getObject(); 
    199197        assertNotNull(map); 
    200         subMap = map.get("default"); 
     198        Map<String, Object> subMap = map.get("default"); 
    201199        assertNotNull(subMap); 
    202200        assertEquals("1 filename", subMap.get("filename")); 

  • org.nuxeo.ecm.core/branches/1.4/nuxeo-core-jcr-connector-test/src/test/java/org/nuxeo/ecm/core/repository/jcr/versioning/TestVersioning.java

    r25728 r30095  
    230230        assertNotNull(ver); 
    231231 
    232         try { 
    233             ver.remove(); 
    234             //???fail("the system must not allow removal of a protected (frozen) node"); 
    235         } catch (Exception e) { 
    236             // ok 
    237         } 
     232        session.save(); 
     233        ver.remove(); 
     234        session.save(); 
    238235    } 
    239236}