[jboss-cvs] JBossAS SVN: r80740 - projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding.

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

Author: alex.loubyansky at jboss.com
Date: 2008-11-10 08:10:07 -0500 (Mon, 10 Nov 2008)
New Revision: 80740

Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationUnitTestCase.java
Log:
more informative diff message

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationUnitTestCase.java	2008-11-10 11:49:40 UTC (rev 80739)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/binding/SchemaBindingValidationUnitTestCase.java	2008-11-10 13:10:07 UTC (rev 80740)
@@ -527,24 +527,17 @@
                   }
                   log.trace(msg);
                   
-                  String flattenedMsg;
-                  Collection<QName> missing;
-                  if(xsElementParticles.size() > elementParticles.size())
-                  {
-                     missing = new ArrayList<QName>(xsElementParticles.keySet());
-                     missing.removeAll(elementParticles.keySet());
-                     flattenedMsg = "ModelGroupBinding";
-                  }
-                  else
-                  {
-                     missing = new ArrayList<QName>(elementParticles.keySet());
-                     missing.removeAll(xsElementParticles.keySet());
-                     flattenedMsg = "XSModelGroup";
-                  }
-                  
-                  log.trace("flattened " + flattenedMsg + " is missing: ");
-                  for(Iterator<QName> missingNames = missing.iterator(); missingNames.hasNext();)
+                  List<QName> missing = new ArrayList<QName>(xsElementParticles.keySet());
+                  missing.removeAll(elementParticles.keySet());
+                  log.trace("flattened ModelGroupBinding is missing: ");
+                  for (Iterator<QName> missingNames = missing.iterator(); missingNames.hasNext();)
                      log.trace("- " + missingNames.next());
+
+                  missing = new ArrayList<QName>(elementParticles.keySet());
+                  missing.removeAll(xsElementParticles.keySet());
+                  log.trace("flattened XSModelGroup is missing: ");
+                  for (Iterator<QName> missingNames = missing.iterator(); missingNames.hasNext();)
+                     log.trace("- " + missingNames.next());
                }
                fail("ModelGroupBinding particles total expected " + xsParticles.getLength() + " but was "
                      + particleBindings.size());