summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaspar De Groot2011-07-12 06:16:48 (EDT)
committerCaspar De Groot2011-07-12 06:16:48 (EDT)
commit0aa01884dc90f5c3cc2fe5bd6a635d80a4e5567b (patch)
tree9e4d25cd32321ffb775cdd74b0ccf9374551a94a
parentf037a09ffb92bf2c7eecb1daa6a43e83e53dcf75 (diff)
downloadcdo-0aa01884dc90f5c3cc2fe5bd6a635d80a4e5567b.zip
cdo-0aa01884dc90f5c3cc2fe5bd6a635d80a4e5567b.tar.gz
cdo-0aa01884dc90f5c3cc2fe5bd6a635d80a4e5567b.tar.bz2
[351807] [Releng] Remove Bugzilla_259869_Test
https://bugs.eclipse.org/bugs/show_bug.cgi?id=351807
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfigs.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_Bugzilla_259869_Test.java27
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259869_Test.java119
5 files changed, 0 insertions, 154 deletions
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 3c074ac..f3aa3b1 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
@@ -24,7 +24,6 @@ import org.eclipse.emf.cdo.tests.MergingTest;
import org.eclipse.emf.cdo.tests.XATransactionTest;
import org.eclipse.emf.cdo.tests.XRefTest;
import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_252214_Test;
-import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_259869_Test;
import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_303807_Test;
import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
@@ -87,10 +86,6 @@ public abstract class DBConfigs extends AllConfigs
// XXX [PSQL] disabled because of Bug 290097
testClasses.remove(ExternalReferenceTest.class);
testClasses.add(DISABLE_ExternalReferenceTest.class);
-
- // XXX [PSQL] disabled because of Bug 290097
- testClasses.remove(Bugzilla_259869_Test.class);
- testClasses.add(DISABLE_Bugzilla_259869_Test.class);
}
protected abstract boolean hasBranchingSupport();
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_Bugzilla_259869_Test.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_Bugzilla_259869_Test.java
deleted file mode 100644
index 4d6fd79..0000000
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_Bugzilla_259869_Test.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 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.tests.bugzilla.Bugzilla_259869_Test;
-
-/**
- * @author Eike Stepper
- */
-public class DISABLE_Bugzilla_259869_Test extends Bugzilla_259869_Test
-{
- @Override
- public void testBugzilla_259869_XA() throws Exception
- {
- // XXX disabled because of Bug 290097
- skipConfig(AllTestsDBPsql.Psql.INSTANCE);
- super.testBugzilla_259869_XA();
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java
index fdbc6ed..267231a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java
@@ -13,7 +13,6 @@ package org.eclipse.emf.cdo.tests.objectivity;
import org.eclipse.emf.cdo.server.IRepository;
import org.eclipse.emf.cdo.tests.ExternalReferenceTest;
-import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_259869_Test;
import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
import java.util.List;
@@ -83,7 +82,6 @@ public class AllTestsObjyNonAudit extends ObjyDBConfigs
// There is a problem with the root resource sharing, so for now we're commenting
// out ExternalReferenceTest and Bugzilla_259869_Test
testClasses.remove(ExternalReferenceTest.class);
- testClasses.remove(Bugzilla_259869_Test.class);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java
index d54322c..a333523 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java
@@ -122,7 +122,6 @@ public abstract class AllConfigs extends ConfigTestSuite
testClasses.add(Bugzilla_258850_Test.class);
testClasses.add(Bugzilla_258933_Test.class);
testClasses.add(Bugzilla_259695_Test.class);
- testClasses.add(Bugzilla_259869_Test.class);
testClasses.add(Bugzilla_259949_Test.class);
testClasses.add(Bugzilla_260756_Test.class);
testClasses.add(Bugzilla_260764_Test.class);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259869_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259869_Test.java
deleted file mode 100644
index 42badc4..0000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259869_Test.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 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:
- * Simon McDuff - initial API and implementation
- * Eike Stepper - maintenance
- */
-package org.eclipse.emf.cdo.tests.bugzilla;
-
-import org.eclipse.emf.cdo.eresource.CDOResource;
-import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.tests.AbstractCDOTest;
-import org.eclipse.emf.cdo.tests.model1.Company;
-import org.eclipse.emf.cdo.transaction.CDOTransaction;
-import org.eclipse.emf.cdo.transaction.CDOXATransaction;
-import org.eclipse.emf.cdo.util.CDOUtil;
-
-import org.eclipse.emf.internal.cdo.session.SessionUtil;
-
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-/**
- * CommitTransactionRequest sent redundantly
- * <p>
- * See bug 259869
- *
- * @author Simon McDuff
- */
-public class Bugzilla_259869_Test extends AbstractCDOTest
-{
- final static public String REPOSITORY2_NAME = "repo2";
-
- public void testBugzilla_259869() throws Exception
- {
- CDOSession session = openSession();
- session.getPackageRegistry().putEPackage(getModel1Package());
-
- CDOTransaction transaction = session.openTransaction();
-
- CDOResource resource1 = transaction.createResource(getResourcePath("test1"));
- Company company = getModel1Factory().createCompany();
- resource1.getContents().add(company);
-
- transaction.commit();
-
- long start = System.currentTimeMillis();
- for (int i = 0; i < 500; i++)
- {
- company.setName(String.valueOf(i));
- transaction.commit();
- }
-
- long timeCommitWithChanges = System.currentTimeMillis() - start;
- start = System.currentTimeMillis();
- for (int i = 0; i < 500; i++)
- {
- transaction.commit();
- }
-
- long timeToCommitNoChange = System.currentTimeMillis() - start;
- assertEquals(true, timeCommitWithChanges > timeToCommitNoChange * 1.2);
- }
-
- public void testBugzilla_259869_XA() throws Exception
- {
- getRepository(REPOSITORY2_NAME);
-
- CDOSession sessionA = openSession();
- CDOSession sessionB = openSession(REPOSITORY2_NAME);
-
- ResourceSet resourceSet = new ResourceSetImpl();
- CDOXATransaction xaTransaction = CDOUtil.createXATransaction();
-
- SessionUtil.prepareResourceSet(resourceSet);
- xaTransaction.add(CDOUtil.getViewSet(resourceSet));
-
- sessionA.getPackageRegistry().putEPackage(getModel1Package());
- sessionB.getPackageRegistry().putEPackage(getModel1Package());
-
- CDOTransaction transactionA1 = sessionA.openTransaction(resourceSet);
- CDOTransaction transactionB1 = sessionB.openTransaction(resourceSet);
-
- CDOResource resA = transactionA1.createResource(getResourcePath("/resA"));
- CDOResource resB = transactionB1.createResource(getResourcePath("/resB"));
-
- Company companyA = getModel1Factory().createCompany();
- resA.getContents().add(companyA);
-
- transactionA1.commit();
-
- Company companyB = getModel1Factory().createCompany();
- resB.getContents().add(companyB);
-
- transactionB1.commit();
-
- long start = System.currentTimeMillis();
- for (int i = 0; i < 500; i++)
- {
- companyA.setName(String.valueOf(i));
- companyB.setName(String.valueOf(i));
- xaTransaction.commit();
- }
-
- long timeCommitWithChanges = System.currentTimeMillis() - start;
- start = System.currentTimeMillis();
- for (int i = 0; i < 500; i++)
- {
- xaTransaction.commit();
- }
-
- long timeToCommitNoChange = System.currentTimeMillis() - start;
- assertEquals(true, timeCommitWithChanges > timeToCommitNoChange * 1.2);
- }
-}