Author: alexoree
Date: Mon Mar 25 21:52:21 2013
New Revision: 1460909
URL: http://svn.apache.org/r1460909
Log:
Adding a simple readme to help people get up and running quickly.
ValidatePublish removed some unused flags
Adding UDDI_141_JIRAIntegrationTest which covers
JIRA: JUDDI-574 - this will probably break the build until someone solves the
root cause
JIRA: JUDDI-571
Added:
juddi/trunk/readme.txt
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java?rev=1460909&r1=1460908&r2=1460909&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
Mon Mar 25 21:52:21 2013
@@ -103,37 +103,6 @@ public class ValidatePublish extends Val
public ValidatePublish(UddiEntityPublisher publisher) {
super(publisher);
- buildInTmodels = new HashSet<String>();
- buildInTmodels.add("uddi:uddi.org:keygenerator");
- buildInTmodels.add("uddi:uddi.org:categorization:types");
- buildInTmodels.add("uddi:uddi.org:categorization:keygenerator");
- buildInTmodels.add("uddi:uddi.org:sortorder:keygenerator");
- buildInTmodels.add("uddi:uddi.org:transport:keygenerator");
- buildInTmodels.add("uddi:uddi.org:v3_inquiry");
- buildInTmodels.add("uddi:uddi.org:v3_publication");
- buildInTmodels.add("uddi:uddi.org:v3_security");
- buildInTmodels.add("uddi:uddi.org:categorization:general_keywords");
- buildInTmodels.add("uddi:uddi.org:categorization:nodes");
- buildInTmodels.add("uddi:uddi.org:relationships");
- buildInTmodels.add("uddi:uddi.org:categorization:owningbusiness");
- buildInTmodels.add("uddi:uddi.org:categorization:entitykeyvalues");
- buildInTmodels.add("uddi:uddi.org:identifier:isreplacedby");
- buildInTmodels.add("uddi:uddi.org:categorization:validatedby");
- buildInTmodels.add("uddi:uddi.org:categorization:derivedfrom");
- buildInTmodels.add("uddi:uddi.org:categorization:entitykeyvalues");
- buildInTmodels.add("uddi:uddi.org:protocol:serverauthenticatedssl3");
- buildInTmodels.add("uddi:uddi.org:protocol:mutualauthenticatedssl3");
- buildInTmodels.add("uddi:uddi.org:transport:http");
- buildInTmodels.add("uddi:uddi.org:transport:smtp");
- buildInTmodels.add("uddi:uddi.org:transport:ftp");
- buildInTmodels.add("uddi:uddi.org:transport:fax");
- buildInTmodels.add("uddi:uddi.org:transport:telephone");
- buildInTmodels.add("uddi:uddi.org:transport:rmi");
- buildInTmodels.add("uddi:uddi.org:transport:jndi-rmi");
- buildInTmodels.add("uddi:uddi.org:findqualifier:approximatematch");
- //note save tmodel/catbag/kr can reference itself!
-
-
}
public void validateDeleteBusiness(EntityManager em, DeleteBusiness body)
throws DispositionReportFaultMessage {
Added: juddi/trunk/readme.txt
URL: http://svn.apache.org/viewvc/juddi/trunk/readme.txt?rev=1460909&view=auto
==============================================================================
--- juddi/trunk/readme.txt (added)
+++ juddi/trunk/readme.txt Mon Mar 25 21:52:21 2013
@@ -0,0 +1,28 @@
+Welcome to the Apache JUDDI Project!
+
+Here's some quick notes for building, testing and deploying JUDDI from source.
+
+1) Aquire a JDK5 or higher and setup the JAVA_HOME environment variable
+2) Aquire Apache Maven. Known working version: 3.0.4
+3) Setup an environment variable, MAVEN_OPTS=-Xmx768m -XX:MaxPermSize=512m
+4) Make sure the Maven/bin folder and the JDK/bin folders are in the current
path
+5) execute "mvn clean install"
+
+That should build the whole project. Depending on your computer's speed, it
can take up to 15 minutes to build.
+
+To attach the debugger to the build process
+mvn -Dmaven.surefire.debug clean install
+It listens on port 5005 by default. More info on debugginb maven projects is
here
http://maven.apache.org/surefire/maven-surefire-plugin/examples/debugging.html
+
+To setup an Eclipse environment with support for building using the Google Web
Toolkit portlets in Pluto, see the blog entry here
http://apachejuddi.blogspot.com/2013_02_01_archive.html
+Eclipse will initially complain about maven plugins.
+
+To setup a Netbeans environment, the process is much simplier.
+Install Netbeans and open the project. Compiling from Netbeans however doesn't
work and you'll have to resort to command line builds
+
+
+To build your changes locally and skip the the tests run:
+
+To also build the Pluto/GWT/Portlet interface
+cd juddi-console
+mvn clean install
\ No newline at end of file
Added:
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java?rev=1460909&view=auto
==============================================================================
---
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java
(added)
+++
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java
Mon Mar 25 21:52:21 2013
@@ -0,0 +1,655 @@
+/*
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.juddi.v3.tck;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.soap.SOAPFault;
+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.config.UDDIClerkManager;
+import org.apache.juddi.v3.client.transport.Transport;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.uddi.api_v3.*;
+import org.uddi.v3_service.UDDIInquiryPortType;
+import org.uddi.v3_service.UDDIPublicationPortType;
+import org.uddi.v3_service.UDDISecurityPortType;
+
+/**
+ * This test class provides test cases of items discovered or reported through
+ * the Juddi JIRA issue tracker The idea is that these tests apply to any UDDI
+ * registry and that the tests are either implied or derived requirements
+ * defined in the UDDI spec that were missed in other test cases for Juddi.
+ *
+ * @author Alex O'Ree
+ */
+public class UDDI_141_JIRAIntegrationTest {
+
+ private static Log logger =
LogFactory.getLog(UDDI_141_JIRAIntegrationTest.class);
+ static UDDISecurityPortType security = null;
+ static UDDIInquiryPortType inquiry = null;
+ static UDDIPublicationPortType publication = null;
+ protected static String authInfoJoe = null;
+ protected static String authInfoSam = null;
+ private static UDDIClerkManager manager;
+ static final String str256 =
"1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111";
+ static final String str255 =
"111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111";
+ static final String strkey256 =
"uddi:11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111";
+ static final String strkey256_1 =
"uddi:org.apache:omething.something.something.something.something.something.something.something.something.something.something.something.something.something.something.something.something.something.something.something.something.something.something.somethi.com";
+ static final String str26 = "11111111111111111111111111";
+ static final String str27 = "111111111111111111111111110";
+ static final String str10 = "0123456789";
+ static final String str11 = "01234567890";
+ static final String str80 =
"01234567890123456789012345678901234567890123456789012345678901234567890123456789";
+ static final String str81 =
"012345678901234567890123456789012345678901234567890123456789012345678901234567891";
+ static final String TRANS = "The transaction has been rolled back";
+ static final String str4096 =
"123456700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000012345670000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000123456700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000012345670000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000123456700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000012345670000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000123456700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000012345670000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000XXXXXXXX";
+ static final String str4097 =
"123456700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000012345670000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000123456700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000012345670000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000123456700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000012345670000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000123456700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000012345670000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000XXXXXXXXZ";
+ static final String str51 =
"111111111111111111111111111111111111111111111111111";
+ static final String str50 =
"11111111111111111111111111111111111111111111111111";
+ static final String MISSING_RESOURCE = "Can't find resource for bundle";
+
+ @AfterClass
+ public void stopManager() throws ConfigurationException {
+ manager.stop();
+ }
+
+ @BeforeClass
+ public void startManager() throws ConfigurationException {
+ manager = new UDDIClerkManager();
+ manager.start();
+
+ logger.debug("Getting auth tokens..");
+ try {
+ Transport transport = manager.getTransport();
+ security = transport.getUDDISecurityService();
+ authInfoJoe = TckSecurity.getAuthToken(security,
TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
+ authInfoSam = TckSecurity.getAuthToken(security,
TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
+ Assert.assertNotNull(authInfoJoe);
+ Assert.assertNotNull(authInfoSam);
+
+ publication = transport.getUDDIPublishService();
+ inquiry = transport.getUDDIInquiryService();
+
+
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("Could not obtain authInfo token.");
+ }
+ }
+
+ static void HandleException(Exception ex) {
+ System.err.println("Error caught of type " +
ex.getClass().getCanonicalName());
+ ex.printStackTrace();
+ if (ex.getMessage() != null) {
+ Assert.assertFalse(ex.getMessage().contains(TRANS));
+ Assert.assertFalse(ex.getMessage().contains(MISSING_RESOURCE));
+ }
+ if (ex instanceof SOAPFault) {
+ SOAPFault sf = (SOAPFault) ex;
+ if
(!sf.getTextContent().contains("org.apache.juddi.v3.error.ValueNotAllowedException"))
{
+ Assert.fail();
+ }
+ }
+ }
+
+ @Test
+ public void JUDDI_JIRA_571_Part1_Test() {
+ //add a business
+ //add a business with lang defined
+ //find business with lang defined, expecting one result
+ //find business without lang defined, expecting 2 results
+ List<String> businesskeysToDelete = new ArrayList<String>();
+ String failuremsg = "";
+ System.out.println("JUDDI_JIRA_571_Part1_Test");
+ SaveBusiness sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoJoe);
+ BusinessEntity be = new BusinessEntity();
+ Name n = new Name();
+ n.setValue("JUDDI_JIRA_571_Part1_Test no lang");
+ be.getName().add(n);
+ sb.getBusinessEntity().add(be);
+
+ be = new BusinessEntity();
+ n = new Name();
+ n.setValue("JUDDI_JIRA_571_Part1_Test with lang");
+ n.setLang("en");
+ be.getName().add(n);
+ sb.getBusinessEntity().add(be);
+ try {
+ BusinessDetail saveBusiness = publication.saveBusiness(sb);
+
businesskeysToDelete.add(saveBusiness.getBusinessEntity().get(0).getBusinessKey());
+
businesskeysToDelete.add(saveBusiness.getBusinessEntity().get(1).getBusinessKey());
+
+ } catch (Exception ex) {
+ HandleException(ex);
+ Assert.fail("unexpected failure");
+ }
+
+ int found1 = 0;
+ FindBusiness fb = new FindBusiness();
+ fb.setAuthInfo(authInfoJoe);
+ n = new Name();
+ n.setValue("%");
+ fb.getName().add(n);
+ fb.setFindQualifiers(new FindQualifiers());
+
fb.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ try {
+ BusinessList findBusiness = inquiry.findBusiness(fb);
+ if (findBusiness.getBusinessInfos() != null) {
+ for (int i = 0; i <
findBusiness.getBusinessInfos().getBusinessInfo().size(); i++) {
+ if
(businesskeysToDelete.contains(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey()))
{
+ found1++;
+ }
+ }
+ }
+ } catch (Exception ex) {
+ HandleException(ex);
+ Assert.fail("unexpected failure");
+ }
+ if (found1 != 2) {
+ failuremsg += "No lang defined, " + found1 + " records found
instead of 2";
+ }
+
+
+
+ found1 = 0;
+ fb = new FindBusiness();
+ fb.setAuthInfo(authInfoJoe);
+ n = new Name();
+ n.setLang("en");
+ n.setValue("%");
+ fb.getName().add(n);
+ fb.setFindQualifiers(new FindQualifiers());
+
fb.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ try {
+ BusinessList findBusiness = inquiry.findBusiness(fb);
+ if (findBusiness.getBusinessInfos() != null) {
+ for (int i = 0; i <
findBusiness.getBusinessInfos().getBusinessInfo().size(); i++) {
+ if
(businesskeysToDelete.contains(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey()))
{
+ found1++;
+ }
+ }
+ }
+ } catch (Exception ex) {
+ HandleException(ex);
+ Assert.fail("unexpected failure");
+ }
+ if (found1 != 1) {
+ failuremsg += "Lang defined, " + found1 + " records found instead
of 1";
+ }
+
+
+ DeleteBusinesses(businesskeysToDelete);
+ if (failuremsg.length() > 0) {
+ Assert.fail(failuremsg);
+ }
+ System.out.println("Pass");
+
+ }
+
+ @Test
+ public void JUDDI_JIRA_571_Part2_Test() {
+ //add a service
+ //add a service with lang defined
+ //find service with lang defined, expecting one result
+ //find service without lang defined, expecting 2 results
+
+
+
+ List<String> businesskeysToDelete = new ArrayList<String>();
+ List<String> targetServiceKeys = new ArrayList<String>();
+ String failuremsg = "";
+ System.out.println("JUDDI_JIRA_571_Part2_Test");
+ SaveBusiness sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoJoe);
+ BusinessEntity be = new BusinessEntity();
+ Name n = new Name();
+ n.setValue("JUDDI_JIRA_571_Part2_Test no lang");
+ be.getName().add(n);
+ sb.getBusinessEntity().add(be);
+
+ BusinessService bs = new BusinessService();
+ n = new Name();
+ n.setValue("Service1 No Lang");
+ bs.getName().add(n);
+ be.setBusinessServices(new BusinessServices());
+ be.getBusinessServices().getBusinessService().add(bs);
+
+ bs = new BusinessService();
+ n = new Name();
+ n.setValue("Service2 Lang");
+ n.setLang("en");
+ bs.getName().add(n);
+ be.getBusinessServices().getBusinessService().add(bs);
+ try {
+ BusinessDetail saveBusiness = publication.saveBusiness(sb);
+
businesskeysToDelete.add(saveBusiness.getBusinessEntity().get(0).getBusinessKey());
+
targetServiceKeys.add(saveBusiness.getBusinessEntity().get(0).getBusinessServices().getBusinessService().get(0).getServiceKey());
+
targetServiceKeys.add(saveBusiness.getBusinessEntity().get(0).getBusinessServices().getBusinessService().get(1).getServiceKey());
+
+ } catch (Exception ex) {
+ HandleException(ex);
+ Assert.fail("unexpected failure");
+ }
+
+ int found1 = 0;
+ FindService fb = new FindService();
+ fb.setAuthInfo(authInfoJoe);
+ n = new Name();
+ n.setValue("%");
+ fb.getName().add(n);
+ fb.setFindQualifiers(new FindQualifiers());
+
fb.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ try {
+ ServiceList findBusiness = inquiry.findService(fb);
+ if (findBusiness.getServiceInfos() != null) {
+ for (int i = 0; i <
findBusiness.getServiceInfos().getServiceInfo().size(); i++) {
+ if
(targetServiceKeys.contains(findBusiness.getServiceInfos().getServiceInfo().get(i).getServiceKey()))
{
+ found1++;
+ }
+ }
+ }
+ } catch (Exception ex) {
+ HandleException(ex);
+ Assert.fail("unexpected failure");
+ }
+ if (found1 != 2) {
+ failuremsg += "No lang defined, " + found1 + " records found
instead of 2";
+ }
+
+
+
+ found1 = 0;
+ fb = new FindService();
+ fb.setAuthInfo(authInfoJoe);
+ n = new Name();
+ n.setLang("en");
+ n.setValue("%");
+ fb.getName().add(n);
+ fb.setFindQualifiers(new FindQualifiers());
+
fb.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ try {
+ ServiceList findBusiness = inquiry.findService(fb);
+ if (findBusiness.getServiceInfos() != null) {
+ for (int i = 0; i <
findBusiness.getServiceInfos().getServiceInfo().size(); i++) {
+ if
(businesskeysToDelete.contains(findBusiness.getServiceInfos().getServiceInfo().get(i).getBusinessKey()))
{
+ found1++;
+ }
+ }
+ }
+ } catch (Exception ex) {
+ HandleException(ex);
+ Assert.fail("unexpected failure");
+ }
+ if (found1 != 1) {
+ failuremsg += "Lang defined, " + found1 + " records found instead
of 1";
+ }
+
+
+ DeleteBusinesses(businesskeysToDelete);
+ if (failuremsg.length() > 0) {
+ Assert.fail(failuremsg);
+ }
+ System.out.println("Pass");
+
+ }
+
+ @Test
+ public void JUDDI_571_Part3_Test() {
+ //add a tmodel
+ //add a tmodel with lang defined
+ //find tmodel with lang defined, expecting one result
+ //find tmodel without lang defined, expecting 2 results
+
+
+ List<String> businesskeysToDelete = new ArrayList<String>();
+
+ String failuremsg = "";
+ System.out.println("JUDDI_571_Part3_Test");
+ SaveTModel sb = new SaveTModel();
+ sb.setAuthInfo(authInfoJoe);
+ TModel be = new TModel();
+ Name n = new Name();
+ n.setValue("JUDDI_571_Part3_Test no lang");
+ be.setName(n);
+ sb.getTModel().add(be);
+
+ be = new TModel();
+ n = new Name();
+ n.setValue("JUDDI_571_Part3_Test lang");
+ n.setLang("en");
+ be.setName(n);
+ sb.getTModel().add(be);
+
+ try {
+ TModelDetail saveTModel = publication.saveTModel(sb);
+
businesskeysToDelete.add(saveTModel.getTModel().get(0).getTModelKey());
+
businesskeysToDelete.add(saveTModel.getTModel().get(1).getTModelKey());
+ } catch (Exception ex) {
+ HandleException(ex);
+ Assert.fail("unexpected failure");
+ }
+
+ int found1 = 0;
+ FindTModel fb = new FindTModel();
+ fb.setAuthInfo(authInfoJoe);
+ n = new Name();
+ n.setValue("%JUDDI_571_Part3_Test%");
+ fb.setName(n);
+ fb.setFindQualifiers(new FindQualifiers());
+
fb.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ try {
+ TModelList findTModel = inquiry.findTModel(fb);
+ if (findTModel.getTModelInfos() != null) {
+ for (int i = 0; i <
findTModel.getTModelInfos().getTModelInfo().size(); i++) {
+ if
(businesskeysToDelete.contains(findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey()))
{
+ found1++;
+ }
+ }
+ }
+ } catch (Exception ex) {
+ HandleException(ex);
+ Assert.fail("unexpected failure");
+ }
+ if (found1 != 2) {
+ failuremsg += "No lang defined, " + found1 + " records found
instead of 2";
+ }
+
+
+
+ found1 = 0;
+ fb = new FindTModel();
+ fb.setAuthInfo(authInfoJoe);
+ n = new Name();
+ n.setLang("en");
+ n.setValue("%JUDDI_571_Part3_Test%");
+ fb.setName(n);
+ fb.setFindQualifiers(new FindQualifiers());
+
fb.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ try {
+ TModelList findTModel = inquiry.findTModel(fb);
+ if (findTModel.getTModelInfos() != null) {
+ for (int i = 0; i <
findTModel.getTModelInfos().getTModelInfo().size(); i++) {
+ if
(businesskeysToDelete.contains(findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey()))
{
+ found1++;
+ }
+ }
+ }
+ } catch (Exception ex) {
+ HandleException(ex);
+ Assert.fail("unexpected failure");
+ }
+ if (found1 != 1) {
+ failuremsg += "Lang defined, " + found1 + " records found instead
of 1";
+ }
+
+
+ DeleteTModels(businesskeysToDelete);
+ if (failuremsg.length() > 0) {
+ Assert.fail(failuremsg);
+ }
+ System.out.println("Pass");
+
+ }
+
+ @Test
+ public void JUDDI_574() {
+ //make a test model with a lang
+
+ //search for it by name
+
+ //confirm that the lang is present
+
+ List<String> businesskeysToDelete = new ArrayList<String>();
+
+ String failuremsg = "";
+ System.out.println("JUDDI_574");
+ SaveTModel sb = new SaveTModel();
+ sb.setAuthInfo(authInfoJoe);
+ TModel be = new TModel();
+ Name n = new Name();
+ n.setValue("JUDDI_574");
+ n.setLang("en");
+ be.setName(n);
+ sb.getTModel().add(be);
+
+ try {
+ TModelDetail saveTModel = publication.saveTModel(sb);
+
businesskeysToDelete.add(saveTModel.getTModel().get(0).getTModelKey());
+ System.out.println("tmodel created with key " +
saveTModel.getTModel().get(0).getTModelKey());
+ } catch (Exception ex) {
+ HandleException(ex);
+ Assert.fail("unexpected failure");
+ }
+ int found1 = 0;
+ FindTModel fb = new FindTModel();
+ fb.setAuthInfo(authInfoJoe);
+ n = new Name();
+ n.setValue("JUDDI_574");
+ fb.setName(n);
+ fb.setFindQualifiers(new FindQualifiers());
+
fb.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ try {
+ TModelList findTModel = inquiry.findTModel(fb);
+ if (findTModel.getTModelInfos() != null) {
+ for (int i = 0; i <
findTModel.getTModelInfos().getTModelInfo().size(); i++) {
+ if
(businesskeysToDelete.contains(findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey()))
{
+ found1++;
+ if
(findTModel.getTModelInfos().getTModelInfo().get(i).getName() == null
+ ||
findTModel.getTModelInfos().getTModelInfo().get(i).getName().getLang() == null
+ ||
findTModel.getTModelInfos().getTModelInfo().get(i).getName().getLang().length()
== 0) {
+ failuremsg += "Tmodel key " +
findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey()
+ + " has a null or empty lang";
+ }
+ }
+
+ }
+ }
+ } catch (Exception ex) {
+ HandleException(ex);
+ Assert.fail("unexpected failure");
+ }
+ if (found1 != 1) {
+ failuremsg += "found " + found1 + " records found instead of 1";
+ }
+
+ DeleteTModels(businesskeysToDelete);
+ if (failuremsg.length() > 0) {
+ Assert.fail(failuremsg);
+ }
+ System.out.println("Pass");
+
+ }
+
+ //TODO binding template tmodel instance info
+ //TODO tmodel tests
+ //TODO create tests for enforcing ref integrity of tmodel keys, after
enforcing this, the tests in this class will need to be heavily revised
+ //<editor-fold defaultstate="collapsed" desc="Some basic util functions to
print out the data structure">
+ /**
+ * Converts category bags of tmodels to a readable string
+ *
+ * @param categoryBag
+ * @return
+ */
+ public static String CatBagToString(CategoryBag categoryBag) {
+ StringBuilder sb = new StringBuilder();
+ if (categoryBag == null) {
+ return "no data";
+ }
+ for (int i = 0; i < categoryBag.getKeyedReference().size(); i++) {
+
sb.append(KeyedReferenceToString(categoryBag.getKeyedReference().get(i)));
+ }
+ for (int i = 0; i < categoryBag.getKeyedReferenceGroup().size(); i++) {
+ sb.append("Key Ref Grp: TModelKey=");
+ for (int k = 0; k <
categoryBag.getKeyedReferenceGroup().get(i).getKeyedReference().size(); k++) {
+
sb.append(KeyedReferenceToString(categoryBag.getKeyedReferenceGroup().get(i).getKeyedReference().get(k)));
+ }
+ }
+ return sb.toString();
+ }
+
+ public static String KeyedReferenceToString(KeyedReference item) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("Key Ref: Name=").
+ append(item.getKeyName()).
+ append(" Value=").
+ append(item.getKeyValue()).
+ append(" tModel=").
+ append(item.getTModelKey()).
+ append(System.getProperty("line.separator"));
+ return sb.toString();
+ }
+
+ public static void PrintContacts(Contacts contacts) {
+ if (contacts == null) {
+ return;
+ }
+ for (int i = 0; i < contacts.getContact().size(); i++) {
+ System.out.println("Contact " + i + " type:" +
contacts.getContact().get(i).getUseType());
+ for (int k = 0; k <
contacts.getContact().get(i).getPersonName().size(); k++) {
+ System.out.println("Name: " +
contacts.getContact().get(i).getPersonName().get(k).getValue());
+ }
+ for (int k = 0; k <
contacts.getContact().get(i).getEmail().size(); k++) {
+ System.out.println("Email: " +
contacts.getContact().get(i).getEmail().get(k).getValue());
+ }
+ for (int k = 0; k <
contacts.getContact().get(i).getAddress().size(); k++) {
+ System.out.println("Address sort code " +
contacts.getContact().get(i).getAddress().get(k).getSortCode());
+ System.out.println("Address use type " +
contacts.getContact().get(i).getAddress().get(k).getUseType());
+ System.out.println("Address tmodel key " +
contacts.getContact().get(i).getAddress().get(k).getTModelKey());
+ for (int x = 0; x <
contacts.getContact().get(i).getAddress().get(k).getAddressLine().size(); x++) {
+ System.out.println("Address line value " +
contacts.getContact().get(i).getAddress().get(k).getAddressLine().get(x).getValue());
+ System.out.println("Address line key name " +
contacts.getContact().get(i).getAddress().get(k).getAddressLine().get(x).getKeyName());
+ System.out.println("Address line key value " +
contacts.getContact().get(i).getAddress().get(k).getAddressLine().get(x).getKeyValue());
+ }
+ }
+ for (int k = 0; k <
contacts.getContact().get(i).getDescription().size(); k++) {
+ System.out.println("Desc: " +
contacts.getContact().get(i).getDescription().get(k).getValue());
+ }
+ for (int k = 0; k <
contacts.getContact().get(i).getPhone().size(); k++) {
+ System.out.println("Phone: " +
contacts.getContact().get(i).getPhone().get(k).getValue());
+ }
+ }
+
+ }
+
+ /**
+ * This function is useful for translating UDDI's somewhat complex data
+ * format to something that is more useful.
+ *
+ * @param bindingTemplates
+ */
+ public static void PrintBindingTemplates(BindingTemplates
bindingTemplates) {
+ if (bindingTemplates == null) {
+ return;
+ }
+ for (int i = 0; i < bindingTemplates.getBindingTemplate().size(); i++)
{
+ System.out.println("Binding Key: " +
bindingTemplates.getBindingTemplate().get(i).getBindingKey());
+
+ if (bindingTemplates.getBindingTemplate().get(i).getAccessPoint()
!= null) {
+ System.out.println("Access Point: " +
bindingTemplates.getBindingTemplate().get(i).getAccessPoint().getValue() + "
type " +
bindingTemplates.getBindingTemplate().get(i).getAccessPoint().getUseType());
+ }
+
+ if
(bindingTemplates.getBindingTemplate().get(i).getHostingRedirector() != null) {
+ System.out.println("Hosting Redirection: " +
bindingTemplates.getBindingTemplate().get(i).getHostingRedirector().getBindingKey());
+ }
+ }
+ }
+
+ public static void PrintBusinessInfo(BusinessInfos businessInfos) {
+ if (businessInfos == null) {
+ System.out.println("No data returned");
+ } else {
+ for (int i = 0; i < businessInfos.getBusinessInfo().size(); i++) {
+
System.out.println("===============================================");
+ System.out.println("Business Key: " +
businessInfos.getBusinessInfo().get(i).getBusinessKey());
+ System.out.println("Name: " +
ListToString(businessInfos.getBusinessInfo().get(i).getName()));
+
+ System.out.println("Name: " +
ListToDescString(businessInfos.getBusinessInfo().get(i).getDescription()));
+ System.out.println("Services:");
+
PrintServiceInfo(businessInfos.getBusinessInfo().get(i).getServiceInfos());
+ }
+ }
+ }
+
+ public static String ListToString(List<Name> name) {
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < name.size(); i++) {
+ sb.append(name.get(i).getValue()).append(" ");
+ }
+ return sb.toString();
+ }
+
+ public static String ListToDescString(List<Description> name) {
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < name.size(); i++) {
+ sb.append(name.get(i).getValue()).append(" ");
+ }
+ return sb.toString();
+ }
+
+ public static void PrintServiceInfo(ServiceInfos serviceInfos) {
+ for (int i = 0; i < serviceInfos.getServiceInfo().size(); i++) {
+ System.out.println("-------------------------------------------");
+ System.out.println("Service Key: " +
serviceInfos.getServiceInfo().get(i).getServiceKey());
+ System.out.println("Owning Business Key: " +
serviceInfos.getServiceInfo().get(i).getBusinessKey());
+ System.out.println("Name: " +
ListToString(serviceInfos.getServiceInfo().get(i).getName()));
+ }
+ }
+
+ public static void PrintBusinessDetails(List<BusinessEntity>
businessDetail) throws Exception {
+
+
+ for (int i = 0; i < businessDetail.size(); i++) {
+ System.out.println("Business Detail - key: " +
businessDetail.get(i).getBusinessKey());
+ System.out.println("Name: " +
ListToString(businessDetail.get(i).getName()));
+ System.out.println("CategoryBag: " +
CatBagToString(businessDetail.get(i).getCategoryBag()));
+ PrintContacts(businessDetail.get(i).getContacts());
+ }
+ }
+ //</editor-fold>
+
+ private void DeleteBusinesses(List<String> businesskeysToDelete) {
+
+
+ //cleanup
+ try {
+ DeleteBusiness db = new DeleteBusiness();
+ db.setAuthInfo(authInfoJoe);
+ db.getBusinessKey().addAll(businesskeysToDelete);
+ publication.deleteBusiness(db);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ private void DeleteTModels(List<String> businesskeysToDelete) {
+
+ //cleanup
+ try {
+ DeleteTModel db = new DeleteTModel();
+ db.setAuthInfo(authInfoJoe);
+ db.getTModelKey().addAll(businesskeysToDelete);
+ publication.deleteTModel(db);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
