1.1 --- a/schema2beans/test/unit/src/data/TestMerge.java Tue Jun 28 15:35:46 2005 +0000
1.2 +++ b/schema2beans/test/unit/src/data/TestMerge.java Wed Jun 29 11:41:21 2005 +0000
1.3 @@ -3,10 +3,6 @@
1.4 *
1.5 */
1.6
1.7 -import java.io.*;
1.8 -import java.util.*;
1.9 -import org.w3c.dom.*;
1.10 -
1.11 import org.netbeans.modules.schema2beans.*;
1.12
1.13 import java.beans.*;
1.14 @@ -92,9 +88,11 @@
1.15 out("<" + gm.getPropertyName(n) + "[" + this.index +
1.16 "]" + " - Parent: " + gm.getPropertyParentName(n) + ">");
1.17 } else {
1.18 + BaseBean propertyParent = gm.getPropertyParent(n);
1.19 + String parentClassName = propertyParent == null ? "<no class>" : propertyParent.getClass().getName();
1.20 out("<" + gm.getPropertyName(n) + "[" + this.index +
1.21 "]" + " - Parent: " + gm.getPropertyParentName(n) +
1.22 - "/" + gm.getPropertyParent(n).getClass().getName() + ">");
1.23 + "/" + parentClassName + ">");
1.24 }
1.25
1.26 //out("received " + this.oldValue + "/" + this.newValue + "/" +
2.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testAttr.pass Tue Jun 28 15:35:46 2005 +0000
2.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testAttr.pass Wed Jun 29 11:41:21 2005 +0000
2.3 @@ -31,7 +31,7 @@
2.4 out: TestAttr get enum attribute from root -> OK
2.5 out: TestAttr - Changing to another value - should get an event
2.6 out: TestAttr - <Chg Lnr:Book Evt:/Book:good Src:book.Book>
2.7 -out: TestAttr - <Attr:Book.good - ParentName: - ParentClass:book.Book>
2.8 +out: TestAttr - <Attr:Book.good - ParentName: - ParentClass:<no class>>
2.9 out: TestAttr get enum attribute from root -> OK
2.10 out: TestAttr - Book DOM content should be yes
2.11 out: book - element
2.12 @@ -246,7 +246,7 @@
2.13 out: <summary size="12">This is my summary.</summary>
2.14 out: </book>
2.15 out: TestAttr - <Chg Lnr:Book Evt:/Book:Good Src:book.Book>
2.16 -out: TestAttr - <Attr:Book.Good - ParentName: - ParentClass:book.Book>
2.17 +out: TestAttr - <Attr:Book.Good - ParentName: - ParentClass:<no class>>
2.18 out: TestAttr attributes as properties -> OK
2.19 out: TestAttr - Checking chapter title
2.20 out: TestAttr - <Add Lnr:Book Evt:/Book/Chapter.6:Title Src:book.Book>
3.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testEncoding.pass Tue Jun 28 15:35:46 2005 +0000
3.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testEncoding.pass Wed Jun 29 11:41:21 2005 +0000
3.3 @@ -85,7 +85,7 @@
3.4 out: <!-- -->
3.5 out: <!-- <!DOCTYPE FORTEDDL SYSTEM "TestEncoding.dtd" []> -->
3.6 out: <FORTEDDL>
3.7 -out: <PHASE NUMBER="1" OBJECTNAME="c1" OBJECTTYPE="MetaPlan.MetaClass">
3.8 +out: <PHASE OBJECTTYPE="MetaPlan.MetaClass" OBJECTNAME="c1" NUMBER="1">
3.9 out: <ATTRIBUTE NAME="Name">c1</ATTRIBUTE>
3.10 out: <ATTRIBUTE NAME="MethodArray">
3.11 out: <ARRAY>
3.12 @@ -113,7 +113,7 @@
3.13 out: </MYOBJECT>
3.14 out: </ARRAY>
3.15 out: </ATTRIBUTE>
3.16 -out: <ANNOTATION NAME="cr1" OBJECTTYPE="CrossRefInfo">
3.17 +out: <ANNOTATION OBJECTTYPE="CrossRefInfo" NAME="cr1">
3.18 out: <ATTRIBUTE NAME="InfoArray">
3.19 out: <ARRAY>
3.20 out: <MYOBJECT CLASS="infoItem">
4.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testMerge.pass Tue Jun 28 15:35:46 2005 +0000
4.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testMerge.pass Wed Jun 29 11:41:21 2005 +0000
4.3 @@ -238,7 +238,7 @@
4.4 out: TestMerge - new listener for Book
4.5 out: TestMerge Merging attributes shouldn't be equals (diff an attr) -> OK
4.6 out: TestMerge - <Add Lnr:Book Evt:/Book:Good Src:book.Book>
4.7 -out: TestMerge - <Book[-1] - Parent: /book.Book>
4.8 +out: TestMerge - <Book[-1] - Parent: /<no class>>
4.9 out: TestMerge - <Rmv Lnr:Book Evt:/Book/Index.127i0 Src:book.Book>
4.10 out: TestMerge - <Index[0] - Parent: Book/book.Book>
4.11 out: TestMerge - <Add Lnr:Book Evt:/Book/Index.16e Src:book.Book>
4.12 @@ -276,8 +276,6 @@
4.13 out: TestMerge Merging attributes attr on chapter -> OK
4.14 out: TestMerge - creating the DOM document
4.15 out: TestMerge - creating the bean graph for memory test
4.16 -out: TestMerge - It seems that the last schema2beans code changes have increased the memory consumption by 282.65747%
4.17 -out: TestMerge - If this is expected and acceptable, change the memUsageReference value in TestMerge.java, to be 4435
4.18 out: TestMerge - memory test done
4.19 out: TestMerge - creating the DOM document
4.20 out: TestMerge - creating the DOM document
4.21 @@ -290,7 +288,7 @@
4.22 out: <author>
4.23 out: Mikey Mouse
4.24 out: </author>
4.25 -out: <index color="blue" cross-ref="no">
4.26 +out: <index cross-ref="no" color="blue">
4.27 out: <word>
4.28 out: Good book
4.29 out: </word>
4.30 @@ -355,7 +353,7 @@
4.31 out: </paragraph>
4.32 out: </chapter>
4.33 out: <!-- BLUE -->
4.34 -out: <summary lang="us" length="123" size="12">
4.35 +out: <summary size="12" length="123" lang="us">
4.36 out: This book is about the life of a book spent between books who dreamed
4.37 out: to meet a fairy who could transform it into an XML book and travel
4.38 out: in an electronic boundary-less world.
5.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebAppDelegatorBaseBean.pass Tue Jun 28 15:35:46 2005 +0000
5.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebAppDelegatorBaseBean.pass Wed Jun 29 11:41:21 2005 +0000
5.3 @@ -250,7 +250,7 @@
5.4 out: TestWebAppDelegatorBaseBean - creating the bean graph
5.5 out: TestWebAppDelegatorBaseBean - bean graph created
5.6 out: <?xml version="1.0" encoding="UTF-8"?>
5.7 -out: <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
5.8 +out: <web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4">
5.9 out: <description>This is my Web App</description>
5.10 out: <display-name>MyWebApp</display-name>
5.11 out: <thing>
5.12 @@ -271,7 +271,7 @@
5.13 out: </web-app>
5.14 out: TestWebAppDelegatorBaseBean - making some minor changes
5.15 out: <?xml version="1.0" encoding="UTF-8"?>
5.16 -out: <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
5.17 +out: <web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4">
5.18 out: <description>Changed the description</description>
5.19 out: <display-name>MyWebApp</display-name>
5.20 out: <thing>
5.21 @@ -297,7 +297,7 @@
5.22 out: TestWebAppDelegatorBaseBean null candidate 0 is good -> OK
5.23 out: TestWebAppDelegatorBaseBean null candidate 1 is not good -> OK
5.24 out: <?xml version="1.0" encoding="UTF-8"?>
5.25 -out: <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
5.26 +out: <web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4">
5.27 out: <description>Changed the description</description>
5.28 out: <display-name>MyWebApp</display-name>
5.29 out: <thing>
5.30 @@ -328,7 +328,7 @@
5.31 out: TestWebAppDelegatorBaseBean null Got good validate exception: getWebResourceName() == null -> OK
5.32 out: TestWebAppDelegatorBaseBean null Got good validate exception: sizeUrlPattern() == 0 -> OK
5.33 out: <?xml version="1.0" encoding="UTF-8"?>
5.34 -out: <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
5.35 +out: <web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4">
5.36 out: <description>Changed the description</description>
5.37 out: <display-name>MyWebApp</display-name>
5.38 out: <thing>
5.39 @@ -360,7 +360,7 @@
5.40 out: </web-app>
5.41 out: TestWebAppDelegatorBaseBean - Add some descriptions with xml:lang attributes.
5.42 out: <?xml version="1.0" encoding="UTF-8"?>
5.43 -out: <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
5.44 +out: <web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4">
5.45 out: <description xml:lang="en">Changed the description</description>
5.46 out: <description xml:lang="de">Das ist mein App.</description>
5.47 out: <display-name>MyWebApp</display-name>
5.48 @@ -396,7 +396,7 @@
5.49 out: TestWebAppDelegatorBaseBean null thing2 -> OK
5.50 out: TestWebAppDelegatorBaseBean null thing3 -> OK
5.51 out: <?xml version="1.0" encoding="UTF-8"?>
5.52 -out: <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
5.53 +out: <web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
5.54 out: <description xml:lang="en">Changed the description</description>
5.55 out: <description xml:lang="de">Das ist mein App.</description>
5.56 out: <display-name>MyWebApp</display-name>