[teiid-commits] teiid SVN: r1824 - in trunk/test-integration/db/src/main/java/org/teiid/test/client: ctc and 1 other directory.

Author: vhalbert(a)redhat.com Date: 2010-02-15 09:45:56 -0500 (Mon, 15 Feb 2010) New Revision: 1824 Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryScenario.java trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryTest.java trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClientTransaction.java trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/CTCQueryScenario.java trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryReader.java trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryVisitationStrategy.java Log: Teiid-773 - changed print all the exception messages in the summary file and changed the error files to only be the queryid (do not prefix by ERROR) Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryScenario.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryScenario.java 2010-02-15 14:44:36 UTC (rev 1823) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryScenario.java 2010-02-15 14:45:56 UTC (rev 1824) @@ -72,6 +72,7 @@ protected void setUp() { Collection args = new ArrayList(1); + args.add(scenarioName); args.add(props); reader = ClassFactory.createQueryReader(args); Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryTest.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryTest.java 2010-02-15 14:44:36 UTC (rev 1823) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/QueryTest.java 2010-02-15 14:45:56 UTC (rev 1824) @@ -34,12 +34,14 @@ private String querySetID; private String queryID; private boolean isException=false; + private String queryScenarioID; - public QueryTest(String queryID, String querySetID, QuerySQL[] queries, boolean isException) { + public QueryTest(String queryScenarioID, String queryID, String querySetID, QuerySQL[] queries, boolean isException) { this.queryID = queryID; this.queries = queries; this.isException = isException; this.querySetID = querySetID; + this.queryScenarioID = queryScenarioID; } public QuerySQL[] getQueries() { @@ -57,5 +59,9 @@ public String geQuerySetID() { return this.querySetID; } + + public String getQueryScenarioID() { + return this.queryScenarioID; + } } Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClientTransaction.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClientTransaction.java 2010-02-15 14:44:36 UTC (rev 1823) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TestClientTransaction.java 2010-02-15 14:45:56 UTC (rev 1824) @@ -81,7 +81,7 @@ } public String getTestName() { - return query.geQuerySetID() + ":" + (query.getQueryID()!=null?query.getQueryID():"NA"); + return query.getQueryScenarioID() + ":" + (query.getQueryID()!=null?query.getQueryID():"NA"); } Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/CTCQueryScenario.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/CTCQueryScenario.java 2010-02-15 14:44:36 UTC (rev 1823) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/CTCQueryScenario.java 2010-02-15 14:45:56 UTC (rev 1824) @@ -47,7 +47,7 @@ protected void setUp() { try { - reader = new XMLQueryReader(this.getProperties()); + reader = new XMLQueryReader(this.getQueryScenarioIdentifier(), this.getProperties()); } catch (QueryTestFailedException e1) { throw new TransactionRuntimeException(e1); } Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryReader.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryReader.java 2010-02-15 14:44:36 UTC (rev 1823) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryReader.java 2010-02-15 14:45:56 UTC (rev 1824) @@ -46,12 +46,14 @@ public class XMLQueryReader implements QueryReader { private Properties props = null; + private String queryScenarioIdentifier; private Map<String, String> querySetIDToFileMap = new HashMap<String, String>(); - public XMLQueryReader(Properties properties) + public XMLQueryReader(String queryScenarioID, Properties properties) throws QueryTestFailedException { this.props = properties; + this.queryScenarioIdentifier = queryScenarioID; loadQuerySets(); } @@ -127,7 +129,7 @@ XMLQueryVisitationStrategy jstrat = new XMLQueryVisitationStrategy(); try { - return jstrat.parseXMLQueryFile(queryFile, querySetID); + return jstrat.parseXMLQueryFile(this.queryScenarioIdentifier, queryFile, querySetID); // Iterator iter = queryMap.keySet().iterator(); // while (iter.hasNext()) { // String queryID = (String) iter.next(); @@ -171,7 +173,7 @@ "target/classes/").getAbsolutePath()); try { - XMLQueryReader reader = new XMLQueryReader(_instance.getProperties()); + XMLQueryReader reader = new XMLQueryReader("scenario_id", _instance.getProperties()); Iterator<String> it = reader.getQuerySetIDs().iterator(); while (it.hasNext()) { String querySetID = it.next(); Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryVisitationStrategy.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryVisitationStrategy.java 2010-02-15 14:44:36 UTC (rev 1823) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/ctc/XMLQueryVisitationStrategy.java 2010-02-15 14:45:56 UTC (rev 1824) @@ -83,7 +83,7 @@ * @return the List containing quers. * @exception JDOMException if there is an error consuming the message. */ - public List parseXMLQueryFile(File queryFile, String querySetID) throws IOException, JDOMException { + public List parseXMLQueryFile(String queryScenarioID, File queryFile, String querySetID) throws IOException, JDOMException { List<QueryTest> queries = new LinkedList(); // HashMap queryMap = new HashMap(); @@ -103,7 +103,7 @@ TestLogger.logDebug("======= Single QueryTest "); QuerySQL sql = createQuerySQL(queryElement); - QueryTest q = new QueryTest(uniqueID, querySetID, new QuerySQL[] {sql}, false); + QueryTest q = new QueryTest(queryScenarioID, uniqueID, querySetID, new QuerySQL[] {sql}, false); queries.add(q); } else { TestLogger.logDebug("======= QueryTest has multiple sql statements"); @@ -117,7 +117,7 @@ querysql[c] = sql; c++; } - QueryTest q = new QueryTest(uniqueID, querySetID, querysql, false); + QueryTest q = new QueryTest(queryScenarioID, uniqueID, querySetID, querysql, false); queries.add(q); @@ -131,7 +131,7 @@ String uniqueID = querySetID + "_" + queryName; QuerySQL sql = new QuerySQL(exceptionType, null); - QueryTest q = new QueryTest(uniqueID, querySetID, new QuerySQL[] {sql}, true); + QueryTest q = new QueryTest(queryScenarioID, uniqueID, querySetID, new QuerySQL[] {sql}, true); queries.add(q);