You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by jf...@apache.org on 2009/02/03 04:58:46 UTC

svn commit: r740207 - in /webservices/juddi/branches/v3_trunk: juddi-core/src/main/java/org/apache/juddi/mapping/ uddi-client/src/test/java/org/apache/juddi/client/

Author: jfaath
Date: Tue Feb  3 03:58:45 2009
New Revision: 740207

URL: http://svn.apache.org/viewvc?rev=740207&view=rev
Log:
Removed test Ignores, which revealed more errors which were subsequently fixed.  All UDDI tests should work now.

Modified:
    webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
    webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_020_TmodelTest.java
    webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_030_BusinessEntityTest.java
    webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_040_BusinessServiceTest.java
    webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_050_BindingTemplateTest.java
    webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_060_PublisherAssertionTest.java
    webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_070_FindEntityTest.java

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java?rev=740207&r1=740206&r2=740207&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java Tue Feb  3 03:58:45 2009
@@ -96,6 +96,9 @@
 										org.uddi.api_v3.DiscoveryURLs apiDiscUrls,
 										org.uddi.api_v3.BusinessEntity apiBusinessEntity) 
 				   throws DispositionReportFaultMessage {
+		if (modelDiscUrlList == null || modelDiscUrlList.size() == 0)
+			return;
+		
 		if (apiDiscUrls == null)
 			apiDiscUrls = new org.uddi.api_v3.DiscoveryURLs();
 
@@ -115,6 +118,9 @@
 								   org.uddi.api_v3.Contacts apiContacts,
 								   org.uddi.api_v3.BusinessEntity apiBusinessEntity) 
 				   throws DispositionReportFaultMessage {
+		if (modelContactList == null || modelContactList.size() == 0)
+			return;
+		
 		if (apiContacts == null)
 			apiContacts = new org.uddi.api_v3.Contacts();
 
@@ -224,6 +230,9 @@
 											  org.uddi.api_v3.IdentifierBag apiIdentifierBag,
 											  org.uddi.api_v3.BusinessEntity apiBusinessEntity) 
 				   throws DispositionReportFaultMessage {
+		if (modelIdentifierList == null || modelIdentifierList.size() == 0)
+			return;
+		
 		if (apiIdentifierBag == null)
 			apiIdentifierBag = new org.uddi.api_v3.IdentifierBag();
 
@@ -244,7 +253,9 @@
 										   org.uddi.api_v3.BusinessServices apiBusinessServices,
 										   org.uddi.api_v3.BusinessEntity apiBusinessEntity) 
 				   throws DispositionReportFaultMessage {
-
+		if (modelBusinessServiceList == null || modelBusinessServiceList.size() == 0)
+			return;
+		
 		if (apiBusinessServices == null)
 			apiBusinessServices = new org.uddi.api_v3.BusinessServices();
 
@@ -303,7 +314,9 @@
 										   org.uddi.api_v3.BindingTemplates apiBindingTemplates,
 										   org.uddi.api_v3.BusinessService apiBusinessService) 
 				   throws DispositionReportFaultMessage {
-
+		if (modelBindingTemplateList == null || modelBindingTemplateList.size() == 0)
+			return;
+		
 		if (apiBindingTemplates == null)
 			apiBindingTemplates = new org.uddi.api_v3.BindingTemplates();
 
@@ -402,6 +415,9 @@
 												org.uddi.api_v3.TModelInstanceDetails apiTModelInstDetails,
 												org.uddi.api_v3.BindingTemplate apiBindingTemplate) 
 				   throws DispositionReportFaultMessage {
+		if (modelTModelInstInfoList == null || modelTModelInstInfoList.size() == 0)
+			return;
+		
 		if (apiTModelInstDetails == null)
 			apiTModelInstDetails = new org.uddi.api_v3.TModelInstanceDetails();
 
@@ -436,6 +452,9 @@
 										  org.uddi.api_v3.InstanceDetails apiInstanceDetails,
 										  org.uddi.api_v3.TModelInstanceInfo apiTModelInstInfo) 
 				   throws DispositionReportFaultMessage {
+		if (modelTModelInstInfo == null)
+			return;
+		
 		if (apiInstanceDetails == null)
 			apiInstanceDetails = new org.uddi.api_v3.InstanceDetails();
 

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_020_TmodelTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_020_TmodelTest.java?rev=740207&r1=740206&r2=740207&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_020_TmodelTest.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_020_TmodelTest.java Tue Feb  3 03:58:45 2009
@@ -69,13 +69,13 @@
 	     } 
 	}
 	
