Copied: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_110_FindBusinessIntegrationTest.java (from r1564260, juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindBusinessIntegrationTest.java) URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_110_FindBusinessIntegrationTest.java?p2=juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_110_FindBusinessIntegrationTest.java&p1=juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindBusinessIntegrationTest.java&r1=1564260&r2=1568829&rev=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindBusinessIntegrationTest.java (original) +++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_110_FindBusinessIntegrationTest.java Sun Feb 16 21:12:11 2014 @@ -1,4 +1,4 @@ -package org.apache.juddi.v3.tck; +package org.apache.juddi.v2.tck; /* * Copyright 2001-2009 The Apache Software Foundation. @@ -14,6 +14,7 @@ package org.apache.juddi.v3.tck; * See the License for the specific language governing permissions and * limitations under the License. */ + import java.util.List; import javax.xml.ws.BindingProvider; @@ -21,19 +22,16 @@ import org.apache.commons.configuration. import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.juddi.v3.client.config.UDDIClient; +import org.apache.juddi.v3.client.transport.JAXWSv2TranslationTransport; import org.apache.juddi.v3.client.transport.Transport; import org.junit.AfterClass; import org.junit.Assert; +import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; -import org.uddi.api_v3.BusinessInfo; -import org.uddi.api_v3.BusinessList; -import org.uddi.api_v3.FindBusiness; -import org.uddi.api_v3.ServiceInfo; -import org.uddi.api_v3.TModelBag; -import org.uddi.v3_service.UDDIInquiryPortType; -import org.uddi.v3_service.UDDIPublicationPortType; -import org.uddi.v3_service.UDDISecurityPortType; +import org.uddi.api_v2.*; + +import org.uddi.v2_service.*; /** * Test to verify JUDDI-398 @@ -43,15 +41,17 @@ import org.uddi.v3_service.UDDISecurityP */ public class UDDI_110_FindBusinessIntegrationTest { - final static String TOM_PUBLISHER_TMODEL_XML = "uddi_data/tompublisher/tModelKeyGen.xml"; - final static String TOM_PUBLISHER_TMODEL01_XML = "uddi_data/tompublisher/tModel01.xml"; - final static String TOM_PUBLISHER_TMODEL02_XML = "uddi_data/tompublisher/tModel02.xml"; - final static String TOM_PUBLISHER_TMODEL_KEY = "uddi:uddi.tompublisher.com:keygenerator"; - final static String TOM_PUBLISHER_TMODEL01_KEY = "uddi:uddi.tompublisher.com:tmodeltest01"; + final static String TOM_PUBLISHER_TMODEL_XML = "uddi_data_v2/tompublisher/tModelKeyGen.xml"; + final static String TOM_PUBLISHER_TMODEL01_XML = "uddi_data_v2/tompublisher/tModel01.xml"; + final static String TOM_PUBLISHER_TMODEL02_XML = "uddi_data_v2/tompublisher/tModel02.xml"; + final static String TOM_PUBLISHER_TMODEL_KEY = "uuid:b6a1c995-3dc2-4411-a6c6-f5f6739e46fd"; + + final static String TOM_PUBLISHER_TMODEL01_KEY = "uuid:165a69c5-996a-49cc-8d7c-6600a30c2ad9"; final static String TOM_PUBLISHER_TMODEL01_NAME = "tmodeltest01"; - final static String TOM_PUBLISHER_TMODEL02_KEY = "uddi:uddi.tompublisher.com:tmodeltest02"; - final static String TOM_BUSINESS_XML = "uddi_data/tompublisher/businessEntity.xml"; - final static String TOM_BUSINESS_KEY = "uddi:uddi.tompublisher.com:businesstest01"; + final static String TOM_PUBLISHER_TMODEL02_KEY = "uuid:9b79f267-1536-4a9e-85a1-d333f54b5038"; + final static String TOM_BUSINESS_XML = "uddi_data_v2/tompublisher/businessEntity.xml"; + + final static String TOM_BUSINESS_KEY = "a0dbe2d4-3eea-4321-969f-827a4cc1d175"; final static String TOM_PUBLISHER_SERVICEINFO_NAME = "servicetest01"; private static Log logger = LogFactory.getLog(UDDI_040_BusinessServiceIntegrationTest.class); protected static TckTModel tckTModel = null; @@ -59,11 +59,12 @@ public class UDDI_110_FindBusinessIntegr protected static TckTModel tckTModel02 = null; protected static TckBusiness tckBusiness = null; protected static String authInfoJoe = null; - private static UDDIInquiryPortType inquiry = null; + private static Inquire inquiry = null; private static UDDIClient manager; @AfterClass public static void stopManager() throws ConfigurationException { + Assume.assumeTrue(TckPublisher.isEnabled()); tckTModel.deleteCreatedTModels(authInfoJoe); tckTModel01.deleteCreatedTModels(authInfoJoe); tckTModel02.deleteCreatedTModels(authInfoJoe); @@ -72,18 +73,19 @@ public class UDDI_110_FindBusinessIntegr @BeforeClass public static void startManager() throws ConfigurationException { + Assume.assumeTrue(TckPublisher.isEnabled()); manager = new UDDIClient(); manager.start(); logger.debug("Getting auth tokens.."); try { - Transport transport = manager.getTransport(); - UDDISecurityPortType security = transport.getUDDISecurityService(); + JAXWSv2TranslationTransport transport = (JAXWSv2TranslationTransport) manager.getTransport("uddiv2"); + Publish security = transport.getUDDIv2PublishService(); authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword()); //Assert.assertNotNull(authInfoJoe); - UDDIPublicationPortType publication = transport.getUDDIPublishService(); - inquiry = transport.getUDDIInquiryService(); + Publish publication = transport.getUDDIv2PublishService(); + inquiry = transport.getUDDIv2InquiryService(); if (!TckPublisher.isUDDIAuthMode()){ TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword()); TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword()); @@ -102,6 +104,7 @@ public class UDDI_110_FindBusinessIntegr @Test public void findBusinessByTModelBag() { + Assume.assumeTrue(TckPublisher.isEnabled()); try { tckTModel.saveTModel(authInfoJoe, TOM_PUBLISHER_TMODEL_XML, TOM_PUBLISHER_TMODEL_KEY); tckTModel.saveTModel(authInfoJoe, TOM_PUBLISHER_TMODEL01_XML, TOM_PUBLISHER_TMODEL01_KEY);
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_010_IntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_010_IntegrationTest.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_010_IntegrationTest.java (original) +++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_010_IntegrationTest.java Sun Feb 16 21:12:11 2014 @@ -54,7 +54,7 @@ public class BPEL_010_IntegrationTest { manager.start(); logger.debug("Getting auth token for user riftsaw/riftsaw.."); try { - Transport transport = manager.getTransport(); + Transport transport = manager.getTransport("uddiv3"); UDDISecurityPortType security = transport.getUDDISecurityService(); authInfoRiftSaw = TckSecurity.getAuthToken(security, TckPublisher.getRiftSawPublisherId(), TckPublisher.getRiftSawPassword()); Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java (original) +++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java Sun Feb 16 21:12:11 2014 @@ -74,7 +74,7 @@ public class BPEL_020_IntegrationTest { logger.debug("Getting auth token for user riftsaw/riftsaw.."); try { - Transport transport = manager.getTransport(); + Transport transport = manager.getTransport("uddiv3"); UDDISecurityPortType security = transport.getUDDISecurityService(); authInfoRiftSaw = TckSecurity.getAuthToken(security, TckPublisher.getRiftSawPublisherId(), TckPublisher.getRiftSawPassword()); Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java (original) +++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java Sun Feb 16 21:12:11 2014 @@ -59,13 +59,14 @@ public class JUDDI_010_PublisherIntegrat @BeforeClass public static void startManager() throws ConfigurationException { Assume.assumeTrue(TckPublisher.isJUDDI()); + Assume.assumeTrue(TckPublisher.isEnabled()); manager = new UDDIClient(); manager.start(); logger.debug("Getting auth tokens.."); try { - Transport transport = manager.getTransport(); + Transport transport = manager.getTransport("uddiv3"); security = transport.getUDDISecurityService(); GetAuthToken getAuthToken = new GetAuthToken(); @@ -88,8 +89,9 @@ public class JUDDI_010_PublisherIntegrat @Test public void testAuthToken() { Assume.assumeTrue(TckPublisher.isUDDIAuthMode()); + Assume.assumeTrue(TckPublisher.isEnabled()); try { - Transport transport = manager.getTransport(); + Transport transport = manager.getTransport("uddiv3"); UDDISecurityPortType securityService = transport.getUDDISecurityService(); GetAuthToken getAuthToken = new GetAuthToken(); @@ -107,6 +109,7 @@ public class JUDDI_010_PublisherIntegrat @Test public void testJoePublisher() { Assume.assumeTrue(TckPublisher.isJUDDI()); + Assume.assumeTrue(TckPublisher.isEnabled()); //We can only test this if the publisher is not there already. //If it already there is probably has foreign key relationships. //This test should really only run on an empty database. Seed @@ -120,6 +123,7 @@ public class JUDDI_010_PublisherIntegrat @Test public void testSamSyndicator() { Assume.assumeTrue(TckPublisher.isJUDDI()); + Assume.assumeTrue(TckPublisher.isEnabled()); //We can only test this if the publisher is not there already. if (!isExistPublisher(TckPublisher.getSamPublisherId())) { saveSamSyndicator(); @@ -130,6 +134,7 @@ public class JUDDI_010_PublisherIntegrat @Test public void testGetAllPublishers() { Assume.assumeTrue(TckPublisher.isJUDDI()); + Assume.assumeTrue(TckPublisher.isEnabled()); GetAllPublisherDetail gp = new GetAllPublisherDetail(); gp.setAuthInfo(authInfo); try { @@ -149,6 +154,7 @@ public class JUDDI_010_PublisherIntegrat */ public boolean saveJoePublisher() { Assume.assumeTrue(TckPublisher.isJUDDI()); + Assume.assumeTrue(TckPublisher.isEnabled()); if (!isExistPublisher(TckPublisher.getJoePublisherId())) { savePublisher(TckPublisher.getJoePublisherId(), TckPublisher.JOE_PUBLISHER_XML); return true; @@ -163,6 +169,7 @@ public class JUDDI_010_PublisherIntegrat */ public void deleteJoePublisher() { Assume.assumeTrue(TckPublisher.isJUDDI()); + Assume.assumeTrue(TckPublisher.isEnabled()); deletePublisher(TckPublisher.getJoePublisherId()); } @@ -173,6 +180,7 @@ public class JUDDI_010_PublisherIntegrat */ public String saveSamSyndicator() { Assume.assumeTrue(TckPublisher.isJUDDI()); + Assume.assumeTrue(TckPublisher.isEnabled()); if (!isExistPublisher(TckPublisher.getSamPublisherId())) { savePublisher(TckPublisher.getSamPublisherId(), TckPublisher.SAM_SYNDICATOR_XML); } @@ -185,6 +193,7 @@ public class JUDDI_010_PublisherIntegrat */ public void deleteSamSyndicator() { Assume.assumeTrue(TckPublisher.isJUDDI()); + Assume.assumeTrue(TckPublisher.isEnabled()); deletePublisher(TckPublisher.getSamPublisherId()); } Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java (original) +++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java Sun Feb 16 21:12:11 2014 @@ -67,6 +67,7 @@ public class JUDDI_091_RMISubscriptionLi @BeforeClass public static void startManager() throws ConfigurationException { + Assume.assumeTrue(TckPublisher.isEnabled()); try { //bring up the RMISubscriptionListener //random port @@ -99,7 +100,7 @@ public class JUDDI_091_RMISubscriptionLi logger.debug("Getting auth tokens.."); try { - Transport transport = manager.getTransport(); + Transport transport = manager.getTransport("uddiv3"); UDDISecurityPortType security = transport.getUDDISecurityService(); authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword()); @@ -127,6 +128,7 @@ public class JUDDI_091_RMISubscriptionLi @Test public void joePublisher() { + Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isRMI()); Assume.assumeTrue(TckPublisher.isSubscriptionEnabled()); try { Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoIntegrationTest.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoIntegrationTest.java (original) +++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoIntegrationTest.java Sun Feb 16 21:12:11 2014 @@ -52,14 +52,14 @@ public class JUDDI_100_ClientSubscriptio @BeforeClass public static void startRegistry() throws ConfigurationException { - +Assume.assumeTrue(TckPublisher.isEnabled()); manager = new UDDIClient(); manager.start(); logger.debug("Getting auth tokens.."); try { - Transport transport = manager.getTransport(); + Transport transport = manager.getTransport("uddiv3"); security = transport.getUDDISecurityService(); authInfo = TckSecurity.getAuthToken(security, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword()); @@ -81,7 +81,8 @@ public class JUDDI_100_ClientSubscriptio @Test public void addClientSubscriptionInfo() throws Exception { - Assume.assumeTrue(TckPublisher.isJUDDI()); +Assume.assumeTrue(TckPublisher.isEnabled()); + Assume.assumeTrue(TckPublisher.isJUDDI()); ClientSubscriptionInfo clientSubscriptionInfo = new ClientSubscriptionInfo(); Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest.java (original) +++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest.java Sun Feb 16 21:12:11 2014 @@ -16,11 +16,14 @@ package org.apache.juddi.v3.tck; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; +import java.util.Map; import javax.xml.datatype.DatatypeFactory; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.juddi.api_v3.Node; import org.apache.juddi.jaxb.PrintUDDI; import org.apache.juddi.v3.client.UDDIConstants; import org.apache.juddi.v3.client.config.UDDIClerk; @@ -30,6 +33,7 @@ import org.apache.juddi.v3.client.subscr import org.apache.juddi.v3_service.JUDDIApiPortType; import org.junit.AfterClass; import org.junit.Assert; +import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; import org.uddi.api_v3.BindingTemplate; @@ -66,10 +70,20 @@ public class JUDDI_101_ClientSubscriptio @BeforeClass public static void startManager() throws ConfigurationException { - + Assume.assumeTrue(TckPublisher.isEnabled()); manager = new UDDIClient(); manager.start(); - clerk=manager.getClerk("default"); + Iterator<Node> iterator = manager.getClientConfig().getUDDINodeList().iterator(); + while (iterator.hasNext()){ + Node next = iterator.next(); + logger.info("NODE " + next.getClientName() + " " + next.getName() + " " + next.getProxyTransport()); + } + Iterator<Map.Entry<String, UDDIClerk>> iterator1 = manager.getClientConfig().getUDDIClerks().entrySet().iterator(); + while (iterator1.hasNext()){ + Map.Entry<String, UDDIClerk> next = iterator1.next(); + logger.info("CLERK " + next.getKey() + " " + next.getValue().getName()); + } + clerk = manager.getClerk("uddiv3"); clerk.setPassword(TckPublisher.getJoePassword()); clerk.setPublisher(TckPublisher.getJoePublisherId()); clerk.setIsPasswordEncrypted(false); @@ -84,10 +98,9 @@ public class JUDDI_101_ClientSubscriptio @Test public void SubscriptionCallbackTest1() throws Exception { //first some setup + Assume.assumeTrue(TckPublisher.isEnabled()); reset(); - - - + TModel createKeyGenator = UDDIClerk.createKeyGenator("somebusiness", "A test key domain SubscriptionCallbackTest1", "SubscriptionCallbackTest1"); Assert.assertNotNull(createKeyGenator); clerk.register(createKeyGenator); @@ -107,7 +120,7 @@ public class JUDDI_101_ClientSubscriptio logger.info("Registered business keygen: " + register.getBusinessKey()); //start up our listener - BindingTemplate start = SubscriptionCallbackListener.start(manager, "default"); + BindingTemplate start = SubscriptionCallbackListener.start(manager, "uddiv3"); Assert.assertNotNull(start); if (TckCommon.isDebug()) { @@ -128,7 +141,7 @@ public class JUDDI_101_ClientSubscriptio sub.getSubscriptionFilter().getFindBusiness().getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH); sub.getSubscriptionFilter().getFindBusiness().getName().add(new Name(UDDIConstants.WILDCARD, null)); - Subscription subscription = clerk.register(sub, clerk.getUDDINode().getApiNode()); + Subscription subscription = clerk.register(sub); if (TckCommon.isDebug()) { PrintUDDI<Subscription> p2 = new PrintUDDI<Subscription>(); logger.info(p2.print(subscription)); @@ -165,7 +178,7 @@ public class JUDDI_101_ClientSubscriptio logger.info("Callback check." + notifications); //Thread.sleep(2000); - SubscriptionCallbackListener.stop(manager, "default", start.getBindingKey()); + SubscriptionCallbackListener.stop(manager, "uddiv3", start.getBindingKey()); clerk.unRegisterSubscription(subscription.getSubscriptionKey()); clerk.unRegisterTModel(createKeyGenator.getTModelKey()); @@ -187,8 +200,7 @@ public class JUDDI_101_ClientSubscriptio @Override public void HandleCallback(SubscriptionResultsList body) { - if (TckCommon.isDebug()) - { + if (TckCommon.isDebug()) { PrintUDDI<SubscriptionResultsList> p2 = new PrintUDDI<SubscriptionResultsList>(); logger.info(p2.print(body)); } Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java (original) +++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java Sun Feb 16 21:12:11 2014 @@ -47,9 +47,10 @@ public class UDDI_010_PublisherIntegrati @Test public void testAuthToken() { + Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isUDDIAuthMode()); try { - Transport transport = manager.getTransport(); + Transport transport = manager.getTransport("uddiv3"); UDDISecurityPortType securityService = transport.getUDDISecurityService(); GetAuthToken getAuthToken = new GetAuthToken(); getAuthToken.setUserID(TckPublisher.getRootPublisherId()); Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java (original) +++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java Sun Feb 16 21:12:11 2014 @@ -20,9 +20,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.juddi.v3.client.config.UDDIClient; import org.apache.juddi.v3.client.transport.Transport; -import static org.apache.juddi.v3.tck.UDDI_040_BusinessServiceIntegrationTest.tckTModelJoe; import org.junit.AfterClass; import org.junit.Assert; +import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; import org.uddi.api_v3.TModelDetail; @@ -48,12 +48,12 @@ public class UDDI_020_TmodelIntegrationT @BeforeClass public static void startManager() throws ConfigurationException { - +Assume.assumeTrue(TckPublisher.isEnabled()); manager = new UDDIClient(); manager.start(); logger.debug("Getting auth tokens.."); try { - Transport transport = manager.getTransport(); + Transport transport = manager.getTransport("uddiv3"); UDDISecurityPortType security = transport.getUDDISecurityService(); authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword()); @@ -70,7 +70,7 @@ public class UDDI_020_TmodelIntegrationT } tckTModelJoe = new TckTModel(publication, inquiry); - transport = manager.getTransport(); + transport = manager.getTransport("uddiv3"); publication = transport.getUDDIPublishService(); inquiry = transport.getUDDIInquiryService(); if (!TckPublisher.isUDDIAuthMode()) { @@ -87,6 +87,7 @@ public class UDDI_020_TmodelIntegrationT @AfterClass public static void stopManager() throws ConfigurationException { + Assume.assumeTrue(TckPublisher.isEnabled()); tckTModelJoe.deleteCreatedTModels(authInfoJoe); tckTModelSam.deleteCreatedTModels(authInfoSam); manager.stop(); @@ -94,6 +95,7 @@ public class UDDI_020_TmodelIntegrationT @Test public void testJoePublisherTmodel() { + Assume.assumeTrue(TckPublisher.isEnabled()); tckTModelJoe.saveJoePublisherTmodel(authInfoJoe, true); //Now if we use a finder it should be found. @@ -119,6 +121,7 @@ public class UDDI_020_TmodelIntegrationT @Test public void testSamSyndicatorTmodelTest() { + Assume.assumeTrue(TckPublisher.isEnabled()); tckTModelSam.saveSamSyndicatorTmodel(authInfoSam); tckTModelSam.deleteSamSyndicatorTmodel(authInfoSam); } Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java (original) +++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java Sun Feb 16 21:12:11 2014 @@ -22,6 +22,7 @@ import org.apache.juddi.v3.client.config import org.apache.juddi.v3.client.transport.Transport; import org.junit.AfterClass; import org.junit.Assert; +import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; import org.uddi.v3_service.UDDIInquiryPortType; @@ -50,6 +51,7 @@ public class UDDI_030_BusinessEntityInte @AfterClass public static void stopManager() throws ConfigurationException { + Assume.assumeTrue(TckPublisher.isEnabled()); tckTModelJoe.deleteCreatedTModels(authInfoJoe); tckTModelSam.deleteCreatedTModels(authInfoSam); manager.stop(); @@ -57,12 +59,13 @@ public class UDDI_030_BusinessEntityInte @BeforeClass public static void startManager() throws ConfigurationException { + Assume.assumeTrue(TckPublisher.isEnabled()); manager = new UDDIClient(); manager.start(); logger.info("UDDI_030_BusinessEntityIntegrationTest"); logger.debug("Getting auth tokens.."); try { - Transport transport = manager.getTransport(); + Transport transport = manager.getTransport("uddiv3"); UDDISecurityPortType security = transport.getUDDISecurityService(); authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword()); @@ -81,7 +84,7 @@ public class UDDI_030_BusinessEntityInte tckFindEntityJoe = new TckFindEntity(inquiry); inquiryJoe = inquiry; - transport = manager.getTransport(); + transport = manager.getTransport("uddiv3"); publication = transport.getUDDIPublishService(); inquiry = transport.getUDDIInquiryService(); if (!TckPublisher.isUDDIAuthMode()) { @@ -94,7 +97,7 @@ public class UDDI_030_BusinessEntityInte inquirySam = inquiry; String authInfoUDDI = TckSecurity.getAuthToken(security, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword()); - transport = manager.getTransport(); + transport = manager.getTransport("uddiv3"); publication = transport.getUDDIPublishService(); inquiry = transport.getUDDIInquiryService(); if (!TckPublisher.isUDDIAuthMode()) { @@ -114,6 +117,7 @@ public class UDDI_030_BusinessEntityInte @Test public void testJoePublisherBusinessEntitySignature() { + Assume.assumeTrue(TckPublisher.isEnabled()); try { tckTModelJoe.saveJoePublisherTmodel(authInfoJoe); tckBusinessJoe.saveJoePublisherBusinessX509Signature(authInfoJoe); @@ -126,6 +130,7 @@ public class UDDI_030_BusinessEntityInte @Test public void testJoePublisherBusinessEntity() throws Exception{ + Assume.assumeTrue(TckPublisher.isEnabled()); try { tckTModelJoe.saveJoePublisherTmodel(authInfoJoe); tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe); @@ -138,6 +143,7 @@ public class UDDI_030_BusinessEntityInte @Test public void testSamSyndicatorBusiness() throws Exception{ + Assume.assumeTrue(TckPublisher.isEnabled()); try { tckTModelSam.saveSamSyndicatorTmodel(authInfoSam); tckBusinessSam.saveSamSyndicatorBusiness(authInfoSam); Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadIntegrationTest.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadIntegrationTest.java (original) +++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadIntegrationTest.java Sun Feb 16 21:12:11 2014 @@ -34,12 +34,14 @@ public class UDDI_030_BusinessEntityLoad @BeforeClass public static void setup() throws ConfigurationException { + Assume.assumeTrue(TckPublisher.isEnabled()); UDDI_030_BusinessEntityIntegrationTest.startManager(); } @Test @Override public void testJoePublisherBusinessEntity() throws Exception { + Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isLoadTest()); numberOfBusinesses = TckPublisher.getMaxLoadServices(); @@ -71,6 +73,7 @@ public class UDDI_030_BusinessEntityLoad @Test @Override public void testSamSyndicatorBusiness() throws Exception { + Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isLoadTest()); logger.info("UDDI_030_BusinessEntityLoadIntegrationTest testSamSyndicatorBusiness Load test " + numberOfBusinesses); numberOfBusinesses = TckPublisher.getMaxLoadServices(); Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java (original) +++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java Sun Feb 16 21:12:11 2014 @@ -22,6 +22,7 @@ import org.apache.juddi.v3.client.config import org.apache.juddi.v3.client.transport.Transport; import org.junit.AfterClass; import org.junit.Assert; +import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; import org.uddi.v3_service.UDDIInquiryPortType; @@ -50,6 +51,7 @@ public class UDDI_040_BusinessServiceInt @AfterClass public static void stopManager() throws ConfigurationException { + Assume.assumeTrue(TckPublisher.isEnabled()); tckTModelJoe.deleteCreatedTModels(authInfoJoe); tckTModelSam.deleteCreatedTModels(authInfoSam); manager.stop(); @@ -57,12 +59,13 @@ public class UDDI_040_BusinessServiceInt @BeforeClass public static void startManager() throws ConfigurationException { + Assume.assumeTrue(TckPublisher.isEnabled()); manager = new UDDIClient(); manager.start(); logger.debug("Getting auth tokens.."); try { - Transport transport = manager.getTransport(); + Transport transport = manager.getTransport("uddiv3"); UDDISecurityPortType security = transport.getUDDISecurityService(); authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword()); authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword()); @@ -81,7 +84,7 @@ public class UDDI_040_BusinessServiceInt tckBusinessServiceJoe = new TckBusinessService(publication, inquiry); inquiryJoe = inquiry; - transport = manager.getTransport(); + transport = manager.getTransport("uddiv3"); publication = transport.getUDDIPublishService(); inquiry = transport.getUDDIInquiryService(); if (!TckPublisher.isUDDIAuthMode()) { @@ -93,7 +96,7 @@ public class UDDI_040_BusinessServiceInt tckBusinessServiceSam = new TckBusinessService(publication, inquiry); inquirySam = inquiry; - transport = manager.getTransport(); + transport = manager.getTransport("uddiv3"); publication = transport.getUDDIPublishService(); inquiry = transport.getUDDIInquiryService(); String authInfoUDDI = TckSecurity.getAuthToken(security, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword()); @@ -113,6 +116,7 @@ public class UDDI_040_BusinessServiceInt @Test public void joepublisher() throws Exception { + Assume.assumeTrue(TckPublisher.isEnabled()); try { tckTModelJoe.saveJoePublisherTmodel(authInfoJoe); tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe); @@ -126,6 +130,7 @@ public class UDDI_040_BusinessServiceInt @Test public void samsyndicator() throws Exception { + Assume.assumeTrue(TckPublisher.isEnabled()); try { tckTModelSam.saveSamSyndicatorTmodel(authInfoSam); @@ -154,6 +159,7 @@ public class UDDI_040_BusinessServiceInt */ @Test public void joepublisherMoveBusinessService() { + Assume.assumeTrue(TckPublisher.isEnabled()); try { tckTModelJoe.saveJoePublisherTmodel(authInfoJoe); tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe); Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadIntegrationTest.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadIntegrationTest.java (original) +++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadIntegrationTest.java Sun Feb 16 21:12:11 2014 @@ -31,6 +31,7 @@ public class UDDI_040_BusinessServiceLoa int numberOfServices=1100; @Test @Override public void joepublisher() throws Exception{ + Assume.assumeTrue(TckPublisher.isEnabled()); logger.info("UDDI_040_BusinessServiceLoadIntegrationTest joepublisher Servoce Load test " + numberOfServices); Assume.assumeTrue(TckPublisher.isLoadTest()); numberOfServices = TckPublisher.getMaxLoadServices(); @@ -63,6 +64,7 @@ public class UDDI_040_BusinessServiceLoa @Test @Override public void samsyndicator() throws Exception { + Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isLoadTest()); logger.info("UDDI_040_BusinessServiceLoadIntegrationTest samsyndicator Servoce Load test " + numberOfServices); numberOfServices = TckPublisher.getMaxLoadServices(); Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java (original) +++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java Sun Feb 16 21:12:11 2014 @@ -22,6 +22,7 @@ import org.apache.juddi.v3.client.config import org.apache.juddi.v3.client.transport.Transport; import org.junit.AfterClass; import org.junit.Assert; +import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; import org.uddi.v3_service.UDDIInquiryPortType; @@ -46,6 +47,7 @@ public class UDDI_050_BindingTemplateInt @AfterClass public static void stopManager() throws ConfigurationException { + Assume.assumeTrue(TckPublisher.isEnabled()); tckTModel.deleteCreatedTModels(authInfoJoe); manager.stop(); @@ -53,12 +55,13 @@ public class UDDI_050_BindingTemplateInt @BeforeClass public static void startManager() throws ConfigurationException { + Assume.assumeTrue(TckPublisher.isEnabled()); manager = new UDDIClient(); manager.start(); logger.debug("Getting auth tokens.."); try { - Transport transport = manager.getTransport(); + Transport transport = manager.getTransport("uddiv3"); UDDISecurityPortType security = transport.getUDDISecurityService(); UDDIPublicationPortType publication = transport.getUDDIPublishService(); UDDIInquiryPortType inquiry = transport.getUDDIInquiryService(); @@ -77,7 +80,7 @@ public class UDDI_050_BindingTemplateInt tckFindEntity = new TckFindEntity(inquiry); - transport = manager.getTransport(); + transport = manager.getTransport("uddiv3"); security = transport.getUDDISecurityService(); publication = transport.getUDDIPublishService(); inquiry = transport.getUDDIInquiryService(); @@ -99,6 +102,7 @@ public class UDDI_050_BindingTemplateInt @Test public void joepublisher() { + Assume.assumeTrue(TckPublisher.isEnabled()); try { tckTModel.saveJoePublisherTmodel(authInfoJoe); tckBusiness.saveJoePublisherBusiness(authInfoJoe); @@ -114,6 +118,7 @@ public class UDDI_050_BindingTemplateInt @Test public void findService() { + Assume.assumeTrue(TckPublisher.isEnabled()); try { tckTModel.saveJoePublisherTmodel(authInfoJoe); tckBusiness.saveJoePublisherBusiness(authInfoJoe); Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java?rev=1568829&r1=1568828&r2=1568829&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java (original) +++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java Sun Feb 16 21:12:11 2014 @@ -27,6 +27,7 @@ import org.apache.juddi.v3.client.config import org.apache.juddi.v3.client.transport.Transport; import org.junit.AfterClass; import org.junit.Assert; +import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; import org.uddi.v3_service.UDDIInquiryPortType; @@ -55,6 +56,7 @@ public class UDDI_060_PublisherAssertion @AfterClass public static void stopManager() throws ConfigurationException { + Assume.assumeTrue(TckPublisher.isEnabled()); tckTModelJoe.deleteCreatedTModels(authInfoJoe); tckTModelSam.deleteCreatedTModels(authInfoSam); tckTModelMary.deleteCreatedTModels(authInfoMary); @@ -63,12 +65,13 @@ public class UDDI_060_PublisherAssertion @BeforeClass public static void startManager() throws ConfigurationException { + Assume.assumeTrue(TckPublisher.isEnabled()); manager = new UDDIClient(); manager.start(); logger.debug("Getting auth tokens.."); try { - Transport transport = manager.getTransport(); + Transport transport = manager.getTransport("uddiv3"); UDDISecurityPortType security = transport.getUDDISecurityService(); authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword()); authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword()); @@ -86,7 +89,7 @@ public class UDDI_060_PublisherAssertion tckAssertionJoe = new TckPublisherAssertion(publication); tckFindEntityJoe = new TckFindEntity(inquiry); - transport = manager.getTransport(); + transport = manager.getTransport("uddiv3"); publication = transport.getUDDIPublishService(); inquiry = transport.getUDDIInquiryService(); if (!TckPublisher.isUDDIAuthMode()) { @@ -99,7 +102,7 @@ public class UDDI_060_PublisherAssertion tckFindEntitySam = new TckFindEntity(inquiry); - transport = manager.getTransport(); + transport = manager.getTransport("uddiv3"); publication = transport.getUDDIPublishService(); inquiry = transport.getUDDIInquiryService(); if (!TckPublisher.isUDDIAuthMode()) { @@ -110,6 +113,7 @@ public class UDDI_060_PublisherAssertion tckBusinessMary = new TckBusiness(publication, inquiry); tckAssertionMary = new TckPublisherAssertion(publication); tckFindEntityMary = new TckFindEntity(inquiry); + tckTModelJoe.saveTmodels(authInfoJoe); } catch (Exception e) { logger.error(e.getMessage(), e); @@ -119,6 +123,7 @@ public class UDDI_060_PublisherAssertion @Test public void testJoepublisherToSamSyndicator() { + Assume.assumeTrue(TckPublisher.isEnabled()); try { tckTModelJoe.saveJoePublisherTmodel(authInfoJoe); tckTModelSam.saveSamSyndicatorTmodel(authInfoSam); @@ -140,6 +145,7 @@ public class UDDI_060_PublisherAssertion */ @Test public void testFindNoAssertions() { + Assume.assumeTrue(TckPublisher.isEnabled()); try { tckTModelJoe.saveJoePublisherTmodel(authInfoJoe); tckTModelSam.saveSamSyndicatorTmodel(authInfoSam); @@ -171,6 +177,7 @@ public class UDDI_060_PublisherAssertion */ @Test public void testFindAssertions() { + Assume.assumeTrue(TckPublisher.isEnabled()); try { tckTModelJoe.saveJoePublisherTmodel(authInfoJoe); tckTModelSam.saveSamSyndicatorTmodel(authInfoSam); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
