You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2014/02/01 21:52:43 UTC
svn commit: r1563469 - in /juddi/trunk:
uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/
uddi-tck/src/test/java/org/apache/juddi/v3/tck/
Author: alexoree
Date: Sat Feb 1 20:52:43 2014
New Revision: 1563469
URL: http://svn.apache.org/r1563469
Log:
JUDDI-242 adding tests for getBusiness, fixing rest test cases
Modified:
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java
Modified: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java?rev=1563469&r1=1563468&r2=1563469&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java Sat Feb 1 20:52:43 2014
@@ -72,25 +72,24 @@ public class TckBusiness {
private Log logger = LogFactory.getLog(this.getClass());
private UDDIPublicationPortType publication = null;
private UDDIInquiryPortType inquiry = null;
-
public TckBusiness(UDDIPublicationPortType publication,
- UDDIInquiryPortType inquiry) {
+ UDDIInquiryPortType inquiry) {
super();
this.publication = publication;
this.inquiry = inquiry;
}
- public void saveSamSyndicatorBusiness(String authInfoSam) {
- saveBusiness(authInfoSam, SAM_BUSINESS_XML, SAM_BUSINESS_KEY);
+ public BusinessEntity saveSamSyndicatorBusiness(String authInfoSam) {
+ return saveBusiness(authInfoSam, SAM_BUSINESS_XML, SAM_BUSINESS_KEY);
}
public void saveSamSyndicatorBusinesses(String authInfoSam, int numberOfCopies) {
saveBusinesses(authInfoSam, SAM_BUSINESS_XML, SAM_BUSINESS_KEY, numberOfCopies);
}
- public void saveSamSyndicatorBusinessWithProjection(String authInfoSam) {
- saveBusiness(authInfoSam, SAM_BUSINESS_WITHPROJECTION_XML, SAM_BUSINESS_KEY);
+ public BusinessEntity saveSamSyndicatorBusinessWithProjection(String authInfoSam) {
+ return saveBusiness(authInfoSam, SAM_BUSINESS_WITHPROJECTION_XML, SAM_BUSINESS_KEY);
}
public void deleteSamSyndicatorBusiness(String authInfoSam) {
@@ -111,20 +110,20 @@ public class TckBusiness {
saveBusiness(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY, TckCommon.isDebug());
}
- public void saveCombineCatBagsPublisherBusiness(String authInfoJoe) {
- saveBusiness(authInfoJoe, COMBINE_CATBAGS_BIZ_XML, COMBINE_CATBAGS_BIZ_KEY);
+ public BusinessEntity saveCombineCatBagsPublisherBusiness(String authInfoJoe) {
+ return saveBusiness(authInfoJoe, COMBINE_CATBAGS_BIZ_XML, COMBINE_CATBAGS_BIZ_KEY);
}
- public void saveJoePublisherBusiness3(String authInfoJoe) {
- saveBusiness(authInfoJoe, JOE_BUSINESS3_XML, JOE_BUSINESS3_KEY);
+ public BusinessEntity saveJoePublisherBusiness3(String authInfoJoe) {
+ return saveBusiness(authInfoJoe, JOE_BUSINESS3_XML, JOE_BUSINESS3_KEY);
}
- public void saveJoePublisherBusiness1to3(String authInfoJoe) {
- saveBusiness(authInfoJoe, JOE_BUSINESS_MOVE_XML, JOE_BUSINESS3_KEY);
+ public BusinessEntity saveJoePublisherBusiness1to3(String authInfoJoe) {
+ return saveBusiness(authInfoJoe, JOE_BUSINESS_MOVE_XML, JOE_BUSINESS3_KEY);
}
- public void saveMaryPublisherBusiness(String authInfoMary) {
- saveBusiness(authInfoMary, MARY_BUSINESS_XML, MARY_BUSINESS_KEY);
+ public BusinessEntity saveMaryPublisherBusiness(String authInfoMary) {
+ return saveBusiness(authInfoMary, MARY_BUSINESS_XML, MARY_BUSINESS_KEY);
}
public void updateJoePublisherBusiness(String authInfoJoe) {
@@ -279,11 +278,11 @@ public class TckBusiness {
}
}
- public void saveBusiness(String authInfo, String businessXML, String businessKey) {
- saveBusiness(authInfo, businessXML, businessKey, false);
+ public BusinessEntity saveBusiness(String authInfo, String businessXML, String businessKey) {
+ return saveBusiness(authInfo, businessXML, businessKey, false);
}
- public void saveBusiness(String authInfo, String businessXML, String businessKey, boolean serialize) {
+ public BusinessEntity saveBusiness(String authInfo, String businessXML, String businessKey, boolean serialize) {
logger.info("attempting to save business " + businessKey + " from " + businessXML);
try {
SaveBusiness sb = new SaveBusiness();
@@ -319,10 +318,12 @@ public class TckBusiness {
TckValidator.checkContacts(beIn.getContacts(), beOut.getContacts());
TckValidator.checkCategories(beIn.getCategoryBag(), beOut.getCategoryBag());
TckValidator.checkSignatures(beIn.getSignature(), beOut.getSignature());
+ return beOut;
} catch (Throwable e) {
logger.error(e.getMessage(), e);
Assert.fail("No exception should be thrown");
}
+ return null;
}
@@ -359,7 +360,6 @@ public class TckBusiness {
assertNotNull(beOutNew.getBusinessServices());
assertEquals(2, beOutNew.getBusinessServices().getBusinessService().size());
-
} catch (Throwable e) {
logger.error(e.getMessage(), e);
Assert.fail("No exception should be thrown");
@@ -398,4 +398,4 @@ public class TckBusiness {
Assert.fail("No exception should be thrown");
}
}
-}
\ No newline at end of file
+}
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java?rev=1563469&r1=1563468&r2=1563469&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java Sat Feb 1 20:52:43 2014
@@ -34,8 +34,12 @@ import org.uddi.v3_service.UDDISecurityP
import org.uddi.v3_service.UDDISubscriptionPortType;
import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Locale;
+import javax.xml.datatype.DatatypeFactory;
import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Holder;
import org.apache.commons.net.PrintCommandListener;
import org.apache.commons.net.pop3.POP3Client;
import org.apache.commons.net.pop3.POP3MessageInfo;
@@ -46,11 +50,22 @@ import org.junit.Assert;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.uddi.api_v3.BusinessEntity;
+import org.uddi.api_v3.GetBusinessDetail;
+import org.uddi.api_v3.Name;
+import org.uddi.api_v3.SaveBusiness;
+import org.uddi.sub_v3.DeleteSubscription;
+import org.uddi.sub_v3.Subscription;
+import org.uddi.sub_v3.SubscriptionFilter;
/**
* Used only when running the TCK against a running UDDI server (could be something other than jUDDI)
* from the juddi-tck-runner application. The 'external' part is really managing
- * hostnames for callbacks, and for using an external smtp server for smtp based notifications
+ * hostnames for callbacks, and for using an external smtp server for smtp based notifications.<br><br>
+ * WARNING, when adding changes to this class, you MUST always add the corresponding functions.<br><br>
+ * to UDDI_090_SubscriptionListenerIntegrationTest
+ *
+ * @see UDDI_090_SubscriptionListenerIntegrationTest
* @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
* @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
*/
@@ -76,6 +91,7 @@ public class UDDI_090_SubscriptionListen
private static UDDIClient manager;
private static String email = null;
private static Integer httpPort = 80;
+ private static UDDIPublicationPortType publicationMary = null;
@AfterClass
public static void stopManager() throws ConfigurationException {
@@ -134,6 +150,7 @@ public class UDDI_090_SubscriptionListen
transport = manager.getTransport();
publication = transport.getUDDIPublishService();
+ publicationMary = publication;
inquiryMary = transport.getUDDIInquiryService();
subscriptionMary = transport.getUDDISubscriptionService();
if (!TckPublisher.isUDDIAuthMode()) {
@@ -627,4 +644,121 @@ public class UDDI_090_SubscriptionListen
}
//TODO If a subscriber specifies a maximum number of entries to be returned with a subscription and the amount of data to be returned exceeds this limit, or if the node determines based on its policy that there are too many entries to be returned in a single group, then the node SHOULD provide a chunkToken with results.
//TODO If no more results are pending, the value of the chunkToken MUST be "0".
+
+
+
+
+ /**
+ * getBusiness tests
+ * joe want's updates on mary's business
+ * @throws Exception
+ */
+ @Test
+ public void joePublisherUpdate_HTTP_GET_BUSINESS_DETAIL() throws Exception{
+ logger.info("joePublisherUpdate_HTTP_GET_BUSINESS_DETAIL");
+ TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe);
+ Holder<List<Subscription>> holder=null;
+ try {
+ UDDISubscriptionListenerImpl.notifcationMap.clear();
+ UDDISubscriptionListenerImpl.notificationCount = 0;
+ String before = TckCommon.DumpAllTModels(authInfoJoe, inquiryJoe);
+
+ tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
+ tckTModelJoe.saveTModels(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3);
+
+ tckTModelMary.saveMaryPublisherTmodel(authInfoMary);
+ BusinessEntity saveMaryPublisherBusiness = tckBusinessMary.saveMaryPublisherBusiness(authInfoMary);
+
+ tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);
+ tckBusinessServiceJoe.saveJoePublisherService(authInfoJoe);
+ //Saving the Listener Service
+ tckSubscriptionListenerJoe.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, httpPort, hostname);
+ //Saving the Subscription
+ holder = new Holder<List<Subscription>>();
+ holder.value = new ArrayList<Subscription>();
+ Subscription sub = new Subscription();
+ sub.setBindingKey("uddi:uddi.joepublisher.com:bindinglistener");
+ sub.setNotificationInterval(DatatypeFactory.newInstance().newDuration(5000));
+ sub.setSubscriptionFilter(new SubscriptionFilter());
+ sub.getSubscriptionFilter().setGetBusinessDetail(new GetBusinessDetail());
+ sub.getSubscriptionFilter().getGetBusinessDetail().getBusinessKey().add(TckBusiness.MARY_BUSINESS_KEY);
+
+ holder.value.add(sub);
+ subscriptionJoe.saveSubscription(authInfoJoe, holder);
+ //tckSubscriptionListenerJoe.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION3_XML);
+ //Changing the service we subscribed to "JoePublisherService"
+ Thread.sleep(1000);
+ logger.info("updating Mary's business ********** ");
+ updatePublisherBusiness(authInfoMary,saveMaryPublisherBusiness, publicationMary);
+
+ logger.info("Waiting " + TckPublisher.getSubscriptionTimeout() + " seconds for delivery");
+ //waiting up to 100 seconds for the listener to notice the change.
+ for (int i = 0; i < TckPublisher.getSubscriptionTimeout(); i++) {
+ Thread.sleep(1000);
+ System.out.print(".");
+ if (UDDISubscriptionListenerImpl.notificationCount > 0) {
+ // logger.info("Received Notification");
+ // break;
+ }
+ }
+
+ if (UDDISubscriptionListenerImpl.notificationCount == 0) {
+ logger.warn("Test failed, dumping business list");
+ logger.warn("BEFORE " + before);
+ logger.warn("After " + TckCommon.DumpAllTModels(authInfoJoe, inquiryJoe));
+ Assert.fail("No Notification was sent");
+ }
+ Iterator<String> it = UDDISubscriptionListenerImpl.notifcationMap.values().iterator();
+ boolean found = false;
+ while (it.hasNext()) {
+ String test = it.next();
+ if (test.contains("Updated Name")) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ logger.warn("Test failed, dumping business list");
+ logger.warn("BEFORE " + before);
+ logger.warn("After " + TckCommon.DumpAllTModels(authInfoJoe, inquiryJoe));
+ Assert.fail("Notification does not contain the correct service");
+ }
+
+ } catch (Exception e) {
+ logger.error("No exceptions please.");
+ e.printStackTrace();
+
+ Assert.fail();
+ } finally {
+ //tckSubscriptionListenerJoe.deleteNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_KEY);
+ DeleteSubscription ds = new DeleteSubscription();
+ ds.setAuthInfo(authInfoJoe);
+ ds.getSubscriptionKey().add(holder.value.get(0).getSubscriptionKey());
+ subscriptionJoe.deleteSubscription(ds);
+ tckBusinessMary.deleteMaryPublisherBusiness(authInfoMary);
+ tckTModelMary.deleteMaryPublisherTmodel(authInfoMary);
+
+ tckBusinessServiceJoe.deleteJoePublisherService(authInfoJoe);
+ tckBusinessJoe.deleteJoePublisherBusiness(authInfoJoe);
+ tckTModelJoe.deleteJoePublisherTmodel(authInfoJoe);
+ tckTModelJoe.deleteTModel(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_SUBSCRIPTION3_TMODEL_KEY, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3);
+
+ }
+ }
+
+
+
+ /**
+ * adds a new name to the business, then resaves it
+ * @param auth
+ * @param biz
+ * @param pub
+ */
+ public static void updatePublisherBusiness(String auth, BusinessEntity biz, UDDIPublicationPortType pub) throws Exception{
+ biz.getName().add(new Name("Updated Name", "en"));
+ SaveBusiness sb = new SaveBusiness();
+ sb.setAuthInfo(auth);
+ sb.getBusinessEntity().add(biz);
+ pub.saveBusiness(sb);
+ }
}
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java?rev=1563469&r1=1563468&r2=1563469&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java Sat Feb 1 20:52:43 2014
@@ -33,18 +33,29 @@ import org.uddi.v3_service.UDDIPublicati
import org.uddi.v3_service.UDDISecurityPortType;
import org.uddi.v3_service.UDDISubscriptionPortType;
-import com.dumbster.smtp.SimpleSmtpServer;
-import com.dumbster.smtp.SmtpMessage;
import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.datatype.DatatypeFactory;
import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Holder;
+import static org.apache.juddi.v3.tck.UDDI_090_SubscriptionListenerExternalTest.updatePublisherBusiness;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.uddi.api_v3.BusinessEntity;
+import org.uddi.api_v3.GetBusinessDetail;
+import org.uddi.sub_v3.DeleteSubscription;
+import org.uddi.sub_v3.Subscription;
+import org.uddi.sub_v3.SubscriptionFilter;
/**
- * Used during the Maven build process for testing against jUDDI
+ * Used during the Maven build process for testing against jUDDI for Subscription Callbacks
+ * via the Subscription Listener service. Covers HTTP transport tests only<br><br>
+ * WARNING, when adding changes to this class, you MUST always add the corresponding functions
+ * to UDDI_090_SubscriptionListenerExternalTest
*
* @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
* @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
@@ -72,7 +83,6 @@ public class UDDI_090_SubscriptionListen
private static String authInfoJoe = null;
private static String authInfoMary = null;
private static UDDIClient manager;
- private static SimpleSmtpServer mailServer;
private static Integer smtpPort = 25;
private static Integer httpPort = 80;
@@ -196,7 +206,6 @@ public class UDDI_090_SubscriptionListen
//Saving the binding template that will be called by the server for a subscription event
tckBusinessServiceJoe.saveJoePublisherService(authInfoJoe);
//Saving the HTTP Listener Service
- logger.info("sanity check, this shouldn't be the rmi file " + TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML);
tckSubscriptionListenerJoe.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, httpPort, hostname);
//Saving the HTTP Subscription
tckSubscriptionListenerJoe.saveNotifierSubscription(authInfoJoe, "uddi_data/subscriptionnotifier/subscription1.xml");
@@ -257,7 +266,6 @@ public class UDDI_090_SubscriptionListen
tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);
tckBusinessServiceJoe.saveJoePublisherService(authInfoJoe);
//Saving the Listener Service
- logger.info("sanity check, this shouldn't be the rmi file " + TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML);
logger.info("Saving Joe's callback endpoint ********** ");
tckSubscriptionListenerJoe.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, httpPort, hostname);
//Saving the Subscription
@@ -335,7 +343,6 @@ public class UDDI_090_SubscriptionListen
tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);
tckBusinessServiceJoe.saveJoePublisherService(authInfoJoe);
//Saving the Listener Service
- logger.info("sanity check, this shouldn't be the rmi file " + TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML);
tckSubscriptionListenerJoe.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, httpPort, hostname);
//Saving the Subscription
tckSubscriptionListenerJoe.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION3_XML);
@@ -379,6 +386,106 @@ public class UDDI_090_SubscriptionListen
}
}
+ /**
+ * getBusiness tests
+ * joe want's updates on mary's business
+ * @throws Exception
+ */
+ @Test
+ public void joePublisherUpdate_HTTP_GET_BUSINESS_DETAIL() throws Exception{
+ logger.info("joePublisherUpdate_HTTP_GET_BUSINESS_DETAIL");
+ TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe);
+ Holder<List<Subscription>> holder=null;
+ try {
+ UDDISubscriptionListenerImpl.notifcationMap.clear();
+ UDDISubscriptionListenerImpl.notificationCount = 0;
+ String before = TckCommon.DumpAllTModels(authInfoJoe, inquiryJoe);
+
+ tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
+ tckTModelJoe.saveTModels(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3);
+
+ tckTModelMary.saveMaryPublisherTmodel(authInfoMary);
+ BusinessEntity saveMaryPublisherBusiness = tckBusinessMary.saveMaryPublisherBusiness(authInfoMary);
+
+ tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);
+ tckBusinessServiceJoe.saveJoePublisherService(authInfoJoe);
+ //Saving the Listener Service
+ tckSubscriptionListenerJoe.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, httpPort, hostname);
+
+ //Saving the Subscription
+ holder = new Holder<List<Subscription>>();
+ holder.value = new ArrayList<Subscription>();
+ Subscription sub = new Subscription();
+ sub.setBindingKey("uddi:uddi.joepublisher.com:bindinglistener");
+ sub.setNotificationInterval(DatatypeFactory.newInstance().newDuration(5000));
+ sub.setSubscriptionFilter(new SubscriptionFilter());
+ sub.getSubscriptionFilter().setGetBusinessDetail(new GetBusinessDetail());
+ sub.getSubscriptionFilter().getGetBusinessDetail().getBusinessKey().add(TckBusiness.MARY_BUSINESS_KEY);
+
+ holder.value.add(sub);
+ subscriptionJoe.saveSubscription(authInfoJoe, holder);
+ //tckSubscriptionListenerJoe.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION3_XML);
+ //Changing the service we subscribed to "JoePublisherService"
+ Thread.sleep(1000);
+ logger.info("updating Mary's business ********** ");
+ updatePublisherBusiness(authInfoMary,saveMaryPublisherBusiness, publicationMary);
+
+ logger.info("Waiting " + TckPublisher.getSubscriptionTimeout() + " seconds for delivery");
+ //waiting up to 100 seconds for the listener to notice the change.
+ for (int i = 0; i < TckPublisher.getSubscriptionTimeout(); i++) {
+ Thread.sleep(1000);
+ System.out.print(".");
+ if (UDDISubscriptionListenerImpl.notificationCount > 0) {
+ // logger.info("Received Notification");
+// break;
+ }
+ }
+
+ if (UDDISubscriptionListenerImpl.notificationCount == 0) {
+ logger.warn("Test failed, dumping business list");
+ logger.warn("BEFORE " + before);
+ logger.warn("After " + TckCommon.DumpAllTModels(authInfoJoe, inquiryJoe));
+ Assert.fail("No Notification was sent");
+ }
+ Iterator<String> it = UDDISubscriptionListenerImpl.notifcationMap.values().iterator();
+ boolean found = false;
+ while (it.hasNext()) {
+ String test = it.next();
+ if (test.contains("Updated Name")) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ logger.warn("Test failed, dumping business list");
+ logger.warn("BEFORE " + before);
+ logger.warn("After " + TckCommon.DumpAllTModels(authInfoJoe, inquiryJoe));
+ Assert.fail("Notification does not contain the correct service");
+ }
+
+ } catch (Exception e) {
+ logger.error("No exceptions please.");
+ e.printStackTrace();
+
+ Assert.fail();
+ } finally {
+ //tckSubscriptionListenerJoe.deleteNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_KEY);
+ DeleteSubscription ds = new DeleteSubscription();
+ ds.setAuthInfo(authInfoJoe);
+ ds.getSubscriptionKey().add(holder.value.get(0).getSubscriptionKey());
+ subscriptionJoe.deleteSubscription(ds);
+ tckBusinessMary.deleteMaryPublisherBusiness(authInfoMary);
+ tckTModelMary.deleteMaryPublisherTmodel(authInfoMary);
+
+ tckBusinessServiceJoe.deleteJoePublisherService(authInfoJoe);
+ tckBusinessJoe.deleteJoePublisherBusiness(authInfoJoe);
+ tckTModelJoe.deleteJoePublisherTmodel(authInfoJoe);
+ tckTModelJoe.deleteTModel(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_SUBSCRIPTION3_TMODEL_KEY, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3);
+
+ }
+ }
+
+
//TODO If a subscriber specifies a maximum number of entries to be returned with a subscription and the amount of data to be returned exceeds
//this limit, or if the node determines based on its policy that there are too many entries to be returned in a single group,
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java?rev=1563469&r1=1563468&r2=1563469&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java Sat Feb 1 20:52:43 2014
@@ -115,10 +115,11 @@ public class UDDI_160_RESTIntergrationTe
HttpGet httpGet = new HttpGet(url + "?businessKey=" + findBusiness.getBusinessInfos().getBusinessInfo().get(0).getBusinessKey());
logger.info("Fetching " + httpGet.getURI());
HttpResponse response = client.execute(httpGet);
- client.getConnectionManager().shutdown();
+
Assert.assertTrue(response.getStatusLine().getStatusCode() == 200);
logger.info("Response content: " + response.getEntity().getContent());
BusinessEntity unmarshal = JAXB.unmarshal(response.getEntity().getContent(), BusinessEntity.class);
+ client.getConnectionManager().shutdown();
Assert.assertNotNull(unmarshal);
Assert.assertEquals(unmarshal.getBusinessKey(), findBusiness.getBusinessInfos().getBusinessInfo().get(0).getBusinessKey());
@@ -147,10 +148,11 @@ public class UDDI_160_RESTIntergrationTe
HttpGet httpGet = new HttpGet(url + "?tModelKey=" + findTModel.getTModelInfos().getTModelInfo().get(0).getTModelKey());
logger.info("Fetching " + httpGet.getURI());
HttpResponse response = client.execute(httpGet);
- client.getConnectionManager().shutdown();
+
Assert.assertTrue(response.getStatusLine().getStatusCode() == 200);
logger.info("Response content: " + response.getEntity().getContent());
TModel unmarshal = JAXB.unmarshal(response.getEntity().getContent(), TModel.class);
+ client.getConnectionManager().shutdown();
Assert.assertNotNull(unmarshal);
Assert.assertEquals(unmarshal.getTModelKey(), findTModel.getTModelInfos().getTModelInfo().get(0).getTModelKey());
@@ -180,10 +182,12 @@ public class UDDI_160_RESTIntergrationTe
HttpGet httpGet = new HttpGet(url + "?serviceKey=" + findService.getServiceInfos().getServiceInfo().get(0).getServiceKey());
logger.info("Fetching " + httpGet.getURI());
HttpResponse response = client.execute(httpGet);
- client.getConnectionManager().shutdown();
+
+
Assert.assertTrue(response.getStatusLine().getStatusCode() == 200);
logger.info("Response content: " + response.getEntity().getContent());
BusinessService unmarshal = JAXB.unmarshal(response.getEntity().getContent(), BusinessService.class);
+ client.getConnectionManager().shutdown();
Assert.assertNotNull(unmarshal);
Assert.assertEquals(unmarshal.getServiceKey(), findService.getServiceInfos().getServiceInfo().get(0).getServiceKey());
@@ -247,10 +251,11 @@ public class UDDI_160_RESTIntergrationTe
HttpGet httpGet = new HttpGet(url + "?bindingKey=" + bt.getBindingKey());
logger.info("Fetching " + httpGet.getURI());
HttpResponse response = client.execute(httpGet);
- client.getConnectionManager().shutdown();
+
Assert.assertTrue(response.getStatusLine().getStatusCode() == 200);
logger.info("Response content: " + response.getEntity().getContent());
BindingTemplate unmarshal = JAXB.unmarshal(response.getEntity().getContent(), BindingTemplate.class);
+ client.getConnectionManager().shutdown();
Assert.assertNotNull(unmarshal);
Assert.assertEquals(unmarshal.getServiceKey(), bt.getServiceKey());
Assert.assertEquals(unmarshal.getBindingKey(), bt.getBindingKey());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org