-	@Test @Ignore
+	@Test
 	public void testJoePublisherTmodel() {
 		tckTModel.saveJoePublisherTmodel(authInfoJoe);
 		tckTModel.deleteJoePublisherTmodel(authInfoJoe);
 	}
 	
-	@Test @Ignore
+	@Test
 	public void testSamSyndicatorTmodelTest() {
 		tckTModel.saveSamSyndicatorTmodel(authInfoSam);
 		tckTModel.deleteSamSyndicatorTmodel(authInfoSam);

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_030_BusinessEntityTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_030_BusinessEntityTest.java?rev=740207&r1=740206&r2=740207&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_030_BusinessEntityTest.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_030_BusinessEntityTest.java Tue Feb  3 03:58:45 2009
@@ -72,7 +72,7 @@
 	     } 
 	}
 	
-	@Test @Ignore
+	@Test
 	public void testJoePublisherBusinessEntity() {
 		try {
 			tckTModel.saveJoePublisherTmodel(authInfoJoe);
@@ -83,7 +83,7 @@
 		}
 	}	
 	
-	@Test @Ignore
+	@Test
 	public void testSamSyndicatorBusiness() {
 		try {
 			tckTModel.saveSamSyndicatorTmodel(authInfoSam);

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_040_BusinessServiceTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_040_BusinessServiceTest.java?rev=740207&r1=740206&r2=740207&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_040_BusinessServiceTest.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_040_BusinessServiceTest.java Tue Feb  3 03:58:45 2009
@@ -78,7 +78,7 @@
 	     } 
 	}
 	
-	@Test @Ignore
+	@Test
 	public void joepublisher() {
 		try {
 			tckTModel.saveJoePublisherTmodel(authInfoJoe);
@@ -91,7 +91,7 @@
 		}
 	}
 	
-	@Test @Ignore
+	@Test
 	public void samsyndicator() {
 		try {
 			

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_050_BindingTemplateTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_050_BindingTemplateTest.java?rev=740207&r1=740206&r2=740207&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_050_BindingTemplateTest.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_050_BindingTemplateTest.java Tue Feb  3 03:58:45 2009
@@ -79,7 +79,7 @@
 	     } 
 	}
 	
-	@Test @Ignore
+	@Test
 	public void joepublisher() {
 		try {
 			tckTModel.saveJoePublisherTmodel(authInfoJoe);

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_060_PublisherAssertionTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_060_PublisherAssertionTest.java?rev=740207&r1=740206&r2=740207&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_060_PublisherAssertionTest.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_060_PublisherAssertionTest.java Tue Feb  3 03:58:45 2009
@@ -76,7 +76,7 @@
 	     } 
 	}
 	
-	@Test @Ignore
+	@Test
 	public void testJoepublisherToSamSyndicator() {
 		try {
 			tckTModel.saveJoePublisherTmodel(authInfoJoe);

Modified: webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_070_FindEntityTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_070_FindEntityTest.java?rev=740207&r1=740206&r2=740207&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_070_FindEntityTest.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-client/src/test/java/org/apache/juddi/client/UDDI_070_FindEntityTest.java Tue Feb  3 03:58:45 2009
@@ -70,6 +70,7 @@
 	        	 tckTModel  = new TckTModel(publication, inquiry);
 	        	 tckBusiness = new TckBusiness(publication, inquiry);
 	        	 tckBusinessService = new TckBusinessService(publication, inquiry);
+	        	 tckBindingTemplate = new TckBindingTemplate(publication, inquiry);
 	        	 tckFindEntity = new TckFindEntity(inquiry);
 	         } else {
 	        	 Assert.fail();
@@ -80,7 +81,7 @@
 	     } 
 	}
 	
-	@Test @Ignore
+	@Test
 	public void findEntities() {
 		try {
 			tckTModel.saveJoePublisherTmodel(authInfoJoe);



---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org