[jboss-cvs] JBossAS SVN: r94807 - in projects/metadata/rar/trunk/src: test/java/org/jboss/test/metadata/rar and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 13 23:50:11 EDT 2009
Author: jeff.zhang
Date: 2009-10-13 23:50:10 -0400 (Tue, 13 Oct 2009)
New Revision: 94807
Removed:
projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserConDef.xml
projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserEISType.xml
projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserRAVersion.xml
projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserReAuth.xml
projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserVendorName.xml
Modified:
projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java
projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16Base.java
projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/OutboundRaMetaData.java
projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java
projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA16NegativeUnitTestCase.java
projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testMinimal.xml
Log:
[JBMETA-222] remove some unuse negative test for xsd modify
Modified: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java 2009-10-14 03:46:40 UTC (rev 94806)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java 2009-10-14 03:50:10 UTC (rev 94807)
@@ -143,7 +143,7 @@
*
* @param vendorName the vendor name
*/
- @XmlElement(required=true)
+ @XmlElement()
public void setVendorName(String vendorName)
{
this.vendorName = vendorName;
@@ -164,7 +164,7 @@
*
* @param eisType the eis type
*/
- @XmlElement(name="eis-type", required=true)
+ @XmlElement(name="eis-type")
public void setEISType(String eisType)
{
this.eisType = eisType;
@@ -185,7 +185,7 @@
*
* @param version the resource adapter version
*/
- @XmlElement(name="resourceadapter-version", required=true)
+ @XmlElement(name="resourceadapter-version")
public void setRAVersion(String version)
{
this.raVersion = version;
Modified: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16Base.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16Base.java 2009-10-14 03:46:40 UTC (rev 94806)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16Base.java 2009-10-14 03:50:10 UTC (rev 94807)
@@ -52,7 +52,7 @@
return metadataComplete;
}
- @XmlAttribute(required=true)
+ @XmlAttribute
public void setMetadataComplete(boolean metadataComplete)
{
this.metadataComplete = metadataComplete;
Modified: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/OutboundRaMetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/OutboundRaMetaData.java 2009-10-14 03:46:40 UTC (rev 94806)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/OutboundRaMetaData.java 2009-10-14 03:50:10 UTC (rev 94807)
@@ -42,7 +42,7 @@
private List<AuthenticationMechanismMetaData> authMechanisms;
private boolean reAuthSupport;
- @XmlElement(name="connection-definition", required=true)
+ @XmlElement(name="connection-definition")
public void setConDefs(List<ConnectionDefinitionMetaData> conDefs) {
this.conDefs = conDefs;
}
@@ -51,7 +51,7 @@
return conDefs;
}
- @XmlElement(name="transaction-support", required=true)
+ @XmlElement(name="transaction-support")
public void setTransSupport(TransactionSupportMetaData transSupport) {
this.transSupport = transSupport;
}
@@ -69,7 +69,7 @@
return authMechanisms;
}
- @XmlElement(name="reauthentication-support", required=true)
+ @XmlElement(name="reauthentication-support")
public void setReAuthSupport(boolean reAuthSupport) {
this.reAuthSupport = reAuthSupport;
}
Modified: projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java
===================================================================
--- projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java 2009-10-14 03:46:40 UTC (rev 94806)
+++ projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java 2009-10-14 03:50:10 UTC (rev 94807)
@@ -48,9 +48,7 @@
{
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());
Modified: projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA16NegativeUnitTestCase.java
===================================================================
--- projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA16NegativeUnitTestCase.java 2009-10-14 03:46:40 UTC (rev 94806)
+++ projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA16NegativeUnitTestCase.java 2009-10-14 03:50:10 UTC (rev 94807)
@@ -86,32 +86,8 @@
JCA16MetaData connector = unmarshal();
assertFalse(connector.getVersion().equals("1.6"));
}
-
- /**
- * test miss resourceadapter-version
- */
- public void testParserRAVersion() throws Exception
- {
- negativeParserTest("resourceadapter-version");
- }
/**
- * test miss vendor-name
- */
- public void testParserVendorName() throws Exception
- {
- negativeParserTest("vendor-name");
- }
-
- /**
- * test miss eis-type
- */
- public void testParserEISType() throws Exception
- {
- negativeParserTest("eis-type");
- }
-
- /**
* test miss license-required
*/
public void testParserLicenseRequired() throws Exception
@@ -150,22 +126,6 @@
{
negativeParserTest("config-property-type");
}
-
- /**
- * test miss connection-definition
-
- public void testParserConDef() throws Exception
- {
- negativeParserTest("connection-definition", false);
- }
- */
- /**
- * test miss reauthentication-support
- public void testParserReAuth() throws Exception
- {
- negativeParserTest("reauthentication-support", false);
- }
- */
/**
* test miss transaction-support
Modified: projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testMinimal.xml
===================================================================
--- projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testMinimal.xml 2009-10-14 03:46:40 UTC (rev 94806)
+++ projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testMinimal.xml 2009-10-14 03:50:10 UTC (rev 94807)
@@ -6,12 +6,8 @@
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">
+ version="1.6">
- <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>
Deleted: projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserConDef.xml
===================================================================
--- projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserConDef.xml 2009-10-14 03:46:40 UTC (rev 94806)
+++ projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserConDef.xml 2009-10-14 03:50:10 UTC (rev 94807)
@@ -1,22 +0,0 @@
-<?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>
- <outbound-resourceadapter>
-
- <transaction-support>XATransaction</transaction-support>
- <reauthentication-support>false</reauthentication-support>
- </outbound-resourceadapter>
-
- </resourceadapter>
-</connector>
Deleted: projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserEISType.xml
===================================================================
--- projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserEISType.xml 2009-10-14 03:46:40 UTC (rev 94806)
+++ projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserEISType.xml 2009-10-14 03:50:10 UTC (rev 94807)
@@ -1,17 +0,0 @@
-<?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>
Deleted: projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserRAVersion.xml
===================================================================
--- projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserRAVersion.xml 2009-10-14 03:46:40 UTC (rev 94806)
+++ projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserRAVersion.xml 2009-10-14 03:50:10 UTC (rev 94807)
@@ -1,17 +0,0 @@
-<?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>
Deleted: projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserReAuth.xml
===================================================================
--- projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserReAuth.xml 2009-10-14 03:46:40 UTC (rev 94806)
+++ projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserReAuth.xml 2009-10-14 03:50:10 UTC (rev 94807)
@@ -1,34 +0,0 @@
-<?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>
- <outbound-resourceadapter>
- <connection-definition>
- <managedconnectionfactory-class>org.jboss.resource.adapter.jms.JmsManagedConnectionFactory</managedconnectionfactory-class>
- <config-property>
- <description>The jndi name of the provider of connection factories</description>
- <config-property-name>JmsProviderAdapterJNDI</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>java:DefaultJMSProvider</config-property-value>
- </config-property>
- <connectionfactory-interface>org.jboss.resource.adapter.jms.JmsConnectionFactory</connectionfactory-interface>
- <connectionfactory-impl-class>org.jboss.resource.adapter.jms.JmsConnectionFactoryImpl</connectionfactory-impl-class>
- <connection-interface>javax.jms.Session</connection-interface>
- <connection-impl-class>org.jboss.resource.adapter.jms.JmsSession</connection-impl-class>
- </connection-definition>
- <transaction-support>XATransaction</transaction-support>
-
- </outbound-resourceadapter>
-
- </resourceadapter>
-</connector>
Deleted: projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserVendorName.xml
===================================================================
--- projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserVendorName.xml 2009-10-14 03:46:40 UTC (rev 94806)
+++ projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Negative_testParserVendorName.xml 2009-10-14 03:50:10 UTC (rev 94807)
@@ -1,17 +0,0 @@
-<?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