Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_070_FindEntityIntegrationTest.java URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_070_FindEntityIntegrationTest.java?rev=1569566&r1=1569565&r2=1569566&view=diff ============================================================================== --- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_070_FindEntityIntegrationTest.java (original) +++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v2/tck/UDDI_070_FindEntityIntegrationTest.java Tue Feb 18 23:52:23 2014 @@ -15,17 +15,15 @@ package org.apache.juddi.v2.tck; import java.util.Arrays; -import java.util.UUID; import javax.xml.ws.BindingProvider; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.juddi.v3.client.UDDIConstants; +import org.apache.juddi.v3.client.UDDIv2Constants; 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; @@ -45,6 +43,8 @@ import org.uddi.v2_service.*; * href="http://uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Ref535479804";>UDDI spec * on valid find qualifiers</a> * + * http://uddi.org/pubs/ProgrammersAPI-V2.04-Published-20020719.htm#_Toc13195659 + * * @author <a href="mailto:[email protected]";>Jeff Faath</a> * @author <a href="mailto:[email protected]";>Kurt T Stam</a> * @author <a href="mailto:[email protected]";>Alex O'Ree</a> @@ -63,14 +63,14 @@ public class UDDI_070_FindEntityIntegrat @AfterClass public static void stopManager() throws ConfigurationException { - Assume.assumeTrue(TckPublisher.isEnabled()); + Assume.assumeTrue(TckPublisher.isEnabled()); tckTModel.deleteCreatedTModels(authInfoJoe); manager.stop(); } @BeforeClass public static void startManager() throws ConfigurationException { - Assume.assumeTrue(TckPublisher.isEnabled()); + Assume.assumeTrue(TckPublisher.isEnabled()); manager = new UDDIClient(); manager.start(); @@ -103,7 +103,7 @@ public class UDDI_070_FindEntityIntegrat @Test public void findEntities() { - Assume.assumeTrue(TckPublisher.isEnabled()); + Assume.assumeTrue(TckPublisher.isEnabled()); try { tckTModel.saveJoePublisherTmodel(authInfoJoe, true); tckBusiness.saveJoePublisherBusiness(authInfoJoe); @@ -128,12 +128,10 @@ public class UDDI_070_FindEntityIntegrat } } - - private void before() { tckTModel.saveJoePublisherTmodel(authInfoJoe, true); tckBusiness.saveJoePublisherBusiness(authInfoJoe); - + tckBusinessService.saveJoePublisherService(authInfoJoe); } private void after() { @@ -141,125 +139,480 @@ public class UDDI_070_FindEntityIntegrat tckTModel.deleteJoePublisherTmodel(authInfoJoe); } - private void findbuinsess(String fq) throws Exception { + private void findbusinsess(String[] fq, String criteria) throws Exception { FindBusiness fb = new FindBusiness(); //fb.setAuthInfo(authInfoJoe); fb.setGeneric("2.0"); fb.setFindQualifiers(new FindQualifiers()); - fb.getFindQualifiers().getFindQualifier().add(fq); - fb.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH); - fb.getName().add(new Name(UDDIConstants.WILDCARD, null)); + fb.getFindQualifiers().getFindQualifier().addAll(Arrays.asList(fq)); + + fb.getName().add(new Name(criteria, null)); inquiry.findBusiness(fb); } - private void findservice(String fq) throws Exception { + private void findservice(String[] fq, String criteria) throws Exception { FindService fb = new FindService(); //fb.setAuthInfo(authInfoJoe); - fb.setFindQualifiers(new FindQualifiers()); fb.setGeneric("2.0"); - fb.getFindQualifiers().getFindQualifier().add(fq); - fb.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH); - fb.getName().add(new Name(UDDIConstants.WILDCARD, null)); + fb.setFindQualifiers(new FindQualifiers()); + fb.getFindQualifiers().getFindQualifier().addAll(Arrays.asList(fq)); + fb.getName().add(new Name(criteria, null)); inquiry.findService(fb); } - private void findtmodel(String fq) throws Exception { + private void findtmodel(String[] fq, String criteria) throws Exception { FindTModel fb = new FindTModel(); //fb.setAuthInfo(authInfoJoe); - fb.setFindQualifiers(new FindQualifiers()); fb.setGeneric("2.0"); - fb.getFindQualifiers().getFindQualifier().add(fq); - fb.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH); - fb.setName(new Name(UDDIConstants.WILDCARD, null)); + fb.setFindQualifiers(new FindQualifiers()); + fb.getFindQualifiers().getFindQualifier().addAll(Arrays.asList(fq)); + fb.setName(new Name(criteria, null)); inquiry.findTModel(fb); } - private void findbinding(String fq) throws Exception { + private void findbinding(String[] fq) throws Exception { + before(); FindBinding fb = new FindBinding(); //fb.setAuthInfo(authInfoJoe); - fb.setFindQualifiers(new FindQualifiers()); - fb.getFindQualifiers().getFindQualifier().add(fq); fb.setGeneric("2.0"); - //fb.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH); - //fb.setName(new Name(UDDIConstants.WILDCARD, null)); + fb.setServiceKey(TckBusinessService.JOE_SERVICE_KEY); + fb.setFindQualifiers(new FindQualifiers()); + fb.getFindQualifiers().getFindQualifier().addAll(Arrays.asList(fq)); + fb.setTModelBag(new TModelBag()); + fb.getTModelBag().getTModelKey().add("uuid:A035A07C-F362-44DD-8F95-E2B134BF43B4"); + //general key words inquiry.findBinding(fb); + after(); } - private void findrelated(String fq) throws Exception { + private void findrelated(String[] fq) throws Exception { before(); FindRelatedBusinesses fb = new FindRelatedBusinesses(); fb.setBusinessKey(TckBusiness.JOE_BUSINESS_KEY); - //fb.setAuthInfo(authInfoJoe); fb.setGeneric("2.0"); + //fb.setAuthInfo(authInfoJoe); fb.setFindQualifiers(new FindQualifiers()); - fb.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH); - fb.getFindQualifiers().getFindQualifier().add(fq); + fb.getFindQualifiers().getFindQualifier().addAll(Arrays.asList(fq)); inquiry.findRelatedBusinesses(fb); after(); } - private void findbuinsess(String[] fq) throws Exception { - FindBusiness fb = new FindBusiness(); - //fb.setAuthInfo(authInfoJoe); - fb.setGeneric("2.0"); - fb.setFindQualifiers(new FindQualifiers()); - fb.getFindQualifiers().getFindQualifier().addAll(Arrays.asList(fq)); + @Test + public void exactNameMatch_1() throws Exception { + findbusinsess(new String[]{UDDIv2Constants.exactNameMatch}, "Joe"); + } - fb.getName().add(new Name(UDDIConstants.WILDCARD, null)); - inquiry.findBusiness(fb); + @Test + public void exactNameMatch_2() throws Exception { + findservice(new String[]{UDDIv2Constants.exactNameMatch}, "Joe"); } - private void findservice(String[] fq) throws Exception { - FindService fb = new FindService(); - //fb.setAuthInfo(authInfoJoe); - fb.setGeneric("2.0"); - fb.setFindQualifiers(new FindQualifiers()); - fb.getFindQualifiers().getFindQualifier().addAll(Arrays.asList(fq)); - fb.getName().add(new Name(UDDIConstants.WILDCARD, null)); - inquiry.findService(fb); + @Test + public void exactNameMatch_3() throws Exception { + findtmodel(new String[]{UDDIv2Constants.exactNameMatch}, "Joe"); } - private void findtmodel(String[] fq) throws Exception { - FindTModel fb = new FindTModel(); - //fb.setAuthInfo(authInfoJoe); - fb.setGeneric("2.0"); - fb.setFindQualifiers(new FindQualifiers()); - fb.getFindQualifiers().getFindQualifier().addAll(Arrays.asList(fq)); - fb.setName(new Name(UDDIConstants.WILDCARD, null)); - inquiry.findTModel(fb); + @Test + public void exactNameMatch_4() throws Exception { + try { + findbinding(new String[]{UDDIv2Constants.exactNameMatch}); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } } - private void findbinding(String[] fq) throws Exception { - FindBinding fb = new FindBinding(); - //fb.setAuthInfo(authInfoJoe); - fb.setGeneric("2.0"); - fb.setFindQualifiers(new FindQualifiers()); - fb.getFindQualifiers().getFindQualifier().addAll(Arrays.asList(fq)); - //fb.setName(new Name(UDDIConstants.WILDCARD, null)); - inquiry.findBinding(fb); + @Test + public void exactNameMatch_5() throws Exception { + try { + findrelated(new String[]{UDDIv2Constants.exactNameMatch}); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } } - private void findbinding(String[] fq, KeyedReference[] cats) throws Exception { - FindBinding fb = new FindBinding(); - //fb.setAuthInfo(authInfoJoe); - fb.setFindQualifiers(new FindQualifiers()); - fb.getFindQualifiers().getFindQualifier().addAll(Arrays.asList(fq)); - fb.setGeneric("2.0"); - //fb.setName(new Name(UDDIConstants.WILDCARD, null)); - inquiry.findBinding(fb); + @Test + public void caseSensitiveMatch_1() throws Exception { + findbusinsess(new String[]{UDDIv2Constants.caseSensitiveMatch}, "Joe"); } - private void findrelated(String[] fq) throws Exception { - before(); - FindRelatedBusinesses fb = new FindRelatedBusinesses(); - fb.setBusinessKey(TckBusiness.JOE_BUSINESS_KEY); - fb.setGeneric("2.0"); - //fb.setAuthInfo(authInfoJoe); - fb.setFindQualifiers(new FindQualifiers()); - fb.getFindQualifiers().getFindQualifier().addAll(Arrays.asList(fq)); - inquiry.findRelatedBusinesses(fb); - after(); + @Test + public void caseSensitiveMatch_2() throws Exception { + findservice(new String[]{UDDIv2Constants.caseSensitiveMatch}, "Joe"); } + @Test + public void caseSensitiveMatch_3() throws Exception { + findtmodel(new String[]{UDDIv2Constants.caseSensitiveMatch}, "Joe"); + } + + @Test + public void caseSensitiveMatch_4() throws Exception { + try { + findbinding(new String[]{UDDIv2Constants.caseSensitiveMatch}); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } + @Test + public void caseSensitiveMatch_5() throws Exception { + try { + findrelated(new String[]{UDDIv2Constants.caseSensitiveMatch}); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } + + @Test + public void sortByNameAsc_1() throws Exception { + findbusinsess(new String[]{UDDIv2Constants.sortByNameAsc}, "Joe"); + } + + @Test + public void sortByNameAsc_2() throws Exception { + findservice(new String[]{UDDIv2Constants.sortByNameAsc}, "Joe"); + } + + @Test + public void sortByNameAsc_3() throws Exception { + findtmodel(new String[]{UDDIv2Constants.sortByNameAsc}, "Joe"); + } + + @Test + public void sortByNameAsc_4() throws Exception { + try { + findbinding(new String[]{UDDIv2Constants.sortByNameAsc}); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } + + @Test + public void sortByNameAsc_5() throws Exception { + findrelated(new String[]{UDDIv2Constants.sortByNameAsc}); + } + + @Test + public void sortByNameDesc_1() throws Exception { + findbusinsess(new String[]{UDDIv2Constants.sortByNameDesc}, "Joe"); + } + + @Test + public void sortByNameDesc_2() throws Exception { + findservice(new String[]{UDDIv2Constants.sortByNameDesc}, "Joe"); + } + + @Test + public void sortByNameDesc_3() throws Exception { + findtmodel(new String[]{UDDIv2Constants.sortByNameDesc}, "Joe"); + } + + @Test + public void sortByNameDesc_4() throws Exception { + try { + findbinding(new String[]{UDDIv2Constants.sortByNameDesc}); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } + + @Test + public void sortByNameDesc_5() throws Exception { + findrelated(new String[]{UDDIv2Constants.sortByNameDesc}); + } + + @Test + public void sortByDateAsc_1() throws Exception { + findbusinsess(new String[]{UDDIv2Constants.sortByDateAsc}, "Joe"); + } + + @Test + public void sortByDateAsc_2() throws Exception { + findservice(new String[]{UDDIv2Constants.sortByDateAsc}, "Joe"); + } + + @Test + public void sortByDateAsc_3() throws Exception { + findtmodel(new String[]{UDDIv2Constants.sortByDateAsc}, "Joe"); + } + + @Test + public void sortByDateAsc_4() throws Exception { + try { + findbinding(new String[]{UDDIv2Constants.sortByDateAsc}); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } + + @Test + public void sortByDateAsc_5() throws Exception { + findrelated(new String[]{UDDIv2Constants.sortByDateAsc}); + } + + @Test + public void sortByDateDesc_1() throws Exception { + findbusinsess(new String[]{UDDIv2Constants.sortByDateDesc}, "Joe"); + } + + @Test + public void sortByDateDesc_2() throws Exception { + findservice(new String[]{UDDIv2Constants.sortByDateDesc}, "Joe"); + } + + @Test + public void sortByDateDesc_3() throws Exception { + findtmodel(new String[]{UDDIv2Constants.sortByDateDesc}, "Joe"); + } + + @Test + public void sortByDateDesc_4() throws Exception { + try { + findbinding(new String[]{UDDIv2Constants.sortByDateDesc}); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } + + @Test + public void sortByDateDesc_5() throws Exception { + findrelated(new String[]{UDDIv2Constants.sortByDateDesc}); + } + + @Test + public void orLikeKeys_1() throws Exception { + findbusinsess(new String[]{UDDIv2Constants.orLikeKeys}, "Joe"); + } + + @Test + public void orLikeKeys_2() throws Exception { + findservice(new String[]{UDDIv2Constants.orLikeKeys}, "Joe"); + } + + @Test + public void orLikeKeys_3() throws Exception { + findtmodel(new String[]{UDDIv2Constants.orLikeKeys}, "Joe"); + } + + @Test + public void orLikeKeys_4() throws Exception { + try { + findbinding(new String[]{UDDIv2Constants.orLikeKeys}); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } + + @Test + public void orLikeKeys_5() throws Exception { + try { + findrelated(new String[]{UDDIv2Constants.orLikeKeys}); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } + + @Test + public void orAllKeys_1() throws Exception { + findbusinsess(new String[]{UDDIv2Constants.orAllKeys}, "Joe"); + } + + @Test + public void orAllKeys_2() throws Exception { + findservice(new String[]{UDDIv2Constants.orAllKeys}, "Joe"); + } + + @Test + public void orAllKeys_3() throws Exception { + findtmodel(new String[]{UDDIv2Constants.orAllKeys}, "Joe"); + } + + /** + * This test should pass, but juddi fails for some reason with business service not found + * @throws Exception + */ + @Test + @Ignore + public void orAllKeys_4() throws Exception { + logger.info("Hello world!"); + try { + findbinding(new String[]{UDDIv2Constants.orAllKeys}); + + } catch (Exception ex) { + logger.error("fail", ex); + throw ex; + } + } + + @Test + public void orAllKeys_5() throws Exception { + try { + findrelated(new String[]{UDDIv2Constants.orAllKeys}); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } + + @Test + public void combineCategoryBags_1() throws Exception { + findbusinsess(new String[]{UDDIv2Constants.combineCategoryBags}, "Joe"); + } + + @Test + public void combineCategoryBags_2() throws Exception { + try { + findservice(new String[]{UDDIv2Constants.combineCategoryBags}, "Joe"); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } + + @Test + public void combineCategoryBags_3() throws Exception { + try { + findtmodel(new String[]{UDDIv2Constants.combineCategoryBags}, "Joe"); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } + + @Test + public void combineCategoryBags_4() throws Exception { + try { + findbinding(new String[]{UDDIv2Constants.combineCategoryBags}); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } + + @Test + public void combineCategoryBags_5() throws Exception { + try { + findrelated(new String[]{UDDIv2Constants.combineCategoryBags}); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } + + @Test + public void serviceSubset_1() throws Exception { + findbusinsess(new String[]{UDDIv2Constants.serviceSubset}, "Joe"); + } + + @Test + public void serviceSubset_2() throws Exception { + try { + findservice(new String[]{UDDIv2Constants.serviceSubset}, "Joe"); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } + + @Test + public void serviceSubset_3() throws Exception { + try { + findtmodel(new String[]{UDDIv2Constants.serviceSubset}, "Joe"); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } + + @Test + public void serviceSubset_4() throws Exception { + try { + findbinding(new String[]{UDDIv2Constants.serviceSubset}); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } + + @Test + public void serviceSubset_5() throws Exception { + try { + findrelated(new String[]{UDDIv2Constants.serviceSubset}); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } + + @Test + public void andAllKeys_1() throws Exception { + findbusinsess(new String[]{UDDIv2Constants.andAllKeys}, "Joe"); + } + + @Test + public void andAllKeys_2() throws Exception { + try { + findservice(new String[]{UDDIv2Constants.andAllKeys}, "Joe"); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } + + @Test + public void andAllKeys_3() throws Exception { + findtmodel(new String[]{UDDIv2Constants.andAllKeys}, "Joe"); + } + + @Test + public void andAllKeys_4() throws Exception { + try { + findbinding(new String[]{UDDIv2Constants.andAllKeys}); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } + + @Test + public void andAllKeys_5() throws Exception { + try { + findrelated(new String[]{UDDIv2Constants.andAllKeys}); + Assert.fail("unexpected success"); + } catch (Exception ex) { + logger.info("Expected failure: " + ex.getMessage()); + logger.debug("Expected failure: " + ex.getMessage(), ex); + } + } }
--------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
