Mercurialhg/netbeans/misc / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | help
Put back in logic to do relative URI lookups (now done thru reflection since it uses jdk1.4 classes). BLD200210170100
authorcliffwd@netbeans.org
Wed, 16 Oct 2002 17:51:59 +0000
changeset 1093eee665d0d48c
parent 1092 848b5a20555a
child 1094 a2fec0d65973
Put back in logic to do relative URI lookups (now done thru reflection since it uses jdk1.4 classes).
schema2beans/test/unit/src/data/TestMerge.java file | annotate | diff | revisions
schema2beans/test/unit/src/data/goldenfiles/TestMain/testMerge.pass file | annotate | diff | revisions 
     1.1 --- a/schema2beans/test/unit/src/data/TestMerge.java	Wed Oct 16 17:38:29 2002 +0000
     1.2 +++ b/schema2beans/test/unit/src/data/TestMerge.java	Wed Oct 16 17:51:59 2002 +0000
     1.3 @@ -36,7 +36,7 @@
     1.4      // to make sure that any change in schema2beans does not introduce a 
     1.5      // significant increase of mem usage.
     1.6      //
     1.7 -    static float memUsageReference = 5314;
     1.8 +    static float memUsageReference = 5343;
     1.9  
    1.10      
    1.11      public class MyListener implements PropertyChangeListener {

     2.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testMerge.pass	Wed Oct 16 17:38:29 2002 +0000
     2.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testMerge.pass	Wed Oct 16 17:51:59 2002 +0000
     2.3 @@ -211,28 +211,28 @@
     2.4  out: TestMerge Merging attributes shouldn't be equals (diff an attr) -> OK
     2.5  out: TestMerge - <Add Lnr:Book Evt:/Book:Good Src:book.Book>
     2.6  out: TestMerge - <Book[-1] - Parent: /book.Book>
     2.7 -out: TestMerge - <Rmv Lnr:Book Evt:/Book/Chapter.11fi0 Src:book.Book>
     2.8 -out: TestMerge - <Chapter[0] - Parent: Book/book.Book>
     2.9 -out: TestMerge - <Rmv Lnr:Book Evt:/Book/Chapter.121i0 Src:book.Book>
    2.10 -out: TestMerge - <Chapter[0] - Parent: Book/book.Book>
    2.11 -out: TestMerge - <Add Lnr:Book Evt:/Book/Chapter.16b Src:book.Book>
    2.12 -out: TestMerge - <Chapter[1] - Parent: Book/book.Book>
    2.13 -out: TestMerge - <Add Lnr:Book Evt:/Book/Chapter.16b:Title Src:book.Book>
    2.14 -out: TestMerge - <Chapter[1] - Parent: Book/book.Book>
    2.15 -out: TestMerge - <Add Lnr:Book Evt:/Book/Chapter.16f Src:book.Book>
    2.16 -out: TestMerge - <Chapter[2] - Parent: Book/book.Book>
    2.17 -out: TestMerge - <Add Lnr:Book Evt:/Book/Chapter.16f:Title Src:book.Book>
    2.18 -out: TestMerge - <Chapter[2] - Parent: Book/book.Book>
    2.19  out: TestMerge - <Rmv Lnr:Book Evt:/Book/Index.127i0 Src:book.Book>
    2.20  out: TestMerge - <Index[0] - Parent: Book/book.Book>
    2.21 -out: TestMerge - <Add Lnr:Book Evt:/Book/Index.174 Src:book.Book>
    2.22 +out: TestMerge - <Add Lnr:Book Evt:/Book/Index.16e Src:book.Book>
    2.23  out: TestMerge - <Index[1] - Parent: Book/book.Book>
    2.24 -out: TestMerge - <Add Lnr:Book Evt:/Book/Index.174:Color Src:book.Book>
    2.25 +out: TestMerge - <Add Lnr:Book Evt:/Book/Index.16e:Color Src:book.Book>
    2.26  out: TestMerge - <Index[1] - Parent: Book/book.Book>
    2.27  out: TestMerge - <Add Lnr:Book Evt:/Book/Summary:Length Src:book.Book>
    2.28  out: TestMerge - <Summary[-1] - Parent: Book/book.Book>
    2.29  out: TestMerge - <Add Lnr:Book Evt:/Book/Summary:Lang Src:book.Book>
    2.30  out: TestMerge - <Summary[-1] - Parent: Book/book.Book>
    2.31 +out: TestMerge - <Rmv Lnr:Book Evt:/Book/Chapter.11fi0 Src:book.Book>
    2.32 +out: TestMerge - <Chapter[0] - Parent: Book/book.Book>
    2.33 +out: TestMerge - <Rmv Lnr:Book Evt:/Book/Chapter.121i0 Src:book.Book>
    2.34 +out: TestMerge - <Chapter[0] - Parent: Book/book.Book>
    2.35 +out: TestMerge - <Add Lnr:Book Evt:/Book/Chapter.170 Src:book.Book>
    2.36 +out: TestMerge - <Chapter[1] - Parent: Book/book.Book>
    2.37 +out: TestMerge - <Add Lnr:Book Evt:/Book/Chapter.170:Title Src:book.Book>
    2.38 +out: TestMerge - <Chapter[1] - Parent: Book/book.Book>
    2.39 +out: TestMerge - <Add Lnr:Book Evt:/Book/Chapter.174 Src:book.Book>
    2.40 +out: TestMerge - <Chapter[2] - Parent: Book/book.Book>
    2.41 +out: TestMerge - <Add Lnr:Book Evt:/Book/Chapter.174:Title Src:book.Book>
    2.42 +out: TestMerge - <Chapter[2] - Parent: Book/book.Book>
    2.43  out: TestMerge Merging attributes should be equals -> OK
    2.44  out: TestMerge Merging attributes attr on root != null -> OK
    2.45  out: TestMerge Merging attributes attr on root -> OK
    2.46 @@ -261,9 +261,6 @@
    2.47  out:   <author>
    2.48  out: 	Mikey Mouse
    2.49  out: 	</author>
    2.50 -out:   <author>
    2.51 -out: 	Donald Duck
    2.52 -out: 	</author>
    2.53  out:   <index color="blue" cross-ref="no">
    2.54  out:     <word>
    2.55  out: 			Good book
    2.56 @@ -277,6 +274,9 @@
    2.57  out: 		</line>
    2.58  out:     </ref>
    2.59  out:   </index>
    2.60 +out:   <author>
    2.61 +out: 	Donald Duck
    2.62 +out: 	</author>
    2.63  out:   <chapter>
    2.64  out:     <comment>
    2.65  out: 		Empty chapter
hg/netbeans/misc