Repository: juddi Updated Branches: refs/heads/master e9520847f -> 24031fc8c
JUDDI-906 addition updated tests for replication config. Project: http://git-wip-us.apache.org/repos/asf/juddi/repo Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/24031fc8 Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/24031fc8 Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/24031fc8 Branch: refs/heads/master Commit: 24031fc8c2f8212edd9e6a4e70318aa2e5721998 Parents: e952084 Author: Alex <[email protected]> Authored: Sun Jan 11 09:33:12 2015 -0500 Committer: Alex <[email protected]> Committed: Sun Jan 11 09:33:12 2015 -0500 ---------------------------------------------------------------------- .../tck/JUDDI_300_MultiNodeIntegrationTest.java | 48 ++++++++++++++++++-- 1 file changed, 43 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/juddi/blob/24031fc8/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java index 34c36f3..041359f 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java @@ -459,13 +459,31 @@ public class JUDDI_300_MultiNodeIntegrationTest { // TModel saveSamSyndicatorTmodel = samTModelNode2.saveSamSyndicatorTmodel(samTokenNode2); BusinessEntity saveSamSyndicatorBusiness = samBizNode2.saveSamSyndicatorBusiness(samTokenNode2); - getReplicationStatus();//block until synched + // getReplicationStatus();//block until synched //confirm mary's tmodel is on the other node GetTModelDetail findTModel = new GetTModelDetail(); findTModel.setAuthInfo(samTokenNode2); findTModel.getTModelKey().add(TckTModel.MARY_PUBLISHER_TMODEL_KEY); - TModelDetail tModelDetail = inquirySam.getTModelDetail(findTModel); + TModelDetail tModelDetail = null; + + int timeout = TckPublisher.getSubscriptionTimeout(); + + while (timeout > 0) { + logger.info("Waiting for the update..."); + try { + tModelDetail = inquirySam.getTModelDetail(findTModel); + break; + } catch (Exception ex) { + logger.warn(ex.getMessage()); + tModelDetail = null; + + } + timeout--; + Thread.sleep(1000); + + } + Assert.assertNotNull(tModelDetail); Assert.assertNotNull(tModelDetail.getTModel()); Assert.assertTrue(tModelDetail.getTModel().size() == 1); @@ -474,7 +492,27 @@ public class JUDDI_300_MultiNodeIntegrationTest { GetBusinessDetail gbd = new GetBusinessDetail(); gbd.setAuthInfo(samTokenNode2); gbd.getBusinessKey().add(TckBusiness.MARY_BUSINESS_KEY); - BusinessDetail businessDetail = inquirySam.getBusinessDetail(gbd); + + //confirm mary's biz made it too + timeout = TckPublisher.getSubscriptionTimeout(); + BusinessDetail businessDetail =null; + while (timeout > 0) { + logger.info("Waiting for the update..."); + try { + businessDetail = inquirySam.getBusinessDetail(gbd); + break; + } catch (Exception ex) { + logger.warn(ex.getMessage()); + businessDetail = null; + + } + timeout--; + Thread.sleep(1000); + + } + + + Assert.assertNotNull(businessDetail); Assert.assertNotNull(businessDetail.getBusinessEntity()); Assert.assertTrue(businessDetail.getBusinessEntity().get(0).getBusinessKey().equals(TckBusiness.MARY_BUSINESS_KEY)); @@ -485,8 +523,8 @@ public class JUDDI_300_MultiNodeIntegrationTest { maryBizNode1.deleteMaryPublisherBusiness(maryTokenNode1); maryTModelNode1.deleteMaryPublisherTmodel(maryTokenNode1); - //getReplicationStatus();//block until synched - int timeout = TckPublisher.getSubscriptionTimeout(); + //delete both + timeout = TckPublisher.getSubscriptionTimeout(); businessDetail = null; while (timeout > 0) { logger.info("Waiting for the update..."); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
