diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.db')
52 files changed, 262 insertions, 318 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/.gitignore b/plugins/org.eclipse.emf.cdo.tests.db/.gitignore new file mode 100644 index 0000000000..50e13221d7 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.db/.gitignore @@ -0,0 +1 @@ +/*.log diff --git a/plugins/org.eclipse.emf.cdo.tests.db/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.tests.db/.settings/org.eclipse.jdt.ui.prefs index 4343e2f963..3fc140fcdc 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.emf.cdo.tests.db/.settings/org.eclipse.jdt.ui.prefs @@ -64,7 +64,7 @@ org.eclipse.jdt.ui.keywordthis=false org.eclipse.jdt.ui.ondemandthreshold=99 org.eclipse.jdt.ui.overrideannotation=true org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Eike Stepper - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Eike Stepper\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * Copyright (c) 2004-2013 Eike Stepper (Berlin, Germany) and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * Eike Stepper - initial API and implementation\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Eike Stepper\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_missing_annotations=true diff --git a/plugins/org.eclipse.emf.cdo.tests.db/AllTestsDBDB2NonAudit.java b/plugins/org.eclipse.emf.cdo.tests.db/AllTestsDBDB2NonAudit.java index f24048cf4c..1d29f38bb3 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/AllTestsDBDB2NonAudit.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/AllTestsDBDB2NonAudit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2010-2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Derby).launch b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Derby).launch index 87f61781c2..08c786646e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Derby).launch +++ b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (Derby).launch @@ -12,5 +12,5 @@ <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.db.AllTestsDBDerby"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests.db"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m -Xmx1024m"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=512m -Xms512m -Xmx2g"/> </launchConfiguration> diff --git a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (PostgreSQL non-audit).launch b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (PostgreSQL ALL).launch index d624f94450..d624f94450 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (PostgreSQL non-audit).launch +++ b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (PostgreSQL ALL).launch diff --git a/plugins/org.eclipse.emf.cdo.tests.db/build.properties b/plugins/org.eclipse.emf.cdo.tests.db/build.properties index 3edd0aa60c..41e5bee44e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/build.properties +++ b/plugins/org.eclipse.emf.cdo.tests.db/build.properties @@ -1,4 +1,4 @@ -# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. +# Copyright (c) 2009-2012 Eike Stepper (Berlin, Germany) and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -27,7 +27,7 @@ src.includes = about.html,\ CDO AllTests (Hsqldb audit).launch,\ CDO AllTests (Hsqldb non-audit).launch,\ CDO AllTests (Mysql).launch,\ - CDO AllTests (PostgreSQL non-audit).launch,\ + CDO AllTests (PostgreSQL ALL).launch,\ CDO AllTests (DBStore).launch,\ CDO AllTests (H2 ALL).launch,\ CDO AllTests (H2 UUIDs).launch,\ diff --git a/plugins/org.eclipse.emf.cdo.tests.db/copyright.txt b/plugins/org.eclipse.emf.cdo.tests.db/copyright.txt index 0a0f67e6d7..1c77978050 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/copyright.txt +++ b/plugins/org.eclipse.emf.cdo.tests.db/copyright.txt @@ -1,8 +1,8 @@ -Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. +Copyright (c) 2004-2013 Eike Stepper (Berlin, Germany) and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: - Eike Stepper - initial API and implementation
\ No newline at end of file + Eike Stepper - initial API and implementation diff --git a/plugins/org.eclipse.emf.cdo.tests.db/plugin.properties b/plugins/org.eclipse.emf.cdo.tests.db/plugin.properties index 97613de720..91cb452af2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.tests.db/plugin.properties @@ -1,4 +1,4 @@ -# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. +# Copyright (c) 2009, 2010, 2012 Eike Stepper (Berlin, Germany) and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AbstractSetupDBConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AbstractSetupDBConfig.java new file mode 100644 index 0000000000..698566303e --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AbstractSetupDBConfig.java @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + */ +package org.eclipse.emf.cdo.tests.db; + +import org.eclipse.emf.cdo.common.CDOCommonRepository.IDGenerationLocation; + +import org.eclipse.net4j.db.DBUtil; + +import javax.sql.DataSource; + +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.List; + +/** + * @author Victor Roldan Betancort + */ +public abstract class AbstractSetupDBConfig extends DBConfig +{ + private static final long serialVersionUID = 1L; + + private transient DataSource setupDataSource; + + private transient List<String> databases = new ArrayList<String>(); + + public AbstractSetupDBConfig(String name, boolean supportingAudits, boolean supportingBranches, boolean withRanges, + boolean copyOnBranch, IDGenerationLocation idGenerationLocation) + { + super(name, supportingAudits, supportingBranches, withRanges, copyOnBranch, idGenerationLocation); + } + + @Override + protected DataSource createDataSource(String repoName) + { + String dbName = "test_" + repoName; + initDatabase(dbName); + + return createDataSourceForDB(dbName); + } + + @Override + protected void deactivateRepositories() + { + super.deactivateRepositories(); + for (String dbName : databases) + { + dropDatabase(dbName); + } + } + + private void initDatabase(String dbName) + { + dropDatabase(dbName); + Connection connection = null; + Statement stmt = null; + + try + { + connection = getSetupDataSource().getConnection(); + stmt = connection.createStatement(); + stmt.execute("CREATE DATABASE " + dbName); + } + catch (SQLException ignore) + { + } + finally + { + DBUtil.close(stmt); + DBUtil.close(connection); + } + } + + private void dropDatabase(String dbName) + { + Connection connection = null; + Statement stmt = null; + + try + { + connection = getSetupDataSource().getConnection(); + stmt = connection.createStatement(); + stmt.execute("DROP DATABASE " + dbName); + } + catch (SQLException ignore) + { + } + finally + { + DBUtil.close(stmt); + DBUtil.close(connection); + } + } + + private DataSource getSetupDataSource() + { + if (setupDataSource == null) + { + setupDataSource = createDataSourceForDB(null); + } + + return setupDataSource; + } + + /** + * Note that <code>dbName</code> can be <code>null</code>, in which case a <i>setup</i> datasource must be returned. + * A connection form a setup< datasource can be used to create or drop other databases. + */ + protected abstract DataSource createDataSourceForDB(String dbName); +} diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBDerby.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBDerby.java index 6f60309b92..fa0ae333a7 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBDerby.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBDerby.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2009-2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2All.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2All.java index 61b47d2a83..abc80947cb 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2All.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2All.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2010-2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java index dd143b9c0c..0832fd142c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2011-2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java index a9d0fc010c..8fe0d9ba1f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2010-2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2BranchingUUIDs.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2BranchingUUIDs.java index e30be306a5..c53e23cd90 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2BranchingUUIDs.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2BranchingUUIDs.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2011-2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java index d3688d3634..155840af2f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2009-2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldb.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldb.java index f24482618b..30697405f0 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldb.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldb.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2009-2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldbNonAudit.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldbNonAudit.java index fc4e2f6688..bf8553b658 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldbNonAudit.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldbNonAudit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2009-2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBMysql.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBMysql.java index 060e484fab..319b108c6f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBMysql.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBMysql.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2009-2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java index b91675e8fd..00abaf36b5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2009-2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -38,5 +38,7 @@ public class AllTestsDBPsql extends DBConfigs protected void initConfigSuites(TestSuite parent) { addScenario(parent, COMBINED, new PostgresqlConfig(false, false, IDGenerationLocation.STORE), JVM, NATIVE); + addScenario(parent, COMBINED, new PostgresqlConfig(true, false, IDGenerationLocation.STORE), JVM, NATIVE); + addScenario(parent, COMBINED, new PostgresqlConfig(true, true, IDGenerationLocation.STORE), JVM, NATIVE); } } diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AutomatedTests.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AutomatedTests.java index 7a36e4d4f8..558611bec9 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AutomatedTests.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AutomatedTests.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2009-2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Bugzilla_351068_Test.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Bugzilla_351068_Test.java index ac300e5384..a2bbcbaa0b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Bugzilla_351068_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Bugzilla_351068_Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/CustomTypeMappingTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/CustomTypeMappingTest.java index 2fd9bd44f4..b7fb4e7e05 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/CustomTypeMappingTest.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/CustomTypeMappingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2010-2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBAnnotationsTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBAnnotationsTest.java index b599173e79..2532c71196 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBAnnotationsTest.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBAnnotationsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2009-2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfig.java index 209d0815b4..28315c0dba 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2011-2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfigs.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfigs.java index e414d8e92f..8f812ff137 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfigs.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfigs.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2009-2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBStoreTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBStoreTest.java index 30ddd7fd31..66a7dcc19c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBStoreTest.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBStoreTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2009-2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DerbyConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DerbyConfig.java index e507afa861..e0a3303344 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DerbyConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DerbyConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2Config.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2Config.java index 445b17c6b8..46ed8313f2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2Config.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/H2Config.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2011-2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/HsqldbConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/HsqldbConfig.java index c5073b891a..e50fdf308f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/HsqldbConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/HsqldbConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/MysqlConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/MysqlConfig.java index 61dbc5af9f..00f9a890d6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/MysqlConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/MysqlConfig.java @@ -1,19 +1,17 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.db; import org.eclipse.emf.cdo.common.CDOCommonRepository.IDGenerationLocation; -import org.eclipse.emf.cdo.server.IRepository.Props; -import org.eclipse.net4j.db.DBUtil; import org.eclipse.net4j.db.IDBAdapter; import org.eclipse.net4j.db.mysql.MYSQLAdapter; @@ -21,17 +19,10 @@ import com.mysql.jdbc.jdbc2.optional.MysqlDataSource; import javax.sql.DataSource; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - /** * @author Simon McDuff */ -public class MysqlConfig extends DBConfig +public class MysqlConfig extends AbstractSetupDBConfig { public static final String DB_ADAPTER_NAME = "Mysql"; @@ -48,10 +39,6 @@ public class MysqlConfig extends DBConfig private static final long serialVersionUID = 1L; - private transient DataSource setupDataSource; - - private transient List<String> databases = new ArrayList<String>(); - public MysqlConfig(boolean supportingAudits, boolean supportingBranches, IDGenerationLocation idGenerationLocation) { super(DB_ADAPTER_NAME, supportingAudits, supportingBranches, false, false, idGenerationLocation); @@ -70,98 +57,16 @@ public class MysqlConfig extends DBConfig } @Override - protected DataSource createDataSource(String repoName) - { - MysqlDataSource ds = new MysqlDataSource(); - - initDatabase("test_" + repoName); - - ds.setUrl("jdbc:mysql://" + MysqlConfig.HOST + "/test_" + repoName); - ds.setUser(MysqlConfig.USER); - if (MysqlConfig.PASS != null) - { - ds.setPassword(MysqlConfig.PASS); - } - - return ds; - } - - private void initDatabase(String dbName) - { - dropDatabase(dbName); - Connection connection = null; - Statement stmt = null; - - try - { - connection = getSetupDataSource().getConnection(); - stmt = connection.createStatement(); - stmt.execute("create database " + dbName); - } - catch (SQLException ignore) - { - } - finally - { - DBUtil.close(stmt); - DBUtil.close(connection); - } - } - - @Override - protected void deactivateRepositories() + protected DataSource createDataSourceForDB(String dbName) { - super.deactivateRepositories(); - for (String dbName : databases) + MysqlDataSource dataSource = new MysqlDataSource(); + dataSource.setUrl("jdbc:mysql://" + HOST); + dataSource.setUser(USER); + if (PASS != null) { - dropDatabase(dbName); + dataSource.setPassword(PASS); } - } - - private void dropDatabase(String dbName) - { - Connection connection = null; - Statement stmt = null; - try - { - connection = getSetupDataSource().getConnection(); - stmt = connection.createStatement(); - stmt.execute("DROP database " + dbName); - } - catch (SQLException ignore) - { - } - finally - { - DBUtil.close(stmt); - DBUtil.close(connection); - } - } - - private DataSource getSetupDataSource() - { - if (setupDataSource == null) - { - MysqlDataSource ds = new MysqlDataSource(); - ds.setUrl("jdbc:mysql://" + MysqlConfig.HOST); - ds.setUser(MysqlConfig.USER); - if (MysqlConfig.PASS != null) - { - ds.setPassword(MysqlConfig.PASS); - } - - setupDataSource = ds; - } - - return setupDataSource; - } - - @Override - protected void initRepositoryProperties(Map<String, String> props) - { - super.initRepositoryProperties(props); - props.put(Props.SUPPORTING_AUDITS, "true"); - props.put(Props.SUPPORTING_BRANCHES, "true"); + return dataSource; } } diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Net4jDBTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Net4jDBTest.java index 9a0b2daaf3..cdc06bbc14 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Net4jDBTest.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/Net4jDBTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2010-2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -21,6 +21,7 @@ import org.eclipse.net4j.db.ddl.IDBTable; import org.eclipse.net4j.util.collection.Pair; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.io.ExtendedIOUtil; import org.eclipse.net4j.util.io.IOUtil; import java.io.ByteArrayInputStream; @@ -46,19 +47,12 @@ public class Net4jDBTest extends AbstractCDOTest { private static final String FIELD_NAME = "testField"; - private ArrayList<Pair<DBType, Object>> columns = new ArrayList<Pair<DBType, Object>>(); - - private DBStore store; - - private Connection connection; + private transient ArrayList<Pair<DBType, Object>> columns = new ArrayList<Pair<DBType, Object>>(); @Override protected void doTearDown() throws Exception { columns.clear(); - columns = null; - store = null; - connection = null; super.doTearDown(); } @@ -158,7 +152,7 @@ public class Net4jDBTest extends AbstractCDOTest { registerColumn(DBType.CLOB, "Test"); - StringBuffer b = new StringBuffer(); + StringBuilder b = new StringBuilder(); for (int i = 0; i < 1000000; i++) { b.append("x"); @@ -336,13 +330,31 @@ public class Net4jDBTest extends AbstractCDOTest doTest(getName()); } - private void registerColumn(DBType type, Object value) + private void registerColumn(DBType type, Object value) throws IOException { + testIOSymmetry(type, value); + Pair<DBType, Object> column = Pair.create(type, value); columns.add(column); } - private void prepareTable(final String tableName) + private void testIOSymmetry(DBType type, Object value) throws IOException + { + ByteArrayOutputStream output = new ByteArrayOutputStream(); + ExtendedDataOutputStream outs = new ExtendedDataOutputStream(output); + writeTypeValue(outs, type, value); + outs.close(); + output.flush(); + byte[] buffer = output.toByteArray(); + output.close(); + + ByteArrayInputStream input = new ByteArrayInputStream(buffer); + ExtendedDataInputStream ins = new ExtendedDataInputStream(input); + Object actualValue = readTypeValue(ins, type); + assertEquals(value, actualValue, type, -1); + } + + private void prepareTable(DBStore store, final String tableName) { IDBDatabase database = store.getDatabase(); database.updateSchema(new IDBDatabase.RunnableWithSchema() @@ -371,7 +383,7 @@ public class Net4jDBTest extends AbstractCDOTest }); } - private void writeValues(String tableName) throws Exception + private void writeValues(Connection connection, String tableName) throws Exception { ByteArrayOutputStream output = new ByteArrayOutputStream(); ExtendedDataOutputStream outs = new ExtendedDataOutputStream(output); @@ -418,7 +430,7 @@ public class Net4jDBTest extends AbstractCDOTest input.close(); } - private void checkValues(String tableName) throws Exception + private void checkValues(Connection connection, String tableName) throws Exception { Statement stmt = connection.createStatement(); ResultSet resultSet = stmt.executeQuery("SELECT * FROM " + tableName); @@ -430,7 +442,8 @@ public class Net4jDBTest extends AbstractCDOTest int c = 1; for (Pair<DBType, Object> column : columns) { - column.getElement1().writeValue(outs, resultSet, c++, false); + DBType dbType = column.getElement1(); + dbType.writeValue(outs, resultSet, c++, false); } resultSet.close(); @@ -451,50 +464,53 @@ public class Net4jDBTest extends AbstractCDOTest Object expected = column.getElement2(); Object actual = readTypeValue(ins, dbType); - Class<? extends Object> type = expected.getClass(); - if (type.isArray()) + assertEquals(expected, actual, dbType, c++); + } + } + + private void assertEquals(Object expected, Object actual, DBType dbType, int c) + { + Class<? extends Object> type = expected.getClass(); + if (type.isArray()) + { + Class<?> componentType = type.getComponentType(); + if (componentType == byte.class) { - Class<?> componentType = type.getComponentType(); - if (componentType == byte.class) - { - assertEquals("Error in column " + c + " of type " + dbType, true, - Arrays.equals((byte[])expected, (byte[])actual)); - } - else if (componentType == char.class) - { - assertEquals("Error in column " + c + " with type " + dbType, true, - Arrays.equals((char[])expected, (char[])actual)); - } - else - { - throw new IllegalStateException("Unexpected component type: " + componentType); - } + assertEquals("Error in column " + c + " of type " + dbType, true, + Arrays.equals((byte[])expected, (byte[])actual)); + } + else if (componentType == char.class) + { + assertEquals("Error in column " + c + " with type " + dbType, true, + Arrays.equals((char[])expected, (char[])actual)); } else { - if (dbType == DBType.TIME) - { - actual = (Long)actual % 86400000L; - expected = (Long)expected % 86400000L; - } - - assertEquals("Error in column " + c + " with type " + dbType, expected, actual); + throw new IllegalStateException("Unexpected component type: " + componentType); + } + } + else + { + if (dbType == DBType.TIME) + { + actual = (Long)actual % 86400000L; + expected = (Long)expected % 86400000L; } - ++c; + assertEquals("Error in column " + c + " with type " + dbType, expected, actual); } } private void doTest(String tableName) throws Exception { - store = (DBStore)getRepository().getStore(); - connection = store.getConnection(); + DBStore store = (DBStore)getRepository().getStore(); + Connection connection = store.getConnection(); try { - prepareTable(tableName); - writeValues(tableName); - checkValues(tableName); + prepareTable(store, tableName); + writeValues(connection, tableName); + checkValues(connection, tableName); } finally { @@ -563,25 +579,8 @@ public class Net4jDBTest extends AbstractCDOTest return; case CLOB: - { - long length = ((String)value).length(); - StringReader source = new StringReader((String)value); - try - { - outs.writeLong(length); - while (length-- > 0) - { - int c = source.read(); - outs.writeChar(c); - } - } - finally - { - IOUtil.close(source); - } - + ExtendedIOUtil.writeCharacterStream(outs, new StringReader((String)value)); return; - } case BIGINT: case DATE: @@ -597,25 +596,8 @@ public class Net4jDBTest extends AbstractCDOTest return; case BLOB: - { - long length = ((byte[])value).length; - ByteArrayInputStream source = new ByteArrayInputStream((byte[])value); - try - { - outs.writeLong(length); - while (length-- > 0) - { - int b = source.read(); - outs.writeByte(b + Byte.MIN_VALUE); - } - } - finally - { - IOUtil.close(source); - } - + ExtendedIOUtil.writeBinaryStream(outs, new ByteArrayInputStream((byte[])value)); return; - } default: throw new UnsupportedOperationException("not implemented"); @@ -670,19 +652,16 @@ public class Net4jDBTest extends AbstractCDOTest case CLOB: { StringWriter result = new StringWriter(); + try { - long length = ins.readLong(); - while (length-- > 0) - { - char c = ins.readChar(); - result.append(c); - } + ExtendedIOUtil.readCharacterStream(ins, result); } finally { IOUtil.close(result); } + return result.toString(); } @@ -703,12 +682,7 @@ public class Net4jDBTest extends AbstractCDOTest try { - long length = ins.readLong(); - while (length-- > 0) - { - int b = ins.readByte(); - result.write(b - Byte.MIN_VALUE); - } + ExtendedIOUtil.readBinaryStream(ins, result); } finally { diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/PostgresqlConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/PostgresqlConfig.java index 0df8795f5b..3db45a6459 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/PostgresqlConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/PostgresqlConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,35 +11,30 @@ package org.eclipse.emf.cdo.tests.db; import org.eclipse.emf.cdo.common.CDOCommonRepository.IDGenerationLocation; -import org.eclipse.emf.cdo.tests.db.bundle.OM; -import org.eclipse.net4j.db.DBUtil; import org.eclipse.net4j.db.IDBAdapter; import org.eclipse.net4j.db.postgresql.PostgreSQLAdapter; -import org.eclipse.net4j.util.io.IOUtil; import org.postgresql.ds.PGSimpleDataSource; import javax.sql.DataSource; -import java.io.PrintWriter; -import java.sql.Connection; -import java.sql.SQLException; - /** * @author Victor Roldan Betancort */ -public class PostgresqlConfig extends DBConfig +public class PostgresqlConfig extends AbstractSetupDBConfig { public static final String DB_ADAPTER_NAME = "Postgresql"; - private static final long serialVersionUID = 1L; + public static final String HOST = "localhost"; - private transient PGSimpleDataSource dataSource; + public static final String USER = "postgres"; - private transient PGSimpleDataSource setupDataSource; + public static final String PASS = "postgres"; - private String currentRepositoryName = "cdodb1"; + public static final String SETUP_DATABASE_NAME = "postgres"; + + private static final long serialVersionUID = 1L; public PostgresqlConfig(boolean supportingAudits, boolean supportingBranches, IDGenerationLocation idGenerationLocation) @@ -60,69 +55,17 @@ public class PostgresqlConfig extends DBConfig } @Override - protected DataSource createDataSource(String repoName) + protected DataSource createDataSourceForDB(String dbName) { - currentRepositoryName = repoName; - - dataSource = new PGSimpleDataSource(); - dataSource.setServerName("localhost"); - dataSource.setDatabaseName(currentRepositoryName); - dataSource.setUser("sa"); - dataSource.setPassword("sa"); - - try - { - dataSource.setLogWriter(new PrintWriter(System.err)); - } - catch (SQLException ex) + PGSimpleDataSource dataSource = new PGSimpleDataSource(); + dataSource.setServerName(HOST); + dataSource.setDatabaseName(dbName == null ? SETUP_DATABASE_NAME : dbName); + dataSource.setUser(USER); + if (PASS != null) { - OM.LOG.warn(ex.getMessage()); + dataSource.setPassword(PASS); } - dropDatabase(); - return dataSource; } - - @Override - protected void deactivateRepositories() - { - super.deactivateRepositories(); - dataSource = null; - setupDataSource = null; - dropDatabase(); - } - - private void dropDatabase() - { - Connection connection = null; - - try - { - connection = getSetupDataSource().getConnection(); - DBUtil.dropAllTables(connection, currentRepositoryName); - } - catch (SQLException ignore) - { - IOUtil.ERR().println(ignore); - } - finally - { - DBUtil.close(connection); - } - } - - private DataSource getSetupDataSource() - { - if (setupDataSource == null) - { - setupDataSource = new PGSimpleDataSource(); - setupDataSource.setServerName("localhost"); - setupDataSource.setDatabaseName(currentRepositoryName); - setupDataSource.setUser("sa"); - setupDataSource.setPassword("sa"); - } - - return setupDataSource; - } } diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java index 705217403f..d946c9236f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2009-2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/bundle/OM.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/bundle/OM.java index 78fd6cd69a..b662c73bc3 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/bundle/OM.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/bundle/OM.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2009, 2011, 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java index d0af76f769..8f696dcf7e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2009-2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/DerbyTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/DerbyTest.java index 34f250fd46..6cca06e076 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/DerbyTest.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/DerbyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2009, 2011, 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/H2Test.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/H2Test.java index efd1e2ae31..fb4f5c627a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/H2Test.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/H2Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2009, 2011, 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/HsqlTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/HsqlTest.java index 611ea264bf..df9957d843 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/HsqlTest.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/HsqlTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2009, 2011, 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/MysqlTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/MysqlTest.java index 1db27f9789..1ef4484647 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/MysqlTest.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/MysqlTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2009, 2011, 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBH2Offline.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBH2Offline.java index 55cfb29560..4693f269d2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBH2Offline.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBH2Offline.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2012, 2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBMysqlOffline.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBMysqlOffline.java index 0e7676a76a..1087264d50 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBMysqlOffline.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBMysqlOffline.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2012, 2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/Bugzilla_351078_DB_Test.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/Bugzilla_351078_DB_Test.java index 524540a9e1..6aaee11dc5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/Bugzilla_351078_DB_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/Bugzilla_351078_DB_Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/Bugzilla_377727_Test.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/Bugzilla_377727_Test.java index 032106e253..d3516ef6b0 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/Bugzilla_377727_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/Bugzilla_377727_Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/DBOfflineConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/DBOfflineConfig.java index aa5841d278..602c0d38b5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/DBOfflineConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/DBOfflineConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/H2OfflineConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/H2OfflineConfig.java index 5c7140c39e..2033e5d8ce 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/H2OfflineConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/H2OfflineConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/MysqlOfflineConfig.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/MysqlOfflineConfig.java index a7b2d40554..b0a1acfaf5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/MysqlOfflineConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/MysqlOfflineConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/performance/AllPerformanceTestsH2NonAudit.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/performance/AllPerformanceTestsH2NonAudit.java index 89ef12d0a4..460484ae65 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/performance/AllPerformanceTestsH2NonAudit.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/performance/AllPerformanceTestsH2NonAudit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2011-2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/AbstractDBRevisionCacheTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/AbstractDBRevisionCacheTest.java index 43b4fb0d7a..4b0882a2e9 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/AbstractDBRevisionCacheTest.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/AbstractDBRevisionCacheTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/AllTestsDBRevisionCache.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/AllTestsDBRevisionCache.java index b0b1b344d5..87ed42fb9b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/AllTestsDBRevisionCache.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/AllTestsDBRevisionCache.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/DerbyDBRevisionCacheTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/DerbyDBRevisionCacheTest.java index 9161009acb..651eac7f63 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/DerbyDBRevisionCacheTest.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/DerbyDBRevisionCacheTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/H2DBRevisionCacheTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/H2DBRevisionCacheTest.java index d7283e6e7b..eefed10466 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/H2DBRevisionCacheTest.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/H2DBRevisionCacheTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/verifier/DBStoreVerifier.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/verifier/DBStoreVerifier.java index 6c3bd450c6..ba7ef693e7 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/verifier/DBStoreVerifier.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/verifier/DBStoreVerifier.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * Copyright (c) 2009-2013 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at |