[teiid-commits] teiid SVN: r1602 - in trunk/test-integration/db/src/main/java/org/teiid/test/framework: connection and 1 other directory.

Author: vhalbert(a)redhat.com Date: 2009-11-25 15:58:42 -0500 (Wed, 25 Nov 2009) New Revision: 1602 Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionContainer.java trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategy.java Log: Teiid 773 - cleanup Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionContainer.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionContainer.java 2009-11-25 20:58:05 UTC (rev 1601) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/TransactionContainer.java 2009-11-25 20:58:42 UTC (rev 1602) @@ -124,9 +124,10 @@ if (!test.exceptionExpected()) { e.printStackTrace(); + debug("Error: " + e.getMessage()); + throw new TransactionRuntimeException(e.getMessage()); + } - debug("Error: " + e.getMessage()); - throw new TransactionRuntimeException(e.getMessage()); } if (test.exceptionExpected() && !test.exceptionOccurred()) { Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategy.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategy.java 2009-11-25 20:58:05 UTC (rev 1601) +++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategy.java 2009-11-25 20:58:42 UTC (rev 1602) @@ -56,11 +56,7 @@ * @since */ public void shutdown() { -// try { -// this.dsFactory.cleanup(); -// } catch (Throwable t) { -// -// } + } public Connection getAdminConnection() throws QueryTestFailedException{ @@ -150,66 +146,73 @@ try { - VDB vdb = null; - Collection<VDB> vdbs = api.getVDBs("*"); - if (vdbs == null) { - throw new QueryTestFailedException("GetVDBS returned no vdbs available"); - - } else if (vdbs.size() > 0) { - String urlString = this.env.getProperty(DriverConnection.DS_URL); - MMJDBCURL url = new MMJDBCURL(urlString); - System.out.println("Trying to match VDB : " + url.getVDBName()); + VDB vdb = null; + Collection<VDB> vdbs = api.getVDBs("*"); + if (vdbs == null || vdbs.isEmpty()) { + throw new QueryTestFailedException( + "AdminApi.GetVDBS returned no vdbs available"); + } + + String urlString = this.env.getProperty(DriverConnection.DS_URL); + MMJDBCURL url = new MMJDBCURL(urlString); + System.out.println("Trying to match VDB : " + url.getVDBName()); + + for (Iterator iterator = vdbs.iterator(); iterator.hasNext();) { + VDB v = (VDB) iterator.next(); + if (v.getName().equalsIgnoreCase(url.getVDBName())) { + vdb = v; + } + + } + if (vdbs == null) { + throw new QueryTestFailedException( + "GetVDBS did not return a vdb that matched " + + url.getVDBName()); + } - for (Iterator iterator = vdbs.iterator(); iterator - .hasNext();) { - VDB v = (VDB) iterator.next(); - if (v.getName().equalsIgnoreCase(url.getVDBName())) { - vdb = v; - } - - } - if (vdbs == null) { - throw new QueryTestFailedException("GetVDBS did not return a vdb that matched " + url.getVDBName()); - } - - } else { - vdb = (VDB) vdbs.iterator().next(); - } + Iterator<Model> modelIt = vdb.getModels().iterator(); + while (modelIt.hasNext()) { + Model m = modelIt.next(); - Iterator<Model> modelIt = vdb.getModels().iterator(); - while (modelIt.hasNext() ) { - Model m = modelIt.next(); - - if (!m.isPhysical()) continue; - - // get the mapping, if defined - String mappedName = this.env.getProperty(m.getName()); - - String useName = m.getName(); - if(mappedName != null) { - useName = mappedName; - } + if (!m.isPhysical()) + continue; - org.teiid.test.framework.datasource.DataSource ds = this.dsFactory.getDatasource(useName, m.getName()); - - if (ds != null) { + // get the mapping, if defined + String mappedName = this.env.getProperty(m.getName()); - System.out.println("Set up Connector Binding (model:mapping:type): " + m.getName() + ":" + useName + ":" + ds.getConnectorType()); //$NON-NLS-1$ + String useName = m.getName(); + if (mappedName != null) { + useName = mappedName; + } - AdminOptions ao = new AdminOptions(AdminOptions.OnConflict.OVERWRITE); - ao.addOption(AdminOptions.BINDINGS_IGNORE_DECRYPT_ERROR); - - api.addConnectorBinding(ds.getName(), ds.getConnectorType(), ds.getProperties(), ao); - - api.assignBindingToModel(ds.getName(), vdb.getName(), vdb.getVDBVersion(), m.getName()); - - - api.startConnectorBinding(ds.getName()); - } else { - throw new QueryTestFailedException("Error: Unable to create binding to map to model : " + m.getName() + ", the mapped name " + useName + " had no datasource properties defined"); - } + org.teiid.test.framework.datasource.DataSource ds = this.dsFactory + .getDatasource(useName, m.getName()); - } + if (ds != null) { + + System.out + .println("Set up Connector Binding (model:mapping:type): " + m.getName() + ":" + useName + ":" + ds.getConnectorType()); //$NON-NLS-1$ + + AdminOptions ao = new AdminOptions( + AdminOptions.OnConflict.OVERWRITE); + ao.addOption(AdminOptions.BINDINGS_IGNORE_DECRYPT_ERROR); + + api.addConnectorBinding(ds.getName(), + ds.getConnectorType(), ds.getProperties(), ao); + + api.assignBindingToModel(ds.getName(), vdb.getName(), vdb + .getVDBVersion(), m.getName()); + + api.startConnectorBinding(ds.getName()); + } else { + throw new QueryTestFailedException( + "Error: Unable to create binding to map to model : " + + m.getName() + ", the mapped name " + + useName + + " had no datasource properties defined"); + } + + } } catch (QueryTestFailedException qt) { throw qt;