[jboss-svn-commits] JBL Code SVN: r8354 - labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config

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

Author: ddegroff
Date: 2006-12-15 13:01:37 -0500 (Fri, 15 Dec 2006)
New Revision: 8354

Modified:
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/XmlValidatorUnitTest.java
Log:
Improved error handling, and resolved lack of validating in XmlValidatorImpl

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/XmlValidatorUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/XmlValidatorUnitTest.java	2006-12-15 18:00:45 UTC (rev 8353)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/XmlValidatorUnitTest.java	2006-12-15 18:01:37 UTC (rev 8354)
@@ -27,6 +27,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import java.io.IOException;
 import java.io.StringWriter;
 import java.util.Collection;
 
@@ -36,16 +37,16 @@
 import org.xml.sax.InputSource;
 import org.jboss.soa.esb.listeners.config.XmlValidatorImpl;
 import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import junit.framework.JUnit4TestAdapter;
+import junit.framework.TestCase;
 
 /**
  * XmlValidator unit tests.
  * @author <a href="mailto:ddegroff at ddegroff.com">ddegroff at ddegroff.com</a>
  */
-public class XmlValidatorUnitTest {
+public class XmlValidatorUnitTest extends TestCase {
 	
 	private static String testXml;
 	private static InputSource inputSource;
@@ -53,8 +54,57 @@
 	private static XmlValidatorImpl xmlValidation;
 	private boolean isValid = false;
 	
+	@Override
+	protected void setUp() throws Exception
+	{
+		testXml = "etc/examples/listeners/jbossesb_config_01.xml";
+		File validationFile = new File(testXml);
+		try {
+			if (validationFile.exists()) {
+				System.err.println("validationFile "+testXml+" exists");
+			} else {
+				throw new IOException();
+			}
+		} catch (IOException e) {
+			System.err.println("validationFile "+testXml+" does not exist");
+		}
+		try {
+			InputStream inputStream = new FileInputStream(validationFile);
+			inputSource = new InputSource(inputStream);
+			xmlValidation = new XmlValidatorImpl(inputSource);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		String validationFileName = TestEnvironmentUtil.getUserDir("product") 
+			+ "etc/schemas/xml/jbossesb-1.0.xsd";
+		try {
+			validationSource = new StreamSource(validationFileName);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}		
+	}
+	
+	@Test 
+	public void validateTestXml() throws Exception {
+		isValid = xmlValidation.validate(inputSource);
+		if (isValid) {
+			System.err.println(testXml+" is valid");
+		} else {
+			System.err.println(testXml+" is invalid -- see getValidationResults()");
+			Collection<String> validationResults = xmlValidation.getValidationResults();
+
+			if (validationResults.size() == 0) {
+			} else {
+				System.err.println("Validation Results:");
+				Object[] valResults = validationResults.toArray();
+    		for (int i = 0; i < validationResults.size(); i++) {
+        	System.err.println(valResults[i].toString());
+    		}
+			}
+		}
+	}
 	@Test
-	public void validateTestXml() throws Exception {
+	public void validateTestXmlAndSchema() throws Exception {
 		isValid = xmlValidation.validate(inputSource,validationSource);
 		if (isValid) {
 			System.err.println(testXml+" is valid");
@@ -95,38 +145,14 @@
 			if (validationResults.size() == 0) {
 			} else {
 				System.err.println("Validation Results:");
-				String[] valResults = (String[])validationResults.toArray();
+				Object[] valResults = validationResults.toArray();
     		for (int i = 0; i < validationResults.size(); i++) {
         	System.err.println(valResults[i]);
     		}
 			}
 		}
 	}
-	
-	@BeforeClass
-	public static void setup()
-	{
-		testXml = TestEnvironmentUtil.getUserDir("product") 
-			+ "core/listeners/tests/src/org/jboss/soa/esb/listeners/config/jbossesb_config_01.xml";
-		File validationFile = new File(testXml);
-		try {
-			InputStream inputStream = new FileInputStream(validationFile);
-			inputSource = new InputSource(inputStream);
-			xmlValidation = new XmlValidatorImpl(inputSource);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		String validationFileName = TestEnvironmentUtil.getUserDir("product") 
-			+ "etc/schemas/xml/jbossesb.xsd";
-		try {
-			validationSource = new StreamSource(validationFileName);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
 		
-	}
-	
-	
 	public static junit.framework.Test suite() {
 		return new JUnit4TestAdapter(XmlValidatorUnitTest.class);
 	}