dmarston    00/12/17 13:51:19

  Added:       test/tests/conf-gold/conflictres conflictres24.out
                        conflictres02.out conflictres03.out
                        conflictres04.out conflictres05.out
                        conflictres06.out conflictres07.out
                        conflictres08.out conflictres09.out
                        conflictres10.out conflictres11.out
                        conflictres12.out conflictres13.out
                        conflictres14.out conflictres15.out
                        conflictres16.out conflictres17.out
                        conflictres18.out conflictres19.out
                        conflictres20.out conflictres21.out
                        conflictres22.out conflictres23.out
                        conflictres01.out
  Log:
  Copy of tests in Lotus/IBM repository
  
  Revision  Changes    Path
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres24.out
  
  Index: conflictres24.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>This template should be matched.</out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres02.out
  
  Index: conflictres02.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>Match-of-wildcard</out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres03.out
  
  Index: conflictres03.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>Match-of-node-type</out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres04.out
  
  Index: conflictres04.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>true</out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres05.out
  
  Index: conflictres05.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>Match of non-simple '/'</out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres06.out
  
  Index: conflictres06.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>Match-on-node-name,Match-predicated-node-name</out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres07.out
  
  Index: conflictres07.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>Match-of-non-simple '/'</out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres08.out
  
  Index: conflictres08.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>Match-of-non-simple '[...]'</out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres09.out
  
  Index: conflictres09.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>In Include: Testing 1 2 3 </out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres10.out
  
  Index: conflictres10.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>
    Second Match-of-wildcard
  </out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres11.out
  
  Index: conflictres11.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>Match-of-node,Match-of-text,</out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres12.out
  
  Index: conflictres12.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>
    
      Child,
      Child,Descendant,
      Descendant,
    
  </out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres13.out
  
  Index: conflictres13.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>
    a:
      b:c-Wildcard-middle,
      b:d-Wildcard-last,
      e:c-Wildcard-middle,
    
  </out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres14.out
  
  Index: conflictres14.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>
    a:
      b:c-Wildcard-last,
      d:c-Two-wildcards,
    
  </out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres15.out
  
  Index: conflictres15.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>
    a:
      b:c-Grandchild,
      b:c-Grandchild,d:e:
      e:c-Grandchild,
      e:b:c-Descendant,
      e:c-Grandchild,d:
    
  </out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres16.out
  
  Index: conflictres16.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>Match-wildcard,Match-predicated-wildcard,</out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres17.out
  
  Index: conflictres17.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>Match-wildcard,Match-wildcard,</out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres18.out
  
  Index: conflictres18.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>
    a: Found x1 attribute,x2-Wildcard,
  </out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres19.out
  
  Index: conflictres19.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>
    a...
  got x1 attribute,x2-Wildcard,got ped:x3 attribute,ped:x4-Qualified-wildcard,
  </out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres20.out
  
  Index: conflictres20.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>
    a-Wildcard,
    ped:a-Qualified-wildcard,
    found ped:b,
  </out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres21.out
  
  Index: conflictres21.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>Specific-text,Any-text,</out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres22.out
  
  Index: conflictres22.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>Specific-comment,Any-comment,</out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres23.out
  
  Index: conflictres23.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>
    Any-PI:a-pi
    PI-named-b:some data
    PI-by-content:b-pi
    PI-by-content:c-pi
  </out>
  
  
  1.1                  
xml-xalan/test/tests/conf-gold/conflictres/conflictres01.out
  
  Index: conflictres01.out
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <out>Match-of-qualified-name</out>
  
  

Reply via email to