teiid SVN: r1648 - in trunk: metadata/src/test/java/com/metamatrix and 2 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-12-11 11:09:22 -0500 (Fri, 11 Dec 2009)
New Revision: 1648
Removed:
trunk/engine/src/test/java/com/metamatrix/query/unittest/QueryMetadataInterfaceBuilder.java
trunk/metadata/src/test/java/com/metamatrix/connector/
trunk/metadata/src/test/java/com/metamatrix/metadata/runtime/FakeMetadataService.java
trunk/metadata/src/test/java/com/metamatrix/metadata/runtime/FakeQueryMetadata.java
Modified:
trunk/metadata/src/test/java/com/metamatrix/internal/core/index/TestGammaCompressedIndexBlock.java
Log:
TEIID-869 removing unused classes
Deleted: trunk/engine/src/test/java/com/metamatrix/query/unittest/QueryMetadataInterfaceBuilder.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/query/unittest/QueryMetadataInterfaceBuilder.java 2009-12-11 03:29:30 UTC (rev 1647)
+++ trunk/engine/src/test/java/com/metamatrix/query/unittest/QueryMetadataInterfaceBuilder.java 2009-12-11 16:09:22 UTC (rev 1648)
@@ -1,270 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership. Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package com.metamatrix.query.unittest;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.teiid.connector.metadata.runtime.RuntimeMetadata;
-import org.teiid.dqp.internal.datamgr.metadata.RuntimeMetadataImpl;
-
-import com.metamatrix.common.types.DataTypeManager;
-import com.metamatrix.core.MetaMatrixRuntimeException;
-import com.metamatrix.dqp.message.ParameterInfo;
-import com.metamatrix.query.metadata.QueryMetadataInterface;
-
-public class QueryMetadataInterfaceBuilder {
-
- private FakeMetadataObject physicalModel;
- private FakeMetadataObject group;
- private FakeMetadataObject procedure;
- private FakeMetadataObject resultSet;
-
- private List elementNames;
- private List elementTypes;
- private List inParamNames;
- private List inParamTypes;
- private List resultElementNames;
- private List resultElementTypes;
- private String resultSetName;
-
- private FakeMetadataStore store = new FakeMetadataStore();
- private boolean storePopulated = false;
-
- public QueryMetadataInterfaceBuilder() {
- initElements();
- }
-
- public void addPhysicalModel(String name) {
- physicalModel = createPhysicalModel(name);
- }
-
- public void addGroup(String name) {
- addGroup(name, name);
- }
-
- public void addProcedure(String name) {
- addProcedure(name, name);
- }
-
- public void addGroup(String name, String nameInSource) {
- if (group != null) {
- addGroup();
- }
- group = createPhysicalGroup(name, nameInSource, physicalModel);
- }
-
- public void addProcedure(String name, String nameInSource) {
- procedure = createPhysicalProcedure(name, nameInSource, physicalModel);
- addProcedure();
- }
-
- private void addGroup(){
- store.addObject(group);
- store.addObjects(getElements());
- initElements();
- }
-
- private void addProcedure(){
- store.addObject(procedure);
- if(this.resultSet != null) {
- store.addObject(this.resultSet);
- }
- }
-
- private void initElements() {
- elementNames = new ArrayList();
- elementTypes = new ArrayList();
- }
-
- private void initInputParameters() {
- if(this.inParamNames == null || this.inParamTypes == null) {
- inParamNames = new ArrayList();
- inParamTypes = new ArrayList();
- }
- }
-
- private void initResultSetColumns() {
- if(this.resultElementNames == null) {
- resultElementNames = new ArrayList();
- }
-
- if(this.resultElementTypes == null) {
- resultElementTypes = new ArrayList();
- }
- }
-
- public void addElement(String name, Class dataType) {
- elementNames.add(name);
- elementTypes.add(DataTypeManager.getDataTypeName(dataType));
- }
-
- public void addInputParameter(String name, Class dataType) {
- initInputParameters();
- inParamNames.add(name);
- inParamTypes.add(DataTypeManager.getDataTypeName(dataType));
- }
-
- public void addResultSet(String resultSetName, String[] names, Class[] dataTypes) {
- initResultSetColumns();
- for(int i=0; i < names.length; i++) {
- resultElementNames.add(names[i]);
- resultElementTypes.add(DataTypeManager.getDataTypeName(dataTypes[i]));
- }
- this.resultSetName = resultSetName;
- }
-
- private List getElements(){
- return createElements(group, (String[]) elementNames.toArray(new String[0]),
- (String[]) elementTypes.toArray(new String[0]));
- }
-
- private List getParameters() {
- List inParameters = createInParameters(this.inParamNames, this.inParamTypes);
- if ( (resultElementNames == null || resultElementNames.size() ==0) || (resultElementTypes == null || resultElementTypes.size() == 0)) {
- return inParameters;
- }
- this.resultSet = createResultSetParameter(this.physicalModel, resultSetName, (String[]) resultElementNames.toArray(new String[resultElementNames.size()]),
- (String[]) resultElementTypes.toArray(new String[resultElementTypes.size()]));
- inParameters.add(this.resultSet);
- return inParameters;
- }
-
- private void populateStoreIfNeeded(){
- if (!storePopulated) {
- if(this.group != null) {
- store.addObject(physicalModel);
- addGroup();
- } else if(this.procedure != null) {
- store.addObject(physicalModel);
- addProcedure();
- }
- storePopulated = true;
- }
- }
-
- public QueryMetadataInterface getQueryMetadata() {
- populateStoreIfNeeded();
- return new FakeMetadataFacade(store);
- }
-
- public RuntimeMetadata getRuntimeMetadata(){
- return new RuntimeMetadataImpl(getQueryMetadata());
- }
-
- private FakeMetadataObject createPhysicalModel(String name) {
- return FakeMetadataFactory.createPhysicalModel(name);
- }
-
- private static FakeMetadataObject createPhysicalGroup(String name, String nameInSource, FakeMetadataObject model) {
- FakeMetadataObject obj = new FakeMetadataObject(name, FakeMetadataObject.GROUP);
- obj.putProperty(FakeMetadataObject.Props.MODEL, model);
- obj.putProperty(FakeMetadataObject.Props.IS_VIRTUAL, model.getProperty(FakeMetadataObject.Props.IS_VIRTUAL));
- obj.putProperty(FakeMetadataObject.Props.UPDATE, Boolean.TRUE);
- obj.putProperty(FakeMetadataObject.Props.TEMP, Boolean.FALSE);
- obj.putProperty(FakeMetadataObject.Props.NAME_IN_SOURCE, nameInSource);
- return obj;
- }
-
- private FakeMetadataObject createPhysicalProcedure(String name, String nameInSource, FakeMetadataObject model) {
- FakeMetadataObject obj = new FakeMetadataObject(name, FakeMetadataObject.PROCEDURE);
- obj.putProperty(FakeMetadataObject.Props.MODEL, model);
- obj.putProperty(FakeMetadataObject.Props.IS_VIRTUAL, model.getProperty(FakeMetadataObject.Props.IS_VIRTUAL));
- obj.putProperty(FakeMetadataObject.Props.NAME_IN_SOURCE, nameInSource);
- obj.putProperty(FakeMetadataObject.Props.PARAMS, getParameters());
- if(this.resultSet != null) {
- obj.putProperty(FakeMetadataObject.Props.RESULT_SET, this.resultSet);
- }
- return obj;
- }
-
- private List createElements(FakeMetadataObject group, String[] names, String[] types) {
- return FakeMetadataFactory.createElements(group, names, types);
- }
-
- private List createInParameters(List names, List types) {
- List params = new ArrayList();
- if (names == null || types == null) {
- return params;
- }
- final Iterator iter1 = names.iterator();
- final Iterator iter2 = types.iterator();
-
- int i=0;
- while(iter1.hasNext() && iter2.hasNext()) {
- String name = (String) iter1.next();
- String className = (String) iter2.next();
- params.add(FakeMetadataFactory.createParameter(name, i, ParameterInfo.IN, className, null));
- i++;
- }
- return params;
- }
-
- private FakeMetadataObject createResultSetParameter(FakeMetadataObject model, String name, String[] colNames, String[] colTypes) {
- if (colNames == null || colTypes == null) {
- return null;
- }
- FakeMetadataObject resultSet = FakeMetadataFactory.createResultSet(name, model, colNames, colTypes);
- int s = (this.inParamNames == null ? 0 : this.inParamNames.size());
- resultSet.putProperty(FakeMetadataObject.Props.INDEX, new Integer(s));
- resultSet.putProperty(FakeMetadataObject.Props.DIRECTION, new Integer(ParameterInfo.RESULT_SET));
- resultSet.putProperty(FakeMetadataObject.Props.RESULT_SET, resultSet);
- return resultSet;
- }
-
- public void addMetadataForType(String tableName, String tableNameInSource, Class type, String tableDefiningMethodName) {
- addPhysicalModel("model"); //$NON-NLS-1$
- addGroup(tableName, tableNameInSource);
- Method[] methods = type.getMethods();
- for (int i = 0; i < methods.length; i++) {
- if (methods[i].getParameterTypes().length == 0) {
- Class returnType = methods[i].getReturnType();
- if (returnType != null) {
- if (returnType.isPrimitive()) {
- if (returnType.equals(Integer.TYPE)) {
- returnType = Integer.class;
- }
- }
- String methodName = methods[i].getName();
- if (methodName.equals(tableDefiningMethodName)) {
- if (returnType.isArray()) {
- returnType = returnType.getComponentType();
- } else if (Collection.class.isAssignableFrom(returnType)) {
- returnType = String.class;
- }
- }
- if (DataTypeManager.getDataTypeName(returnType) == null) {
- if (methodName.equals(tableDefiningMethodName)) {
- throw new MetaMatrixRuntimeException("Data type not supported " + returnType.getName()); //$NON-NLS-1$
- }
- } else {
- addElement(methodName, returnType);
- }
- }
- }
- }
- }
-}
Modified: trunk/metadata/src/test/java/com/metamatrix/internal/core/index/TestGammaCompressedIndexBlock.java
===================================================================
--- trunk/metadata/src/test/java/com/metamatrix/internal/core/index/TestGammaCompressedIndexBlock.java 2009-12-11 03:29:30 UTC (rev 1647)
+++ trunk/metadata/src/test/java/com/metamatrix/internal/core/index/TestGammaCompressedIndexBlock.java 2009-12-11 16:09:22 UTC (rev 1648)
@@ -22,26 +22,18 @@
package com.metamatrix.internal.core.index;
+import junit.framework.TestCase;
+
import org.teiid.internal.core.index.GammaCompressedIndexBlock;
import org.teiid.internal.core.index.IIndexConstants;
import org.teiid.internal.core.index.IndexBlock;
import org.teiid.internal.core.index.WordEntry;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
public class TestGammaCompressedIndexBlock extends TestCase {
public TestGammaCompressedIndexBlock(String name) {
super(name);
}
- public static Test suite() {
- TestSuite suite = new TestSuite("TestGammaCompressedIndexBlock"); //$NON-NLS-1$
- suite.addTestSuite(TestGammaCompressedIndexBlock.class);
- return suite;
- }
-
public void testAddAndRetrieveEntry() {
IndexBlock indexBlock = new GammaCompressedIndexBlock(IIndexConstants.BLOCK_SIZE);
WordEntry entry = new WordEntry();
Deleted: trunk/metadata/src/test/java/com/metamatrix/metadata/runtime/FakeMetadataService.java
===================================================================
--- trunk/metadata/src/test/java/com/metamatrix/metadata/runtime/FakeMetadataService.java 2009-12-11 03:29:30 UTC (rev 1647)
+++ trunk/metadata/src/test/java/com/metamatrix/metadata/runtime/FakeMetadataService.java 2009-12-11 16:09:22 UTC (rev 1648)
@@ -1,86 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership. Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package com.metamatrix.metadata.runtime;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Properties;
-
-import org.teiid.connector.metadata.runtime.Datatype;
-import org.teiid.metadata.CompositeMetadataStore;
-import org.teiid.metadata.TransformationMetadata;
-import org.teiid.metadata.index.IndexMetadataFactory;
-
-import com.metamatrix.api.exception.MetaMatrixComponentException;
-import com.metamatrix.common.application.ApplicationEnvironment;
-import com.metamatrix.common.application.ApplicationService;
-import com.metamatrix.common.application.exception.ApplicationInitializationException;
-import com.metamatrix.common.application.exception.ApplicationLifecycleException;
-import com.metamatrix.common.vdb.api.VDBArchive;
-import com.metamatrix.core.util.TempDirectoryMonitor;
-import com.metamatrix.dqp.service.MetadataService;
-import com.metamatrix.metadata.runtime.api.MetadataSource;
-import com.metamatrix.query.metadata.QueryMetadataInterface;
-
-
-public class FakeMetadataService implements ApplicationService, MetadataService {
- private CompositeMetadataStore compositeMetadataStore;
-
- public FakeMetadataService(URL vdbFile) throws IOException, MetaMatrixComponentException {
- TempDirectoryMonitor.turnOn();
- MetadataSource source = new VDBArchive(vdbFile.openStream());
- compositeMetadataStore = new CompositeMetadataStore(Arrays.asList(new IndexMetadataFactory(source).getMetadataStore()), source);
- }
-
- public void clear() {
- TempDirectoryMonitor.removeAll();
- }
-
- public void initialize(Properties props) throws ApplicationInitializationException {
-
- }
-
- public void start(ApplicationEnvironment environment) throws ApplicationLifecycleException {
-
- }
-
- public void stop() throws ApplicationLifecycleException {
-
- }
-
- public QueryMetadataInterface lookupMetadata(String vdbName,String vdbVersion) throws MetaMatrixComponentException {
- return new TransformationMetadata(compositeMetadataStore);
- }
-
- public CompositeMetadataStore getMetadataObjectSource(String vdbName,String vdbVersion) throws MetaMatrixComponentException {
- return compositeMetadataStore;
- }
-
- @Override
- public Map<String, Datatype> getBuiltinDatatypes()
- throws MetaMatrixComponentException {
- return null;
- }
-}
Deleted: trunk/metadata/src/test/java/com/metamatrix/metadata/runtime/FakeQueryMetadata.java
===================================================================
--- trunk/metadata/src/test/java/com/metamatrix/metadata/runtime/FakeQueryMetadata.java 2009-12-11 03:29:30 UTC (rev 1647)
+++ trunk/metadata/src/test/java/com/metamatrix/metadata/runtime/FakeQueryMetadata.java 2009-12-11 16:09:22 UTC (rev 1648)
@@ -1,73 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership. Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package com.metamatrix.metadata.runtime;
-
-import org.teiid.metadata.index.IndexConstants;
-
-import com.metamatrix.query.metadata.QueryMetadataInterface;
-import com.metamatrix.query.unittest.QueryMetadataInterfaceBuilder;
-
-public class FakeQueryMetadata {
- private static QueryMetadataInterface metadata;
-
- public static QueryMetadataInterface getQueryMetadata() {
- if (metadata == null) {
- QueryMetadataInterfaceBuilder builder = new QueryMetadataInterfaceBuilder();
- builder.addPhysicalModel("system"); //$NON-NLS-1$
-
- builder.addGroup("tables", IndexConstants.INDEX_NAME.TABLES_INDEX + "#B"); //$NON-NLS-1$ //$NON-NLS-2$
- builder.addElement("FullName", String.class); //$NON-NLS-1$
- builder.addElement("Path", String.class); //$NON-NLS-1$
- //builder.addElement("UUID", String.class);
- builder.addElement("Cardinality", Integer.class); //$NON-NLS-1$
- builder.addElement("supportsUpdate", Boolean.class); //$NON-NLS-1$
-
- builder.addGroup("columns", IndexConstants.INDEX_NAME.COLUMNS_INDEX + "#G"); //$NON-NLS-1$ //$NON-NLS-2$
- builder.addElement("FullName", String.class); //$NON-NLS-1$
-
- builder.addGroup("models", IndexConstants.INDEX_NAME.MODELS_INDEX + "#A"); //$NON-NLS-1$ //$NON-NLS-2$
- builder.addElement("FullName", String.class); //$NON-NLS-1$
- builder.addElement("MaxSetSize", Integer.class); //$NON-NLS-1$
-
- builder.addGroup("foreignKeys", IndexConstants.INDEX_NAME.KEYS_INDEX + "#J"); //$NON-NLS-1$ //$NON-NLS-2$
- builder.addElement("FullName", String.class); //$NON-NLS-1$
-
- builder.addGroup("primaryKeys", IndexConstants.INDEX_NAME.KEYS_INDEX + "#K"); //$NON-NLS-1$ //$NON-NLS-2$
- builder.addElement("FullName", String.class); //$NON-NLS-1$
-
- builder.addGroup("procs", IndexConstants.INDEX_NAME.PROCEDURES_INDEX + "#E"); //$NON-NLS-1$ //$NON-NLS-2$
- builder.addElement("Name", String.class); //$NON-NLS-1$
-
- builder.addGroup("junk", "junk"); //$NON-NLS-1$ //$NON-NLS-2$
- builder.addElement("UUID", String.class); //$NON-NLS-1$
- builder.addElement("toString", String.class); //$NON-NLS-1$
-
- builder.addGroup("fake1Properties", "DatatypeTypeEnumeration.properties"); //$NON-NLS-1$ //$NON-NLS-2$
- builder.addElement("Key", Integer.class); //$NON-NLS-1$
- builder.addElement("Value", String.class); //$NON-NLS-1$
-
- metadata = builder.getQueryMetadata();
- }
- return metadata;
- }
-}
15 years
teiid SVN: r1647 - trunk/engine/src/main/java/org/teiid/metadata.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-12-10 22:29:30 -0500 (Thu, 10 Dec 2009)
New Revision: 1647
Modified:
trunk/engine/src/main/java/org/teiid/metadata/TransformationMetadata.java
Log:
TEIID-899 parameter names need to be fully qualified - this was an unintentional regression
Modified: trunk/engine/src/main/java/org/teiid/metadata/TransformationMetadata.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/metadata/TransformationMetadata.java 2009-12-11 03:09:56 UTC (rev 1646)
+++ trunk/engine/src/main/java/org/teiid/metadata/TransformationMetadata.java 2009-12-11 03:29:30 UTC (rev 1647)
@@ -295,7 +295,7 @@
String runtimeType = paramRecord.getRuntimeType();
int direction = this.convertParamRecordTypeToStoredProcedureType(paramRecord.getType());
// create a parameter and add it to the procedure object
- SPParameter spParam = new SPParameter(paramRecord.getPosition(), direction, paramRecord.getName());
+ SPParameter spParam = new SPParameter(paramRecord.getPosition(), direction, paramRecord.getFullName());
spParam.setMetadataID(paramRecord);
spParam.setClassType(DataTypeManager.getDataTypeClass(runtimeType));
procInfo.addParameter(spParam);
@@ -306,7 +306,7 @@
ColumnSet<ProcedureRecordImpl> resultRecord = procRecord.getResultSet();
// resultSet is the last parameter in the procedure
int lastParamIndex = procInfo.getParameters().size() + 1;
- SPParameter param = new SPParameter(lastParamIndex, SPParameter.RESULT_SET, resultRecord.getName());
+ SPParameter param = new SPParameter(lastParamIndex, SPParameter.RESULT_SET, resultRecord.getFullName());
param.setClassType(java.sql.ResultSet.class);
param.setMetadataID(resultRecord);
15 years
teiid SVN: r1646 - in trunk/test-integration/db/src/main: resources and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: vhalbert(a)redhat.com
Date: 2009-12-10 22:09:56 -0500 (Thu, 10 Dec 2009)
New Revision: 1646
Modified:
trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java
trunk/test-integration/db/src/main/resources/qe-test.properties
Log:
Teiid 781 - added summary report dir. property so that the summary reports are all accumulated at the same location.
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java 2009-12-10 23:40:07 UTC (rev 1645)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TestResultsSummary.java 2009-12-11 03:09:56 UTC (rev 1646)
@@ -29,7 +29,9 @@
import java.io.OutputStream;
import java.io.PrintStream;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -39,7 +41,11 @@
import java.util.Properties;
import java.util.Set;
+import org.teiid.test.framework.ConfigPropertyLoader;
+
public class TestResultsSummary {
+
+ private static final String PROP_SUMMARY_PRT_DIR="summarydir";
private static final SimpleDateFormat FILE_NAME_DATE_FORMATER = new SimpleDateFormat(
"yyyyMMdd_HHmmss"); //$NON-NLS-1$
@@ -50,8 +56,8 @@
private int total_pass = 0;
private int total_fail = 0;
private int total_querysets = 0;
- private Set<String> failed_queries = new HashSet<String>(10);
- private Set<String> query_sets = new HashSet<String>(10);
+ private List<String> failed_queries = new ArrayList<String>();
+ private List<String> query_sets = new ArrayList<String>(10);
private static PrintStream getSummaryStream(String outputDir,
String summaryName) throws IOException {
@@ -304,6 +310,11 @@
}
public void printTotals(String outputDir, String scenario_name) throws Exception {
+
+ String summarydir = ConfigPropertyLoader.getInstance().getProperty(PROP_SUMMARY_PRT_DIR);
+ if (summarydir != null) {
+ outputDir = summarydir;
+ }
PrintStream outputStream = null;
try {
@@ -324,6 +335,9 @@
outputStream.println("\t" + "Name" + "\t\t" + "Pass" + "\t" + "Fail" + "\t" + "Total"); //$NON-NLS-1$
if (!this.query_sets.isEmpty()) {
+ // sort so that like failed queries are show together
+ Collections.sort(this.query_sets);
+
for (Iterator<String> it=this.query_sets.iterator(); it.hasNext();) {
outputStream
@@ -346,6 +360,9 @@
// .println("Number Failed : " + total_fail); //$NON-NLS-1$ //$NON-NLS-2$
if (!this.failed_queries.isEmpty()) {
+ // sort so that like failed queries are show together
+ Collections.sort(this.failed_queries);
+
outputStream.println("\n\n=================="); //$NON-NLS-1$
outputStream.println("Failed Queries"); //$NON-NLS-1$
Modified: trunk/test-integration/db/src/main/resources/qe-test.properties
===================================================================
--- trunk/test-integration/db/src/main/resources/qe-test.properties 2009-12-10 23:40:07 UTC (rev 1645)
+++ trunk/test-integration/db/src/main/resources/qe-test.properties 2009-12-11 03:09:56 UTC (rev 1646)
@@ -20,6 +20,7 @@
generatedir=target/bulk-query-tests/${queryset.dir}/generate
outputdir=target/bulk-query-tests/${queryset.dir}/output
+summarydir=target/bulk-query-tests
# transaction types
15 years
teiid SVN: r1645 - trunk/test-integration/db/src/main/resources/ctc_tests.
by teiid-commits＠lists.jboss.org
Author: vhalbert(a)redhat.com
Date: 2009-12-10 18:40:07 -0500 (Thu, 10 Dec 2009)
New Revision: 1645
Modified:
trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml
Log:
Teiid 781 - changes to support running from hudson, needed to up the memory
Modified: trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml 2009-12-10 22:54:31 UTC (rev 1644)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml 2009-12-10 23:40:07 UTC (rev 1645)
@@ -93,7 +93,7 @@
<include name="**/*.jar"/>
</fileset>
</classpath>
- <jvmarg value="-Xmx256m" />
+ <jvmarg value="-Xmx1024m" />
<jvmarg value="-Dmetamatrix.sockets=true" />
<jvmarg value="-Dconfig=${config.file}" />
<jvmarg value="-Dscenariofile=${scenario.file}" />
15 years
teiid SVN: r1644 - in trunk/test-integration/db/src/main/java/org/teiid/test/framework: connection and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: vhalbert(a)redhat.com
Date: 2009-12-10 17:54:31 -0500 (Thu, 10 Dec 2009)
New Revision: 1644
Modified:
trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyLoader.java
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/datasource/DataSourceMgr.java
Log:
Teiid 781 - changes to support running from hudson
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyLoader.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyLoader.java 2009-12-10 22:30:15 UTC (rev 1643)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/ConfigPropertyLoader.java 2009-12-10 22:54:31 UTC (rev 1644)
@@ -5,6 +5,7 @@
import java.util.Properties;
import org.teiid.test.framework.datasource.DataSourceFactory;
+import org.teiid.test.framework.datasource.DataStore;
import org.teiid.test.framework.exception.TransactionRuntimeException;
import org.teiid.test.util.PropUtils;
@@ -152,6 +153,22 @@
return p;
}
+
+ /**
+ * In certain testcases, the data that being provided is already
+ * preconfigured and should not be touched by the {@link DataStore}
+ * processing.
+ *
+ * @return
+ */
+ public boolean isDataStoreDisabled() {
+ String disable_config = this.getProperty(
+ ConfigPropertyNames.DISABLE_DATASTORES);
+ if (disable_config != null) {
+ return true;
+ }
+ return false;
+ }
public Map<String, String> getModelAssignedDatabaseTypes() {
return this.modelAssignedDatabaseType;
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-12-10 22:30:15 UTC (rev 1643)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/connection/ConnectionStrategy.java 2009-12-10 22:54:31 UTC (rev 1644)
@@ -18,12 +18,13 @@
import org.teiid.adminapi.AdminOptions;
import org.teiid.adminapi.Model;
import org.teiid.adminapi.VDB;
-import org.teiid.test.framework.ConfigPropertyNames;
+import org.teiid.test.framework.ConfigPropertyLoader;
import org.teiid.test.framework.TestLogger;
import org.teiid.test.framework.ConfigPropertyNames.CONNECTION_STRATEGY_PROPS;
import org.teiid.test.framework.datasource.DataSource;
import org.teiid.test.framework.datasource.DataSourceFactory;
import org.teiid.test.framework.datasource.DataSourceMgr;
+import org.teiid.test.framework.datasource.DataStore;
import org.teiid.test.framework.exception.QueryTestFailedException;
import org.teiid.test.framework.exception.TransactionRuntimeException;
@@ -81,12 +82,8 @@
* @return
*/
public boolean isDataStoreDisabled() {
- String disable_config = getEnvironment().getProperty(ConfigPropertyNames.DISABLE_DATASTORES, null);
- if (disable_config != null) {
- return true;
+ return ConfigPropertyLoader.getInstance().isDataStoreDisabled();
}
- return false;
- }
Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceMgr.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceMgr.java 2009-12-10 22:30:15 UTC (rev 1643)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceMgr.java 2009-12-10 22:54:31 UTC (rev 1644)
@@ -103,6 +103,9 @@
}
private void loadDataSourceMappings() throws QueryTestFailedException {
+ if (ConfigPropertyLoader.getInstance().isDataStoreDisabled()) {
+ return;
+ }
String dsloc = ConfigPropertyLoader.getInstance().getProperty(ConfigPropertyNames.OVERRIDE_DATASOURCES_LOC);
15 years
teiid SVN: r1643 - trunk/test-integration/db.
by teiid-commits＠lists.jboss.org
Author: vhalbert(a)redhat.com
Date: 2009-12-10 17:30:15 -0500 (Thu, 10 Dec 2009)
New Revision: 1643
Modified:
trunk/test-integration/db/pom.xml
Log:
Teiid 781 - adding profile for running client test
Modified: trunk/test-integration/db/pom.xml
===================================================================
--- trunk/test-integration/db/pom.xml 2009-12-10 22:05:25 UTC (rev 1642)
+++ trunk/test-integration/db/pom.xml 2009-12-10 22:30:15 UTC (rev 1643)
@@ -510,6 +510,16 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <showDeprecation>false</showDeprecation>
+ <showWarnings>false</showWarnings>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<dependencies>
<dependency>
15 years
teiid SVN: r1642 - trunk/test-integration/db.
by teiid-commits＠lists.jboss.org
Author: vhalbert(a)redhat.com
Date: 2009-12-10 17:05:25 -0500 (Thu, 10 Dec 2009)
New Revision: 1642
Modified:
trunk/test-integration/db/pom.xml
Log:
Teiid 781 - adding profile for running client test
Modified: trunk/test-integration/db/pom.xml
===================================================================
--- trunk/test-integration/db/pom.xml 2009-12-10 22:03:35 UTC (rev 1641)
+++ trunk/test-integration/db/pom.xml 2009-12-10 22:05:25 UTC (rev 1642)
@@ -139,65 +139,9 @@
<version>1.0</version>
</dependency>
-<!--
<dependency>
<groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-internal</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-common-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>connector-text</artifactId>
- <type>test-jar</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid.connectors</groupId>
- <artifactId>connector-jdbc</artifactId>
- <type>test-jar</type>
- <version>${project.version}</version>
- </dependency>
-
-
-
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-connector-sdk</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-metadata</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
- <artifactId>teiid-connector-sdk</artifactId>
- <version>${project.version}</version>
- </dependency>
-
-
-
--->
-
- <dependency>
- <groupId>org.jboss.teiid</groupId>
<artifactId>teiid-client-jdbc</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
@@ -210,11 +154,6 @@
<type>test-jar</type>
</dependency>
-<!--
- </dependencies>
-
- <dependencies>
--->
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
@@ -245,6 +184,24 @@
</dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>cpptasks</artifactId>
+ <version>1.0b3</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+
+ </dependency>
+
<!-- DBUnit dependencies -->
<dependency>
@@ -280,6 +237,9 @@
</dependencies>
+
+
+
<profiles>
<profile>
<id>default</id>
@@ -314,14 +274,17 @@
<property>
<name>usedatasources</name>
<value>${usedatasources}</value>
+ </property>
+ <property>
<name>datasourceloc</name>
<value>${datasourceloc}</value>
</property>
</systemProperties>
- <forkMode>always</forkMode>
+
<!--
+<forkMode>always</forkMode>
<forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
-->
<includes>
@@ -341,7 +304,23 @@
</plugin>
</plugins>
+
</build>
+
+<!-- <version>2.4.2</version> -->
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+
+ <configuration>
+ <outputDirectory>${basedir}/target/newsite</outputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</profile>
<profile>
@@ -377,6 +356,8 @@
<property>
<name>usedatasources</name>
<value>${usedatasources}</value>
+ </property>
+ <property>
<name>datasourceloc</name>
<value>${datasourceloc}</value>
</property>
@@ -517,6 +498,54 @@
</build>
</profile>
+
+ <profile>
+ <id>testclient</id>
+ <activation>
+ <property>
+ <name>scenario.dir</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${apache.ant.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>run-client-test</id>
+ <phase>integration-test</phase>
+ <configuration>
+ <tasks>
+ <property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
+ <property name="config.file" value="qe-test.properties"></property>
+ <property name="scenario.dir" value="${scenario.dir}"></property>
+ <property name="queryset.artifacts.dir" value="${queryset.artifacts.dir}"></property>
+ <property name="vdb.artifacts.dir" value="${vdb.artifacts.dir}"></property>
+ <property name="proj.dir" value="${project.basedir}" />
+ <ant antfile="src/main/resources/ctc_tests/ctc.xml" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+
+
</profiles>
15 years
teiid SVN: r1641 - trunk/test-integration/db/src/main/resources/ctc_tests.
by teiid-commits＠lists.jboss.org
Author: vhalbert(a)redhat.com
Date: 2009-12-10 17:03:35 -0500 (Thu, 10 Dec 2009)
New Revision: 1641
Added:
trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml
Log:
Teiid 781 - adding ant build file to run client tests
Added: trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml (rev 0)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml 2009-12-10 22:03:35 UTC (rev 1641)
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="ctc" default="main" >
+
+
+ <taskdef resource="net/sf/antcontrib/antlib.xml">
+ <classpath>
+ <pathelement path="${maven.runtime.classpath}" />
+ </classpath>
+ </taskdef>
+
+ <target name="main" depends="init" if="" unless="" description="create all property files">
+ <antcall target="run.all.test" inheritall="true" />
+ <antcall target="run.single.test" inheritall="true" />
+ </target>
+
+
+ <target name="init" depends="" >
+ <path id="test.classpath">
+ <pathelement path="${maven.runtime.classpath}" />
+ <pathelement location="${basedir}/lib/*.jar" />
+ </path>
+
+
+ <available file="${scenario.dir}" type="dir" property="dir.exist"/>
+ <fail unless="dir.exist" message="Scenario directory ${scenario.dir} does not exist" />
+
+ <!--
+ <pathconvert targetos="unix" property="install_dir" >
+ <map from="\" to="/"/>
+ <path location="${install.dir}"/>
+ </pathconvert>
+ -->
+ <!--
+ Load the default connection properties. These connection properties can be used in cases
+ when automation isn't being used.
+ Its expected that when run from Hudson, that the properties will set at the system level
+
+ <loadproperties srcFile="${install_dir}/bin/connection.properties"/>
+ -->
+
+
+ <condition property="all">
+ <not>
+ <isset property="single"/>
+ </not>
+ </condition>
+
+ </target>
+
+ <target name="run.all.test"
+ if="all" >
+ <echo>Executing ALL Scenarios</echo>
+
+ <for param="file">
+ <path>
+ <fileset dir="${scenario.dir}" includes="*.properties"/>
+ </path>
+ <sequential>
+ <antcall target="exec.scenario" inheritall="true" >
+ <param name="scenario.file" value="@{file}" />
+ </antcall>
+
+ <!--
+ <antcall target="exec.scenario" inheritall="true" >
+ <param name="scenario.file" value="@{file}" />
+ </antcall>
+ -->
+ </sequential>
+ </for>
+
+ </target>
+
+ <target name="run.single.test"
+ if="single" >
+ <echo>Executing Scenario ${test.scenario}</echo>
+ <property name="include.what" value="${scenario.dir}/${scenario.file}" />
+
+ <iterate target="run.scenario"/>
+ </target>
+
+ <target name="exec.scenario" depends="" >
+
+
+ <echo>Scenario property file ${scenario.file}</echo>
+ <!--
+ jvm="${java.home}/bin/java"
+ -->
+
+ <java classname="org.teiid.test.client.TestClient" fork="true" >
+ <classpath>
+ <pathelement path="${maven.runtime.classpath}" />
+ <fileset dir="${proj.dir}/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </classpath>
+ <jvmarg value="-Xmx256m" />
+ <jvmarg value="-Dmetamatrix.sockets=true" />
+ <jvmarg value="-Dconfig=${config.file}" />
+ <jvmarg value="-Dscenariofile=${scenario.file}" />
+ <jvmarg value="-Dqueryset.artifacts.dir=${queryset.artifacts.dir}" />
+ <jvmarg value="-Dvdb.artifacts.dir=${vdb.artifacts.dir}" />
+
+ </java>
+
+ </target>
+
+
+</project>
\ No newline at end of file
Property changes on: trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years
teiid SVN: r1640 - trunk/test-integration/db/src/main/resources/ctc_tests.
by teiid-commits＠lists.jboss.org
Author: vhalbert(a)redhat.com
Date: 2009-12-10 14:57:21 -0500 (Thu, 10 Dec 2009)
New Revision: 1640
Removed:
trunk/test-integration/db/src/main/resources/ctc_tests/qe-bqt-test.properties
Log:
Teiid 781 - changes to support running from hudson
Deleted: trunk/test-integration/db/src/main/resources/ctc_tests/qe-bqt-test.properties
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/qe-bqt-test.properties 2009-12-10 19:56:53 UTC (rev 1639)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/qe-bqt-test.properties 2009-12-10 19:57:21 UTC (rev 1640)
@@ -1,107 +0,0 @@
-
-# Need to setup the following system properties that will be picked up and substituted
-# - query.artifacts.dir
-# - vdb.artifacts.dir
-
-
-# the following are the properties to be passed in via maven or set as a system property
-#
-# 1 - set the location of the query files directory and results files directory
-#
-
-queryfiles.loc=${query.artifacts.dir}/bqt/test_queries
-
-
-
-results.loc=${query.artifacts.dir}/bqt/expected_results
-
-# 2 - where to find the scenario files
-scenariodir=${query.artifacts.dir}/bqt/scenarios
-
-#
-# 3 - where to find the vdb's, which is used as the teiid.home setting in the deploy.properties
-vdb.loc=${vdb.artifacts.dir}/vdbs
-
-
-
-# turn off the configuration of the datastores (data refresh) and connector bindings (seting the datastore connection info)
-disable_datastore=true
-
-
-generatedir=target/bulk-query-tests/bqt/generate
-outputdir=target/bulk-query-tests/bqt/output
-
-
-
-
-# transaction types
-# See the TransactionFactory for the list of types
-transaction-type=offwrap
-#transaction-type=local
-
-
-resultmode=compare
-
-connection-type=driver
-
-
-# this is the deploy.properties file which will be used to run all the tests
-# it will have these properties updated:
-# 1 - vdb.definition (which will be based on vdb.loc)
-deployprops.loc=./target/classes/ctc_tests/deploy.properties
-
-
-
-
-
-process-batch = 20
-connector-batch = 20
-
-# this is how to submit queries to Teiid
-# default is true
-execute.in.batch=false
-
-##########################################
-# properties for Teiid connection
-##########################################
-
-#driver=org.teiid.jdbc.TeiidDataSource
-
-### driver and url for connecting in server mode
-#driver=org.teiid.jdbc.TeiidDriver
-#URL=jdbc:metamatrix:${vdb}@mm://localhost:31000;user=admin;password=teiid
-
-### driver and url for running in embedded mode
-driver=com.metamatrix.jdbc.EmbeddedDataSource
-URL=jdbc:metamatrix:${vdb}@target/classes/ctc_tests/deploy.properties;user=admin;password=teiid
-User=admin
-Password=teiid
-
-### dont define Database, it will be set based on the scenario vdb
-#DatabaseName=
-ServerName=target/classes/ctc_tests/deploy.properties
-
-#PortNumber=0
-#application-name=bqt-test
-
-# jboss
-# mm.ds-jndiname=java:mmXA
-# usertxn-jndiname=UserTransaction
-
-# weblogic
-mm.ds-jndiname=mmXA
-usertxn-jndiname=java:comp/UserTransaction
-
-
-# These mappings control what datasource is mapped to which model when the -Dusedatasources=<comma seperated datasource names> option is used
-# or the system environment is set.
-#
-# By providing the numerical order, it indicates which datasource to assign based on the order in the usedatasources property.
-#
-# If -Dusedatasources is not set, then the datasource will be assigned in the order they are calling to obtain a datasource.
-#
-#
-
-BQT2=1
-BQT1=2
-SP=3
15 years
teiid SVN: r1639 - trunk/test-integration/db/src/main/resources.
by teiid-commits＠lists.jboss.org
Author: vhalbert(a)redhat.com
Date: 2009-12-10 14:56:53 -0500 (Thu, 10 Dec 2009)
New Revision: 1639
Added:
trunk/test-integration/db/src/main/resources/qe-test.properties
Log:
Teiid 781 - changes to support running from hudson
Added: trunk/test-integration/db/src/main/resources/qe-test.properties
===================================================================
--- trunk/test-integration/db/src/main/resources/qe-test.properties (rev 0)
+++ trunk/test-integration/db/src/main/resources/qe-test.properties 2009-12-10 19:56:53 UTC (rev 1639)
@@ -0,0 +1,91 @@
+# NOTES:
+# - ${queryset.dir} property is expected to come from the scenario file, indicating which queryset of files to use (because each scenario could be different)
+
+# Need to setup the following system properties that will be picked up and substituted
+# - query.artifacts.dir - indicating where all query sets can be found
+# - vdb.artifacts.dir - indicates where all the vdb can be found
+
+
+queryfiles.loc=${queryset.artifacts.dir}/${queryset.dir}/${test.queries.dir}
+
+results.loc=${queryset.artifacts.dir}/${queryset.dir}/${expected.results.dir}
+
+#
+# 3 - where to find the vdb's, which is used to define the vdb.definition setting in the deploy.properties
+vdb.loc=${vdb.artifacts.dir}
+
+# turn off the configuration of the datastores (data refresh) and connector bindings (seting the datastore connection info)
+disable_datastore=true
+
+
+generatedir=target/bulk-query-tests/${queryset.dir}/generate
+outputdir=target/bulk-query-tests/${queryset.dir}/output
+
+
+# transaction types
+# See the TransactionFactory for the list of types
+transaction-type=offwrap
+#transaction-type=local
+
+
+resultmode=compare
+
+
+# this is the deploy.properties file which will be used to run all the tests
+# it will have these properties updated:
+# 1 - vdb.definition (which will be based on vdb.loc)
+deployprops.loc=./target/classes/ctc_tests/deploy.properties
+
+process-batch = 20
+connector-batch = 20
+
+# this is how to submit queries to Teiid
+# default is true
+execute.in.batch=false
+
+##########################################
+# properties for Teiid connection
+##########################################
+
+connection-type=driver
+
+#driver=org.teiid.jdbc.TeiidDataSource
+
+### driver and url for connecting in server mode
+#driver=org.teiid.jdbc.TeiidDriver
+#URL=jdbc:metamatrix:${vdb}@mm://localhost:31000;user=admin;password=teiid
+
+### driver and url for running in embedded mode
+driver=com.metamatrix.jdbc.EmbeddedDataSource
+URL=jdbc:metamatrix:${vdb.name}@target/classes/ctc_tests/deploy.properties;user=admin;password=teiid
+User=admin
+Password=teiid
+
+### dont define Database, it will be set based on the scenario vdb
+DatabaseName=${vdb.name}
+ServerName=target/classes/ctc_tests/deploy.properties
+
+#PortNumber=0
+#application-name=bqt-test
+
+# jboss
+# mm.ds-jndiname=java:mmXA
+# usertxn-jndiname=UserTransaction
+
+# weblogic
+mm.ds-jndiname=mmXA
+usertxn-jndiname=java:comp/UserTransaction
+
+
+# These mappings control what datasource is mapped to which model when the -Dusedatasources=<comma seperated datasource names> option is used
+# or the system environment is set.
+#
+# By providing the numerical order, it indicates which datasource to assign based on the order in the usedatasources property.
+#
+# If -Dusedatasources is not set, then the datasource will be assigned in the order they are calling to obtain a datasource.
+#
+#
+
+BQT2=1
+BQT1=2
+SP=3
Property changes on: trunk/test-integration/db/src/main/resources/qe-test.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years