Return-Path: Delivered-To: apmail-ws-scout-dev-archive@www.apache.org Received: (qmail 70150 invoked from network); 5 Aug 2009 15:12:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 Aug 2009 15:12:34 -0000 Received: (qmail 26478 invoked by uid 500); 5 Aug 2009 15:12:41 -0000 Delivered-To: apmail-ws-scout-dev-archive@ws.apache.org Received: (qmail 26424 invoked by uid 500); 5 Aug 2009 15:12:41 -0000 Mailing-List: contact scout-dev-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: scout-dev@ws.apache.org List-Id: Delivered-To: mailing list scout-dev@ws.apache.org Received: (qmail 26416 invoked by uid 500); 5 Aug 2009 15:12:41 -0000 Delivered-To: apmail-ws-scout-cvs@ws.apache.org Received: (qmail 26413 invoked by uid 99); 5 Aug 2009 15:12:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Aug 2009 15:12:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Aug 2009 15:12:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A52432388895; Wed, 5 Aug 2009 15:12:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r801256 - /webservices/scout/branches/scout-1.1/src/test/java/org/apache/ws/scout/registry/qa/JAXR030AssociationsTest.java Date: Wed, 05 Aug 2009 15:12:16 -0000 To: scout-cvs@ws.apache.org From: kstam@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090805151216.A52432388895@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kstam Date: Wed Aug 5 15:12:16 2009 New Revision: 801256 URL: http://svn.apache.org/viewvc?rev=801256&view=rev Log: scout-88. Fixing unittest itself. Code does the right thing. Modified: webservices/scout/branches/scout-1.1/src/test/java/org/apache/ws/scout/registry/qa/JAXR030AssociationsTest.java Modified: webservices/scout/branches/scout-1.1/src/test/java/org/apache/ws/scout/registry/qa/JAXR030AssociationsTest.java URL: http://svn.apache.org/viewvc/webservices/scout/branches/scout-1.1/src/test/java/org/apache/ws/scout/registry/qa/JAXR030AssociationsTest.java?rev=801256&r1=801255&r2=801256&view=diff ============================================================================== --- webservices/scout/branches/scout-1.1/src/test/java/org/apache/ws/scout/registry/qa/JAXR030AssociationsTest.java (original) +++ webservices/scout/branches/scout-1.1/src/test/java/org/apache/ws/scout/registry/qa/JAXR030AssociationsTest.java Wed Aug 5 15:12:16 2009 @@ -66,7 +66,8 @@ private static String tempSrcOrgName = "Apache Source Org -- APACHE SCOUT TEST"; private static String tempTgtOrgName = "Apache Target Org -- APACHE SCOUT TEST"; - Organization sOrg, tOrg; + private Organization sOrg=null; + private Organization tOrg=null; @Before public void setUp() { @@ -89,10 +90,21 @@ @Test public void testPublishFindAndDeleteAssociation() { login(); + try { + RegistryService rs = connection.getRegistryService(); bqm = rs.getBusinessQueryManager(); blm = rs.getBusinessLifeCycleManager(); + + //deleting any pre-exisiting organizations + ArrayList orgs = findTempOrgs(); + for (Organization organization : orgs) { + Collection keys = new ArrayList(); + keys.add(organization.getKey()); + blm.deleteOrganizations(keys); + } + Creator creator = new Creator(blm); System.out.println("\nCreating temporary organizations...\n"); @@ -104,16 +116,42 @@ blm.saveOrganizations(organizations); System.out.println("\nSearching for newly created organizations...\n"); - ArrayList orgs = findTempOrgs(); - sOrg = orgs.get(0); - tOrg = orgs.get(1); + ArrayList newOrgs = findTempOrgs(); + sOrg = newOrgs.get(0); + tOrg = newOrgs.get(1); System.out.println("\nCreating association...\n"); createAssociation(sOrg, tOrg); // All created ... now try to delete. - findAndDeleteAssociation(); - + String associationID = findAndDeleteAssociation(); + + //Let us look for associations now + BulkResponse associationResp = + bqm.findCallerAssociations(null, Boolean.TRUE, Boolean.TRUE, null); + + if(associationResp.getExceptions() != null) + { + fail("Association lookup failed"); + } + else + { + Collection retAssocs = associationResp.getCollection(); + if (retAssocs.size() == 0) + { + //Pass + } else + { + Iterator iterAss = retAssocs.iterator(); + while(iterAss.hasNext()) + { + Association assc = (Association) iterAss.next(); + if(assc.getKey().getId().equals(associationID)) + fail("Deleted Association found"); + } + } + } + } catch (JAXRException e) { e.printStackTrace(); fail(e.getMessage()); @@ -152,8 +190,10 @@ } } - private void findAndDeleteAssociation() throws JAXRException { + private String findAndDeleteAssociation() throws JAXRException { + String id = null; + String sOrgID = sOrg.getKey().getId(); String tOrgID = tOrg.getKey().getId(); @@ -188,11 +228,13 @@ // Print spacer between messages System.out.println(" --- "); + id = a.getKey().getId(); deleteAssociation(a.getKey()); System.out.println("\n ============================== \n"); - } + } } + return id; } private void deleteAssociation(Key key) throws JAXRException { @@ -222,9 +264,7 @@ private ArrayList findTempOrgs() throws JAXRException { - ArrayList toReturn = new ArrayList(2); - toReturn.add(null); - toReturn.add(null); + ArrayList toReturn = new ArrayList(); // Define find qualifiers and name patterns Collection findQualifiers = new ArrayList(); --------------------------------------------------------------------- To unsubscribe, e-mail: scout-dev-unsubscribe@ws.apache.org For additional commands, e-mail: scout-dev-help@ws.apache.org