[jboss-cvs] JBossAS SVN: r83136 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/rar and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Jan 21 01:59:14 EST 2009


Author: jeff.zhang
Date: 2009-01-21 01:59:14 -0500 (Wed, 21 Jan 2009)
New Revision: 83136

Added:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16NegativeUnitTestCase.java
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testMinimal.xml
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserEISType.xml
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserRAVersion.xml
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserVendorName.xml
Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/LicenseMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java
Log:
[JBMETA-166] add some negative test for ra.xml

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java	2009-01-21 06:56:27 UTC (rev 83135)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java	2009-01-21 06:59:14 UTC (rev 83136)
@@ -143,6 +143,7 @@
     * 
     * @param vendorName the vendor name
     */
+   @XmlElement(required=true)
    public void setVendorName(String vendorName)
    {
       this.vendorName = vendorName;
@@ -163,7 +164,7 @@
     * 
     * @param eisType the eis type
     */
-   @XmlElement(name="eis-type")
+   @XmlElement(name="eis-type", required=true)
    public void setEISType(String eisType)
    {
       this.eisType = eisType;
@@ -184,7 +185,7 @@
     * 
     * @param version the resource adapter version
     */
-   @XmlElement(name="resourceadapter-version")
+   @XmlElement(name="resourceadapter-version", required=true)
    public void setRAVersion(String version)
    {
       this.raVersion = version;
@@ -209,8 +210,8 @@
       this.lmd = lmd;
    }
    
-   @XmlElement(name="resourceadapter")
-   public void setRa(ResourceAdapterMetaData ra) {
+   @XmlElement(name="resourceadapter", required=true)
+   public void setRa(ResourceAdapterMetaData ra) throws Exception{
       this.ra = ra;
    }
    public ResourceAdapterMetaData getRa() {

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/LicenseMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/LicenseMetaData.java	2009-01-21 06:56:27 UTC (rev 83135)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/LicenseMetaData.java	2009-01-21 06:59:14 UTC (rev 83136)
@@ -56,7 +56,7 @@
     * 
     * @param required the required flag
     */
-   @XmlElement(name="license-required")
+   @XmlElement(name="license-required", required=true)
    public void setRequired(boolean required)
    {
       this.required = required;

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java	2009-01-21 06:56:27 UTC (rev 83135)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java	2009-01-21 06:59:14 UTC (rev 83136)
@@ -66,6 +66,22 @@
       assertEverything(connector);
    }
    
+   public void testMinimal() throws Exception
+   {
+      JCA16MetaData connector = unmarshal();
+      assertNotNull(connector);
+      assertTrue(connector.getVendorName().startsWith("Red"));
+      assertTrue(connector.getEISType().startsWith("JMS"));
+      assertEquals(connector.getRAVersion(), getRAVersion());
+      assertNotNull(connector.getRa());
+      assertNull(connector.getRa().getRaClass());
+      assertNull(connector.getRa().getConfigProperty());
+      assertNull(connector.getRa().getOutboundRa());
+      assertNull(connector.getRa().getInboundRa());
+      assertNull(connector.getRa().getAdminObjects());
+      assertNull(connector.getRa().getSecurityPermissions());
+   }
+   
    protected JCA16MetaData unmarshal() throws Exception
    {
       return unmarshal(JCA16MetaData.class);

Added: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16NegativeUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16NegativeUnitTestCase.java	                        (rev 0)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16NegativeUnitTestCase.java	2009-01-21 06:59:14 UTC (rev 83136)
@@ -0,0 +1,94 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.metadata.rar;
+
+import java.io.StringWriter;
+import java.io.PrintWriter;
+
+import org.jboss.metadata.rar.spec.JCA16MetaData;
+import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
+
+import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+/**
+ * Test ResourceAdapter ra.xml metadata.
+ *
+ * @author Jeff Zhang
+ * @version $Revision:$
+ */
+public class RA16NegativeUnitTestCase extends AbstractJavaEEEverythingTest
+{
+
+   public static SchemaBindingResolver initResolver()
+   {
+      DefaultSchemaResolver resolver = new DefaultSchemaResolver();
+      resolver.addClassBindingForLocation("connector_1_6.xsd", JCA16MetaData.class);
+      return resolver;
+   }
+
+   public RA16NegativeUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   protected void setUp() throws Exception
+   {
+      super.setUp();
+      enableTrace("org.jboss.xb");
+   }
+
+   public void testParserRAVersion() throws Exception
+   {
+      negativeParserTest("resourceadapter-version");
+   }
+   
+   public void testParserVendorName() throws Exception
+   {
+      negativeParserTest("vendor-name");
+   }
+   
+   public void testParserEISType() throws Exception
+   {
+      negativeParserTest("eis-type");
+   }
+   
+   private void negativeParserTest(String element) throws Exception
+   {
+      try
+      {
+         JCA16MetaData connector = unmarshal();
+         fail("testMissRAVersion should be failed since we miss " + element);
+      } catch (Exception expected)
+      {
+         StringWriter sw = new StringWriter();
+         PrintWriter pw = new PrintWriter(sw);
+         expected.printStackTrace(pw);
+         assertTrue(sw.toString().indexOf(element) > 0);
+      }      
+   }
+
+   protected JCA16MetaData unmarshal() throws Exception
+   {
+      return unmarshal(JCA16MetaData.class);
+   }
+
+}

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java	2009-01-21 06:56:27 UTC (rev 83135)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java	2009-01-21 06:59:14 UTC (rev 83136)
@@ -104,7 +104,9 @@
             if(pathname.isDirectory())
                pathname.listFiles(this);
             
-            if(pathname.getName().endsWith(".xml") && !IGNORE.contains(pathname.getName()))
+            if(pathname.getName().endsWith(".xml") && 
+               !IGNORE.contains(pathname.getName()) &&
+               pathname.getName().indexOf("Negative_testParser") <=0) //*Negative_testParser*.xml should not be well validated
             {
                names.add(pathname.getName());
                if(!isValid(pathname))

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testMinimal.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testMinimal.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testMinimal.xml	2009-01-21 06:59:14 UTC (rev 83136)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id:  $ -->
+
+<connector xmlns="http://java.sun.com/xml/ns/javaee"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+           http://java.sun.com/xml/ns/j2ee/connector_1_6.xsd"
+           version="1.6" metadata-complete="true">
+
+   <vendor-name>Red Hat Middleware LLC</vendor-name>
+   <eis-type>JMS 1.1 Server</eis-type>
+   <resourceadapter-version>6.0</resourceadapter-version>
+
+   <resourceadapter>
+   </resourceadapter>
+</connector>

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserEISType.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserEISType.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserEISType.xml	2009-01-21 06:59:14 UTC (rev 83136)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id:  $ -->
+
+<connector xmlns="http://java.sun.com/xml/ns/javaee"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+           http://java.sun.com/xml/ns/j2ee/connector_1_6.xsd"
+           version="1.6" metadata-complete="true">
+
+   <vendor-name>Red Hat Middleware LLC</vendor-name>
+
+   <resourceadapter-version>6.0</resourceadapter-version>
+
+   <resourceadapter>
+   </resourceadapter>
+</connector>

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserRAVersion.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserRAVersion.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserRAVersion.xml	2009-01-21 06:59:14 UTC (rev 83136)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id:  $ -->
+
+<connector xmlns="http://java.sun.com/xml/ns/javaee"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+           http://java.sun.com/xml/ns/j2ee/connector_1_6.xsd"
+           version="1.6" metadata-complete="true">
+
+   <vendor-name>Red Hat Middleware LLC</vendor-name>
+   <eis-type>JMS 1.1 Server</eis-type>
+
+
+   <resourceadapter>
+   </resourceadapter>
+</connector>

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserVendorName.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserVendorName.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserVendorName.xml	2009-01-21 06:59:14 UTC (rev 83136)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id:  $ -->
+
+<connector xmlns="http://java.sun.com/xml/ns/javaee"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+           http://java.sun.com/xml/ns/j2ee/connector_1_6.xsd"
+           version="1.6" metadata-complete="true">
+
+
+   <eis-type>JMS 1.1 Server</eis-type>
+   <resourceadapter-version>6.0</resourceadapter-version>
+
+   <resourceadapter>
+   </resourceadapter>
+</connector>




More information about the jboss-cvs-commits mailing list