Repository: juddi Updated Branches: refs/heads/master 5db45496f -> d147fa749
JUDDI-981 enabled Project: http://git-wip-us.apache.org/repos/asf/juddi/repo Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/d147fa74 Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/d147fa74 Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/d147fa74 Branch: refs/heads/master Commit: d147fa7496319382fd19c5ebe70fc31855f795a8 Parents: 5db4549 Author: Alex O'Ree <[email protected]> Authored: Mon Oct 9 16:02:31 2017 -0400 Committer: Alex O'Ree <[email protected]> Committed: Mon Oct 9 16:02:31 2017 -0400 ---------------------------------------------------------------------- uddi-tck/pom.xml | 2 +- ...090_SubscriptionListenerIntegrationBase.java | 2 +- .../v3/tck/UDDI_141_JIRAIntegrationTest.java | 38 +++++++++++++++----- 3 files changed, 32 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/juddi/blob/d147fa74/uddi-tck/pom.xml ---------------------------------------------------------------------- diff --git a/uddi-tck/pom.xml b/uddi-tck/pom.xml index c2de320..d5dd2a8 100644 --- a/uddi-tck/pom.xml +++ b/uddi-tck/pom.xml @@ -321,7 +321,7 @@ </goals> <configuration> <skip>false</skip> - <runOrder>alphabetical</runOrder> + <runOrder>random</runOrder> <skipAfterFailureCount>1</skipAfterFailureCount> <systemProperties> <property> http://git-wip-us.apache.org/repos/asf/juddi/blob/d147fa74/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java index 890b0d2..1d24d1b 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java @@ -414,7 +414,7 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase { logger.info("updating Mary's business ********** "); updatePublisherBusiness(authInfoMary, saveMaryPublisherBusiness, publicationMary, "Updated Name"); - boolean found = verifyDelivery("Updated Name"); + boolean found = verifyDelivery(saveMaryPublisherBusiness.getBusinessKey()); if (!found) { logger.warn("Test failed, dumping business list"); http://git-wip-us.apache.org/repos/asf/juddi/blob/d147fa74/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java index 8901483..e7b6793 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java @@ -70,9 +70,11 @@ public class UDDI_141_JIRAIntegrationTest { static UDDIInquiryPortType inquiryJoeSam = null; static UDDIPublicationPortType publicationSam = null; static TckTModel tckTModelSam = null; + static TckTModel tckTmodelUddi = null; static TckBusiness tckBusinessSam = null; protected static String authInfoJoe = null; protected static String authInfoSam = null; + protected static String authInfoUddi = null; private static UDDIClient manager; static final String str256 = "1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"; static final String str255 = "111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"; @@ -93,7 +95,9 @@ public class UDDI_141_JIRAIntegrationTest { @AfterClass public static void stopManager() throws ConfigurationException { - if (!TckPublisher.isEnabled()) return; + if (!TckPublisher.isEnabled()) { + return; + } tckTModelJoe.deleteCreatedTModels(authInfoJoe); tckTModelSam.deleteCreatedTModels(authInfoSam); manager.stop(); @@ -101,7 +105,9 @@ public class UDDI_141_JIRAIntegrationTest { @BeforeClass public static void startManager() throws ConfigurationException { - if (!TckPublisher.isEnabled()) return; + if (!TckPublisher.isEnabled()) { + return; + } logger.info("UDDI_141_JIRAIntegrationTest"); manager = new UDDIClient(); manager.start(); @@ -118,6 +124,7 @@ public class UDDI_141_JIRAIntegrationTest { authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword()); authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword()); + authInfoUddi = TckSecurity.getAuthToken(security, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword()); //Assert.assertNotNull(authInfoJoe); //Assert.assertNotNull(authInfoSam); if (!TckPublisher.isUDDIAuthMode()) { @@ -142,6 +149,20 @@ public class UDDI_141_JIRAIntegrationTest { tckTModelSam = new TckTModel(publicationSam, inquiryJoeSam); tckBusinessSam = new TckBusiness(publicationSam, inquiryJoeSam); + transport = manager.getTransport("uddiv3"); + + UDDIPublicationPortType uddiPublishService = transport.getUDDIPublishService(); + UDDIInquiryPortType uddiInquiryService = transport.getUDDIInquiryService(); + + tckTmodelUddi = new TckTModel(uddiPublishService, uddiInquiryService); + tckTmodelUddi.saveUDDIPublisherTmodel(authInfoUddi); + + if (!TckPublisher.isUDDIAuthMode()) { + TckSecurity.setCredentials((BindingProvider) uddiPublishService, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword()); + TckSecurity.setCredentials((BindingProvider) uddiInquiryService, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword()); + + } + } catch (Exception e) { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); @@ -498,10 +519,10 @@ public class UDDI_141_JIRAIntegrationTest { if (businesskeysToDelete.contains(findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey())) { found1++; if (findTModel.getTModelInfos().getTModelInfo().get(i).getName() == null - || findTModel.getTModelInfos().getTModelInfo().get(i).getName().getLang() == null - || findTModel.getTModelInfos().getTModelInfo().get(i).getName().getLang().length() == 0) { + || findTModel.getTModelInfos().getTModelInfo().get(i).getName().getLang() == null + || findTModel.getTModelInfos().getTModelInfo().get(i).getName().getLang().length() == 0) { failuremsg += "Tmodel key " + findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey() - + " has a null or empty lang"; + + " has a null or empty lang"; } } @@ -968,7 +989,7 @@ public class UDDI_141_JIRAIntegrationTest { bt.getAccessPoint().setValue("http://"; + hostname + ":" + port + "/UDDI_CALLBACK"); bt.getAccessPoint().setUseType("endPoint"); //obmitted as part of the jira test case - /*TModelInstanceInfo instanceInfo = new TModelInstanceInfo(); + /*TModelInstanceInfo instanceInfo = new TModelInstanceInfo(); instanceInfo.setTModelKey("uddi:uddi.org:transport:http"); bt.setTModelInstanceDetails(new TModelInstanceDetails()); bt.getTModelInstanceDetails().getTModelInstanceInfo().add(instanceInfo); @@ -1275,7 +1296,8 @@ public class UDDI_141_JIRAIntegrationTest { } Assume.assumeTrue(tModelDetail == null); - tckTModelJoe.saveJoePublisherTmodel(authInfoJoe); + tckTmodelUddi.saveUDDIPublisherTmodel(authInfoUddi); + tckTModelSam.saveSamSyndicatorTmodel(authInfoSam); tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe); @@ -1437,7 +1459,7 @@ public class UDDI_141_JIRAIntegrationTest { c.getAddress().add(addr); be.getContacts().getContact().add(c); be.getName().add(new Name("test JUDDI849", null)); - + SaveBusiness sb = new SaveBusiness(); sb.getBusinessEntity().add(be); sb.setAuthInfo(authInfoJoe); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
