Repository: juddi Updated Branches: refs/heads/master 3e354954d -> 193fa4c56
JUDDI-977 more findbugs fixes JUDDI-960 test cleanup Project: http://git-wip-us.apache.org/repos/asf/juddi/repo Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/193fa4c5 Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/193fa4c5 Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/193fa4c5 Branch: refs/heads/master Commit: 193fa4c56e8a44c9672a043d5e9e56c1d6cc99c2 Parents: 3e35495 Author: Alex O'Ree <[email protected]> Authored: Mon Oct 9 10:42:08 2017 -0400 Committer: Alex O'Ree <[email protected]> Committed: Mon Oct 9 10:42:08 2017 -0400 ---------------------------------------------------------------------- .../juddi/v3/client/config/UDDIClerk.java | 2 +- .../v3/client/config/UDDIClerkServlet.java | 2 +- .../v3/client/config/UDDIKeyConvention.java | 3 +- .../apache/juddi/v3/client/config/UDDINode.java | 2 +- .../client/cryptor/TransportSecurityHelper.java | 20 +-- .../apache/juddi/api/runtime/CLIServerTest.java | 2 - pom.xml | 17 ++ uddi-tck/pom.xml | 2 + .../tck/JUDDI_300_MultiNodeIntegrationTest.java | 4 +- ...I_170_ValueSetValidationIntegrationTest.java | 172 ++++++++++--------- 10 files changed, 125 insertions(+), 101 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/juddi/blob/193fa4c5/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java index 29c54b9..4c25dc9 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java @@ -129,7 +129,7 @@ public class UDDIClerk implements Serializable { private static final long serialVersionUID = -8597375975981358134L; - private Log log = LogFactory.getLog(this.getClass()); + private static final Log log = LogFactory.getLog(UDDIClerk.class); protected String name; protected UDDINode uddiNode; protected String publisher; http://git-wip-us.apache.org/repos/asf/juddi/blob/193fa4c5/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java index 6c973c1..ac08326 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java @@ -32,7 +32,7 @@ public class UDDIClerkServlet extends HttpServlet { private static final long serialVersionUID = -91998529871296125L; private static final Log logger = LogFactory.getLog(UDDIClerkServlet.class); - private UDDIClient manager = null; + private transient UDDIClient manager = null; /** * Starting the UDDIClient http://git-wip-us.apache.org/repos/asf/juddi/blob/193fa4c5/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIKeyConvention.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIKeyConvention.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIKeyConvention.java index 0e2165e..2a9c800 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIKeyConvention.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIKeyConvention.java @@ -91,6 +91,7 @@ public class UDDIKeyConvention * @param properties * @param serviceName * @param portName + * @param bindingUrl * @return the bindingKey */ public static String getBindingKey(Properties properties, QName serviceName, String portName, URI bindingUrl) { @@ -108,7 +109,7 @@ public class UDDIKeyConvention } tempProperties.put("serverPort", String.valueOf(port)); //Constructing the binding Key - String keyFormat = properties.getProperty(Property.BINDING_KEY_FORMAT, DEFAULT_BINDING_KEY_FORMAT); + String keyFormat = tempProperties.getProperty(Property.BINDING_KEY_FORMAT, DEFAULT_BINDING_KEY_FORMAT); String bindingKey = TokenResolver.replaceTokens(keyFormat, tempProperties).toLowerCase(); return bindingKey; } http://git-wip-us.apache.org/repos/asf/juddi/blob/193fa4c5/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java index ade25c5..a28ec16 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java @@ -34,7 +34,7 @@ public class UDDINode implements Serializable { private static final long serialVersionUID = 5721040459195558161L; private Properties properties; - private Transport transport; + private transient Transport transport; private boolean isHomeJUDDI; private String name; http://git-wip-us.apache.org/repos/asf/juddi/blob/193fa4c5/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/TransportSecurityHelper.java ---------------------------------------------------------------------- diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/TransportSecurityHelper.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/TransportSecurityHelper.java index ed8b07e..29c05b9 100644 --- a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/TransportSecurityHelper.java +++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/TransportSecurityHelper.java @@ -21,7 +21,6 @@ import java.security.KeyStore; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; import javax.xml.ws.BindingProvider; import org.apache.commons.logging.Log; @@ -75,16 +74,15 @@ public class TransportSecurityHelper { } if (keystore.exists()) { + TrustManagerFactory tmFact = null; FileInputStream fis = null; + SSLContext sc = SSLContext.getInstance("SSLv3"); + KeyManagerFactory kmf + = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()); try { log.info("Using keystore from " + keystore.getAbsolutePath() + " current dir is " + currentdir.getAbsolutePath()); log.info("Using truststore from " + truststore.getAbsolutePath() + " current dir is " + currentdir.getAbsolutePath()); - //log.info("Using truststure from " + truststore.getAbsolutePath() + " current dir is " + currentdir.getAbsolutePath()); - SSLContext sc = SSLContext.getInstance("SSLv3"); - - KeyManagerFactory kmf - = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()); KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType()); try { @@ -101,8 +99,11 @@ public class TransportSecurityHelper { kmf.init(ks, pwd.toCharArray()); String alg = TrustManagerFactory.getDefaultAlgorithm(); - TrustManagerFactory tmFact = TrustManagerFactory.getInstance(alg); - + tmFact = TrustManagerFactory.getInstance(alg); + } catch (Exception ex) { + log.warn("unable to establish ssl settings", ex); + } + try { fis = new FileInputStream(st); KeyStore kst = KeyStore.getInstance("jks"); try { @@ -117,8 +118,7 @@ public class TransportSecurityHelper { tmFact.init(kst); - //TrustManager[] tms = tmFact.getTrustManagers(); - sc.init(kmf.getKeyManagers(), null, null); + sc.init(kmf.getKeyManagers(), tmFact.getTrustManagers(), null); HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory()); ((BindingProvider) webServicePort).getRequestContext().put("com.sun.xml.internal.ws.transport.https.client.SSLSocketFactory", sc.getSocketFactory()); ((BindingProvider) webServicePort).getRequestContext().put("com.sun.xml.ws.transport.https.client.SSLSocketFactory", sc.getSocketFactory()); http://git-wip-us.apache.org/repos/asf/juddi/blob/193fa4c5/juddi-core/src/test/java/org/apache/juddi/api/runtime/CLIServerTest.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/test/java/org/apache/juddi/api/runtime/CLIServerTest.java b/juddi-core/src/test/java/org/apache/juddi/api/runtime/CLIServerTest.java index dbb5bba..f60c3e0 100644 --- a/juddi-core/src/test/java/org/apache/juddi/api/runtime/CLIServerTest.java +++ b/juddi-core/src/test/java/org/apache/juddi/api/runtime/CLIServerTest.java @@ -15,7 +15,6 @@ */ package org.apache.juddi.api.runtime; -import java.math.BigInteger; import java.util.Random; import javax.xml.ws.BindingProvider; import javax.xml.ws.Endpoint; @@ -26,7 +25,6 @@ import org.apache.juddi.v3_service.JUDDIApiPortType; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import org.uddi.repl_v3.HighWaterMarkVectorType; import org.uddi.repl_v3.ReplicationConfiguration; import org.uddi.v3_service.UDDIReplicationPortType; import org.apache.juddi.v3.client.UDDIService; http://git-wip-us.apache.org/repos/asf/juddi/blob/193fa4c5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 369844b..ccb600e 100644 --- a/pom.xml +++ b/pom.xml @@ -525,6 +525,23 @@ under the License. </reportSet> </reportSets> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>3.0.5</version> + </plugin> + <plugin> + <groupId>com.github.spyhunter99</groupId> + <artifactId>findbugs-report-plugin</artifactId> + <version>1.0.0</version> + <reportSets> + <reportSet> + <reports> + <report>findbugs-aggregate</report> + </reports> + </reportSet> + </reportSets> + </plugin> </plugins> </reporting> <modules> http://git-wip-us.apache.org/repos/asf/juddi/blob/193fa4c5/uddi-tck/pom.xml ---------------------------------------------------------------------- diff --git a/uddi-tck/pom.xml b/uddi-tck/pom.xml index 0bd6cbc..c2de320 100644 --- a/uddi-tck/pom.xml +++ b/uddi-tck/pom.xml @@ -321,6 +321,7 @@ </goals> <configuration> <skip>false</skip> + <runOrder>alphabetical</runOrder> <skipAfterFailureCount>1</skipAfterFailureCount> <systemProperties> <property> @@ -407,6 +408,7 @@ <goal>test</goal> </goals> <configuration> + <runOrder>random</runOrder> <skip>false</skip> <systemProperties> <property> http://git-wip-us.apache.org/repos/asf/juddi/blob/193fa4c5/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 ddf98f5..a98964b 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 @@ -547,7 +547,9 @@ public class JUDDI_300_MultiNodeIntegrationTest { } - Assert.assertNotNull(tModelDetail); + if (tModelDetail==null) + TckCommon.PrintMarker(); + Assert.assertNotNull("node 2 never got mary's tmodel key generator", tModelDetail); Assert.assertNotNull(tModelDetail.getTModel()); Assert.assertTrue(tModelDetail.getTModel().size() == 1); Assert.assertTrue(tModelDetail.getTModel().get(0).getTModelKey().equals(TckTModel.MARY_PUBLISHER_TMODEL_KEY)); http://git-wip-us.apache.org/repos/asf/juddi/blob/193fa4c5/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java index a376ac4..927cf23 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java @@ -156,24 +156,24 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV BusinessEntity SaveBusiness = null; BusinessEntity SaveVSVCallbackService = null; try { - Reset(); + reset(); VALID = true; - SaveVSVCallbackService = SaveVSVCallbackService(authInfoJoe, publicationJoe); - SaveCheckedTModel(TckTModel.JOE_PUBLISHER_KEY_PREFIX + TMODEL, SaveVSVCallbackService.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(0).getBindingKey()); + SaveVSVCallbackService = saveVSVCallbackService(authInfoJoe, publicationJoe); + saveCheckedTModel(TckTModel.JOE_PUBLISHER_KEY_PREFIX + TMODEL, SaveVSVCallbackService.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(0).getBindingKey()); logger.info("Saving a business using those values"); - SaveBusiness = SaveBusiness(authInfoJoe, true, TckTModel.JOE_PUBLISHER_KEY_PREFIX + TMODEL); + SaveBusiness = saveBusiness(authInfoJoe, true, TckTModel.JOE_PUBLISHER_KEY_PREFIX + TMODEL); - DeleteTModel(authInfoJoe, TckTModel.JOE_PUBLISHER_KEY_PREFIX + TMODEL, publicationJoe); + deleteTModel(authInfoJoe, TckTModel.JOE_PUBLISHER_KEY_PREFIX + TMODEL, publicationJoe); } catch (Exception ex) { logger.error(ex); Assert.fail("unexpected failure " + ex.getMessage()); } finally { if (SaveBusiness != null) { - DeleteBusiness(authInfoJoe, SaveBusiness.getBusinessKey(), publicationJoe); + deleteBusiness(authInfoJoe, SaveBusiness.getBusinessKey(), publicationJoe); } if (SaveVSVCallbackService != null) { - DeleteBusiness(authInfoJoe, SaveVSVCallbackService.getBusinessKey(), publicationJoe); + deleteBusiness(authInfoJoe, SaveVSVCallbackService.getBusinessKey(), publicationJoe); } } @@ -188,29 +188,29 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV BusinessEntity SaveBusiness = null; BusinessEntity SaveVSVCallbackService = null; try { - Reset(); + reset(); VALID = false; - SaveVSVCallbackService = SaveVSVCallbackService(authInfoJoe, publicationJoe); - SaveCheckedTModel(TckTModel.JOE_PUBLISHER_KEY_PREFIX + TMODEL, SaveVSVCallbackService.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(0).getBindingKey()); + SaveVSVCallbackService = saveVSVCallbackService(authInfoJoe, publicationJoe); + saveCheckedTModel(TckTModel.JOE_PUBLISHER_KEY_PREFIX + TMODEL, SaveVSVCallbackService.getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(0).getBindingKey()); logger.info("Saving a business using those values"); - SaveBusiness = SaveBusiness(authInfoJoe, false, TckTModel.JOE_PUBLISHER_KEY_PREFIX + TMODEL); + SaveBusiness = saveBusiness(authInfoJoe, false, TckTModel.JOE_PUBLISHER_KEY_PREFIX + TMODEL); Assert.assertTrue(messagesReceived == 1); Assert.fail("unexpected success"); } catch (Exception ex) { logger.info("Expected failure " + ex.getMessage()); } finally { if (SaveBusiness != null) { - DeleteBusiness(authInfoJoe, SaveBusiness.getBusinessKey(), publicationJoe); + deleteBusiness(authInfoJoe, SaveBusiness.getBusinessKey(), publicationJoe); } if (SaveVSVCallbackService != null) { - DeleteBusiness(authInfoJoe, SaveVSVCallbackService.getBusinessKey(), publicationJoe); + deleteBusiness(authInfoJoe, SaveVSVCallbackService.getBusinessKey(), publicationJoe); } - DeleteTModel(authInfoJoe, TckTModel.JOE_PUBLISHER_KEY_PREFIX + TMODEL, publicationJoe); + deleteTModel(authInfoJoe, TckTModel.JOE_PUBLISHER_KEY_PREFIX + TMODEL, publicationJoe); } } - private BusinessEntity SaveBusiness(String authInfoJoe, boolean isValid, String key) throws Exception { + private BusinessEntity saveBusiness(String authInfoJoe, boolean isValid, String key) throws Exception { SaveBusiness sb = new SaveBusiness(); sb.setAuthInfo(authInfoJoe); BusinessEntity be = new BusinessEntity(); @@ -226,7 +226,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV return saveBusiness.getBusinessEntity().get(0); } - private void SaveCheckedTModel(String key, String binding) throws Exception { + private void saveCheckedTModel(String key, String binding) throws Exception { TModel tm = new TModel(); tm.setTModelKey(key); tm.setCategoryBag(new CategoryBag()); @@ -265,7 +265,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV throw new DispositionReportFaultMessage("error", dispositionReport); } - private BusinessEntity SaveVSVCallbackService(String auth, UDDIPublicationPortType port) throws Exception { + private BusinessEntity saveVSVCallbackService(String auth, UDDIPublicationPortType port) throws Exception { SaveBusiness sb = new SaveBusiness(); sb.setAuthInfo(auth); BusinessEntity be = new BusinessEntity(); @@ -283,14 +283,14 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV return port.saveBusiness(sb).getBusinessEntity().get(0); } - private void DeleteTModel(String auth, String key, UDDIPublicationPortType port) throws Exception { + private void deleteTModel(String auth, String key, UDDIPublicationPortType port) throws Exception { DeleteTModel db = new DeleteTModel(); db.setAuthInfo(auth); db.getTModelKey().add(key); port.deleteTModel(db); } - private void DeleteBusiness(String auth, String key, UDDIPublicationPortType port) throws Exception { + private void deleteBusiness(String auth, String key, UDDIPublicationPortType port) throws Exception { DeleteBusiness db = new DeleteBusiness(); db.setAuthInfo(auth); db.getBusinessKey().add(key); @@ -300,7 +300,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV String url = null; int messagesReceived = 0; - private void Reset() throws Exception { + private void reset() throws Exception { messagesReceived = 0; if (ep == null || !ep.isPublished()) { int httpPort = 9600 + new Random().nextInt(99); @@ -343,7 +343,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV //TODO maybe? · E_unsupported: Signifies that the Web service does not support this API. //this may be untestable unless the endpoint exists but isn't implemented - public void DerviedFromValid() throws Exception { + public void derviedFromValid() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); @@ -358,11 +358,11 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.setAuthInfo(authInfoJoe); stm.getTModel().add(tm); TModelDetail saveTModel = publicationJoe.saveTModel(stm); - DeleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); + deleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); } @Test - public void DerviedFromInValid() throws Exception { + public void derviedFromInValid() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("DerviedFromInValid"); @@ -377,7 +377,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.setAuthInfo(authInfoJoe); stm.getTModel().add(tm); TModelDetail saveTModel = publicationJoe.saveTModel(stm); - DeleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); + deleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); Assert.fail("unexpected success"); } catch (Exception ex) { logger.info("Expected failure " + ex.getMessage()); @@ -388,7 +388,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV } @Test - public void EntitKeyValuesValid() throws Exception { + public void entitKeyValuesValid() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("EntitKeyValuesValid"); @@ -402,12 +402,12 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.setAuthInfo(authInfoJoe); stm.getTModel().add(tm); TModelDetail saveTModel = publicationJoe.saveTModel(stm); - DeleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); + deleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); } @Test - public void EntitKeyValuesInValid() throws Exception { + public void entitKeyValuesInValid() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("EntitKeyValuesInValid"); @@ -422,7 +422,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.setAuthInfo(authInfoJoe); stm.getTModel().add(tm); TModelDetail saveTModel = publicationJoe.saveTModel(stm); - DeleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); + deleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); Assert.fail("unexpected success"); } catch (Exception ex) { logger.info("Expected failure " + ex.getMessage()); @@ -434,7 +434,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV @Test @Ignore - public void UDDINodeValid() throws Exception { + public void uddiNodeValid() throws Exception { //This test should be ignored, only one business per node is allowed to be the node Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); @@ -447,11 +447,11 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV sb.setAuthInfo(authInfoJoe); sb.getBusinessEntity().add(be); BusinessDetail saveBusiness = publicationJoe.saveBusiness(sb); - DeleteBusiness(authInfoJoe, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); + deleteBusiness(authInfoJoe, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); } @Test - public void UDDINodeInValid1() throws Exception { + public void uddiNodeInValid1() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("UDDINodeInValid1"); @@ -464,7 +464,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV sb.setAuthInfo(authInfoJoe); sb.getBusinessEntity().add(be); BusinessDetail saveBusiness = publicationJoe.saveBusiness(sb); - DeleteBusiness(authInfoJoe, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); + deleteBusiness(authInfoJoe, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); Assert.fail("unexpected success"); } catch (Exception ex) { logger.info("Expected failure " + ex.getMessage()); @@ -475,7 +475,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV } @Test - public void UDDINodeInValid2() throws Exception { + public void uddiNodeInValid2() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("UDDINodeInValid2"); @@ -493,7 +493,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV sb.setAuthInfo(authInfoJoe); sb.getBusinessEntity().add(be); BusinessDetail saveBusiness = publicationJoe.saveBusiness(sb); - DeleteBusiness(authInfoJoe, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); + deleteBusiness(authInfoJoe, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); Assert.fail("unexpected success"); } catch (Exception ex) { logger.info("Expected failure " + ex.getMessage()); @@ -504,7 +504,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV } @Test - public void OwningBusinessValid() throws Exception { + public void owningBusinessValid() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("OwningBusinessValid"); @@ -518,11 +518,11 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.setAuthInfo(authInfoJoe); stm.getTModel().add(tm); TModelDetail saveTModel = publicationJoe.saveTModel(stm); - DeleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); + deleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); } @Test - public void OwningBusinessInValid() throws Exception { + public void owningBusinessInValid() throws Exception { System.out.println("OwningBusinessInValid"); try { Assume.assumeTrue(TckPublisher.isEnabled()); @@ -535,7 +535,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV sb.setAuthInfo(authInfoJoe); sb.getBusinessEntity().add(be); BusinessDetail saveBusiness = publicationJoe.saveBusiness(sb); - DeleteBusiness(authInfoJoe, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); + deleteBusiness(authInfoJoe, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); Assert.fail("unexpected success"); } catch (Exception ex) { logger.info("Expected failure " + ex.getMessage()); @@ -546,7 +546,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV } @Test - public void OwningBusinessInValid2() throws Exception { + public void owningBusinessInValid2() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("OwningBusinessInValid2"); @@ -561,7 +561,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.setAuthInfo(authInfoJoe); stm.getTModel().add(tm); TModelDetail saveTModel = publicationJoe.saveTModel(stm); - DeleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); + deleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); Assert.fail("unexpected success"); } catch (Exception ex) { logger.info("Expected failure " + ex.getMessage()); @@ -572,7 +572,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV } @Test - public void TypeTmodelValid() throws Exception { + public void typeTmodelValid() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("TypeTmodelValid"); @@ -586,12 +586,12 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.setAuthInfo(authInfoJoe); stm.getTModel().add(tm); TModelDetail saveTModel = publicationJoe.saveTModel(stm); - DeleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); + deleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); } @Test - public void TypeTModelInValid() throws Exception { + public void typeTModelInValid() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("TypeTModelInValid"); @@ -606,7 +606,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.setAuthInfo(authInfoJoe); stm.getTModel().add(tm); TModelDetail saveTModel = publicationJoe.saveTModel(stm); - DeleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); + deleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); Assert.fail("unexpected success"); } catch (Exception ex) { logger.info("Expected failure " + ex.getMessage()); @@ -617,7 +617,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV } @Test - public void TypeBindingInValid() throws Exception { + public void typeBindingInValid() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("TypeBindingInValid"); @@ -640,7 +640,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV bt.setCategoryBag(new CategoryBag()); bt.getCategoryBag().getKeyedReference().add(new KeyedReference("uddi:uddi.org:categorization:types", "", "namespace")); publicationJoe.saveBinding(sbb); - DeleteBusiness(authInfoJoe, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); + deleteBusiness(authInfoJoe, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); Assert.fail("unexpected success"); } catch (Exception ex) { logger.info("Expected failure " + ex.getMessage()); @@ -651,7 +651,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV } @Test - public void TypeBindingValid() throws Exception { + public void rypeBindingValid() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("TypeBindingValid"); @@ -674,17 +674,17 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV bt.getCategoryBag().getKeyedReference().add(new KeyedReference("uddi:uddi.org:categorization:types", "", "wsdlDeployment")); sbb.getBindingTemplate().add(bt); publicationJoe.saveBinding(sbb); - DeleteBusiness(authInfoJoe, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); + deleteBusiness(authInfoJoe, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); } @Test - public void ValidatedByInValid() throws Exception { + public void ralidatedByInValid() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("ValidatedByInValid"); BusinessEntity SaveVSVCallbackService = null; try { - SaveVSVCallbackService = SaveVSVCallbackService(authInfoJoe, publicationJoe); + SaveVSVCallbackService = saveVSVCallbackService(authInfoJoe, publicationJoe); TModel tm = new TModel(); //tm.setTModelKey(); @@ -696,23 +696,23 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.setAuthInfo(authInfoJoe); stm.getTModel().add(tm); TModelDetail saveTModel = publicationJoe.saveTModel(stm); - DeleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); + deleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); Assert.fail("unexpected success"); } catch (Exception ex) { logger.info("Expected failure " + ex.getMessage()); logger.debug("Expected failure " + ex.getMessage(), ex); } finally { - DeleteBusiness(authInfoJoe, SaveVSVCallbackService.getBusinessKey(), publicationJoe); + deleteBusiness(authInfoJoe, SaveVSVCallbackService.getBusinessKey(), publicationJoe); } } @Test - public void ValidatedByValid() throws Exception { + public void ralidatedByValid() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("ValidatedByValid"); - BusinessEntity SaveVSVCallbackService = SaveVSVCallbackService(authInfoJoe, publicationJoe); + BusinessEntity SaveVSVCallbackService = saveVSVCallbackService(authInfoJoe, publicationJoe); TModel tm = new TModel(); //tm.setTModelKey(); @@ -724,13 +724,13 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.setAuthInfo(authInfoJoe); stm.getTModel().add(tm); TModelDetail saveTModel = publicationJoe.saveTModel(stm); - DeleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); - DeleteBusiness(authInfoJoe, SaveVSVCallbackService.getBusinessKey(), publicationJoe); + deleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); + deleteBusiness(authInfoJoe, SaveVSVCallbackService.getBusinessKey(), publicationJoe); } @Test - public void ReplacedByValid() throws Exception { + public void replacedByValid() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("ReplacedByValid"); @@ -751,12 +751,12 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.setAuthInfo(authInfoJoe); stm.getTModel().add(tm); TModelDetail saveTModel1 = publicationJoe.saveTModel(stm); - DeleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); - DeleteTModel(authInfoJoe, saveTModel1.getTModel().get(0).getTModelKey(), publicationJoe); + deleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); + deleteTModel(authInfoJoe, saveTModel1.getTModel().get(0).getTModelKey(), publicationJoe); } @Test - public void ReplacedByValid2() throws Exception { + public void replacedByValid2() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("ReplacedByValid2"); @@ -777,12 +777,12 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.setAuthInfo(authInfoJoe); stm.getTModel().add(tm); TModelDetail saveTModel1 = publicationJoe.saveTModel(stm); - DeleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); - DeleteTModel(authInfoJoe, saveTModel1.getTModel().get(0).getTModelKey(), publicationJoe); + deleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); + deleteTModel(authInfoJoe, saveTModel1.getTModel().get(0).getTModelKey(), publicationJoe); } @Test - public void ReplacedByValid3() throws Exception { + public void replacedByValid3() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("ReplacedByValid3"); @@ -803,12 +803,12 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.setAuthInfo(authInfoJoe); stm.getBusinessEntity().add(tm); BusinessDetail saveBusiness1 = publicationJoe.saveBusiness(stm); - DeleteBusiness(authInfoJoe, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); - DeleteBusiness(authInfoJoe, saveBusiness1.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); + deleteBusiness(authInfoJoe, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); + deleteBusiness(authInfoJoe, saveBusiness1.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); } @Test - public void ReplacedByValid4() throws Exception { + public void replacedByValid4() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("ReplacedByValid4"); @@ -829,12 +829,12 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.setAuthInfo(authInfoJoe); stm.getBusinessEntity().add(tm); BusinessDetail saveBusiness1 = publicationJoe.saveBusiness(stm); - DeleteBusiness(authInfoJoe, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); - DeleteBusiness(authInfoJoe, saveBusiness1.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); + deleteBusiness(authInfoJoe, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); + deleteBusiness(authInfoJoe, saveBusiness1.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); } @Test - public void ReplacedByValid5Projected() throws Exception { + public void replacedByValid5Projected() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("ReplacedByValid5Projected"); @@ -854,11 +854,11 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.IS_REPLACED_BY, "", TckTModel.JOE_PUBLISHER_KEY_PREFIX + "testbiz")); stm.getBusinessEntity().add(tm); BusinessDetail saveBusiness = publicationJoe.saveBusiness(stm); - DeleteBusiness(authInfoJoe, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); + deleteBusiness(authInfoJoe, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); } @Test - public void ReplacedByValid6DifferentOwners() throws Exception { + public void replacedByValid6DifferentOwners() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("ReplacedByValid6DifferentOwners"); @@ -883,14 +883,18 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.getBusinessEntity().add(tm); BusinessDetail saveBusiness1 = publicationJoe.saveBusiness(stm); - DeleteBusiness(authInfoJoe, saveBusiness1.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); - DeleteBusiness(authInfoMary, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationMary); + deleteBusiness(authInfoJoe, saveBusiness1.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); + deleteBusiness(authInfoMary, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationMary); } @Test - public void ReplacedByValid7DifferentOwners() throws Exception { + public void replacedByValid7DifferentOwners() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); + + TckTModel tmodel = new TckTModel(publicationJoe, inquiry); + tmodel.saveJoePublisherTmodel(authInfoJoe); + System.out.println("ReplacedByValid7DifferentOwners"); BusinessEntity tm = new BusinessEntity(); tm.setBusinessKey(TckTModel.MARY_KEY_PREFIX + "testbiz"); @@ -912,8 +916,8 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.getBusinessEntity().add(tm); BusinessDetail saveBusiness1 = publicationJoe.saveBusiness(stm); - DeleteBusiness(authInfoJoe, saveBusiness1.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); - DeleteBusiness(authInfoMary, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationMary); + deleteBusiness(authInfoJoe, saveBusiness1.getBusinessEntity().get(0).getBusinessKey(), publicationJoe); + deleteBusiness(authInfoMary, saveBusiness.getBusinessEntity().get(0).getBusinessKey(), publicationMary); } /** @@ -922,7 +926,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV * @throws Exception */ @Test - public void ReplacedByInValid() throws Exception { + public void replacedByInValid() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("ReplacedByInValid"); @@ -936,7 +940,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.setAuthInfo(authInfoJoe); stm.getTModel().add(tm); TModelDetail saveTModel = publicationJoe.saveTModel(stm); - DeleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); + deleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); Assert.fail("unexpected success"); } catch (Exception ex) { logger.info("Expected failure " + ex.getMessage()); @@ -952,7 +956,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV * @throws Exception */ @Test - public void ReplacedByInValid2() throws Exception { + public void replacedByInValid2() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("ReplacedByInValid2"); @@ -966,7 +970,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.setAuthInfo(authInfoJoe); stm.getTModel().add(tm); TModelDetail saveTModel = publicationJoe.saveTModel(stm); - DeleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); + deleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); Assert.fail("unexpected success"); } catch (Exception ex) { logger.info("Expected failure " + ex.getMessage()); @@ -977,7 +981,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV } @Test - public void RelationshipsValid() throws Exception { + public void relationshipsValid() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("RelationshipsValid"); @@ -990,12 +994,12 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.setAuthInfo(authInfoJoe); stm.getTModel().add(tm); TModelDetail saveTModel = publicationJoe.saveTModel(stm); - DeleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); + deleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); } @Test - public void RelationshipsInValid() throws Exception { + public void relationshipsInValid() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isValueSetAPIEnabled()); System.out.println("RelationshipsInValid"); @@ -1010,7 +1014,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV stm.setAuthInfo(authInfoJoe); stm.getTModel().add(tm); TModelDetail saveTModel = publicationJoe.saveTModel(stm); - DeleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); + deleteTModel(authInfoJoe, saveTModel.getTModel().get(0).getTModelKey(), publicationJoe); Assert.fail("unexpected success"); } catch (Exception ex) { logger.info("Expected failure " + ex.getMessage()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
