Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-08-01 06:20:43 +0000
committerEike Stepper2012-08-01 06:20:43 +0000
commitff58dd358e132ba1e3008d1b4ad9b91c0dbbaec4 (patch)
tree7ac5f284841b98cb13ddcdd4f24afc23807a76bb
parent80fbd382614dcc31e516910e5c05a63614e9dcde (diff)
downloadcdo-ff58dd358e132ba1e3008d1b4ad9b91c0dbbaec4.tar.gz
cdo-ff58dd358e132ba1e3008d1b4ad9b91c0dbbaec4.tar.xz
cdo-ff58dd358e132ba1e3008d1b4ad9b91c0dbbaec4.zip
Move Lissome tests to local/master
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/launches/CDO AllTests (Lissome).launch20
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsLissome.java31
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IConstants.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java45
4 files changed, 0 insertions, 99 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/launches/CDO AllTests (Lissome).launch b/plugins/org.eclipse.emf.cdo.tests/launches/CDO AllTests (Lissome).launch
deleted file mode 100644
index df3045e072..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests/launches/CDO AllTests (Lissome).launch
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsLissome.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<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.AllTestsLissome"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#13;&#10;-Xmx1024m&#13;&#10;-Dorg.eclipse.net4j.util.om.trace.disable=true&#13;&#10;-Dorg.eclipse.emf.cdo.tests.config.impl.RepositoryConfig.enableServerBrowser=true"/>
-</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsLissome.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsLissome.java
deleted file mode 100644
index 0c46652582..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsLissome.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2004 - 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;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Eike Stepper
- */
-public class AllTestsLissome extends AllConfigs
-{
- public static Test suite()
- {
- return new AllTestsLissome().getTestSuite(AllConfigs.class.getName());
- }
-
- @Override
- protected void initConfigSuites(TestSuite parent)
- {
- addScenario(parent, COMBINED, LISSOME, JVM, NATIVE);
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IConstants.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IConstants.java
index ec5bf0457c..481ec3b33b 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IConstants.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IConstants.java
@@ -14,7 +14,6 @@ import org.eclipse.emf.cdo.common.CDOCommonRepository.IDGenerationLocation;
import org.eclipse.emf.cdo.tests.config.impl.ContainerConfig;
import org.eclipse.emf.cdo.tests.config.impl.ModelConfig;
import org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig;
-import org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig.LissomeConfig;
import org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig.MEMConfig;
import org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig.MEMOfflineConfig;
import org.eclipse.emf.cdo.tests.config.impl.SessionConfig;
@@ -39,8 +38,6 @@ public interface IConstants
public static final RepositoryConfig MEM_OFFLINE = new MEMOfflineConfig(IDGenerationLocation.CLIENT);
- public static final RepositoryConfig LISSOME = new LissomeConfig(IDGenerationLocation.STORE);
-
/**
* @deprecated Not yet supported.
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
index b8c9d2dc30..882484744a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
@@ -36,8 +36,6 @@ import org.eclipse.emf.cdo.server.IStoreAccessor.CommitContext;
import org.eclipse.emf.cdo.server.ITransaction;
import org.eclipse.emf.cdo.server.StoreThreadLocal;
import org.eclipse.emf.cdo.server.admin.CDOAdminServerUtil;
-import org.eclipse.emf.cdo.server.internal.lissome.db.DBBrowserPage;
-import org.eclipse.emf.cdo.server.lissome.LissomeStoreUtil;
import org.eclipse.emf.cdo.server.mem.MEMStoreUtil;
import org.eclipse.emf.cdo.server.net4j.CDONet4jServerUtil;
import org.eclipse.emf.cdo.server.ocl.OCLQueryHandler;
@@ -63,7 +61,6 @@ import org.eclipse.net4j.util.ObjectUtil;
import org.eclipse.net4j.util.ReflectUtil;
import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
import org.eclipse.net4j.util.container.IManagedContainer;
-import org.eclipse.net4j.util.container.IPluginContainer;
import org.eclipse.net4j.util.io.IOUtil;
import org.eclipse.net4j.util.lifecycle.ILifecycle;
import org.eclipse.net4j.util.lifecycle.LifecycleEventAdapter;
@@ -74,7 +71,6 @@ import org.eclipse.net4j.util.tests.AbstractOMTest;
import org.eclipse.emf.spi.cdo.InternalCDOSession;
-import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintStream;
import java.lang.annotation.Annotation;
@@ -942,45 +938,4 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
return MEMStoreUtil.createMEMStore();
}
}
-
- /**
- * @author Eike Stepper
- */
- public static class LissomeConfig extends RepositoryConfig
- {
- public static final String STORE_NAME = "Lissome";
-
- private static final long serialVersionUID = 1L;
-
- public LissomeConfig(IDGenerationLocation idGenerationLocation)
- {
- super(STORE_NAME, true, true, idGenerationLocation);
- }
-
- @Override
- protected String getStoreName()
- {
- return STORE_NAME;
- }
-
- @Override
- public boolean isRestartable()
- {
- return false;
- }
-
- public IStore createStore(String repoName)
- {
- File folder = getCurrentTest().createTempFolder("lissome-", ".tmp");
- IOUtil.ERR().println("Lissome folder: " + folder);
- return LissomeStoreUtil.createStore(folder);
- }
-
- @Override
- public void setUp() throws Exception
- {
- IPluginContainer.INSTANCE.registerFactory(new DBBrowserPage.Factory());
- super.setUp();
- }
- }
}

Back to the top