[jboss-svn-commits] JBoss Common SVN: r2987 - in jbossxb/trunk/src: test/java/org/jboss/test/xml/elementorder/test and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2009-02-18 12:15:47 -0500 (Wed, 18 Feb 2009)
New Revision: 2987

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java
   jbossxb/trunk/src/test/java/org/jboss/test/xml/elementorder/test/ElementOrderUnitTestCase.java
Log:
changed error message a bit

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java	2009-02-18 15:55:43 UTC (rev 2986)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java	2009-02-18 17:15:47 UTC (rev 2987)
@@ -472,9 +472,9 @@
                      {
                         TermBinding t = cursor.getParticle().getTerm();
                         StringBuffer sb = new StringBuffer(250);
-                        sb.append("Element ").append(startName).append(" cannot appear in this position (possibly child elements of ")
-                        .append(((ElementBinding)stack.peek().particle.getTerm()).getQName()).append(" are in the wrong order).")
-                        .append(" Correct order of the current ");
+                        sb.append("Element ").append(startName).append(" cannot appear in this position under ")
+                        .append(((ElementBinding)stack.peek().particle.getTerm()).getQName())
+                        .append(". Expected content of the current ");
                         
                         QName name = ((ModelGroupBinding)t).getQName();
                         if(name != null)

Modified: jbossxb/trunk/src/test/java/org/jboss/test/xml/elementorder/test/ElementOrderUnitTestCase.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/xml/elementorder/test/ElementOrderUnitTestCase.java	2009-02-18 15:55:43 UTC (rev 2986)
+++ jbossxb/trunk/src/test/java/org/jboss/test/xml/elementorder/test/ElementOrderUnitTestCase.java	2009-02-18 17:15:47 UTC (rev 2987)
@@ -60,8 +60,8 @@
       catch(JBossXBException e)
       {
          JBossXBRuntimeException re = (JBossXBRuntimeException) e.getCause();
-         assertEquals("Element first cannot appear in this position (possibly child elements of root are in the wrong order). " +
-               "Correct order of the current sequence group: first? second? {sequence abSequence}? {sequence cdSequence}*", re.getMessage());
+         assertEquals("Element first cannot appear in this position under root. " +
+               "Expected content of the current sequence group: first? second? {sequence abSequence}? {sequence cdSequence}*", re.getMessage());
       }
    }
    
@@ -84,8 +84,8 @@
       catch(JBossXBException e)
       {
          JBossXBRuntimeException re = (JBossXBRuntimeException) e.getCause();
-         assertEquals("Element a cannot appear in this position (possibly child elements of root are in the wrong order). " +
-               "Correct order of the current sequence group: first? second? {sequence abSequence}? {sequence cdSequence}*", re.getMessage());
+         assertEquals("Element a cannot appear in this position under root. " +
+               "Expected content of the current sequence group: first? second? {sequence abSequence}? {sequence cdSequence}*", re.getMessage());
       }
    }