Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2020-04-12 03:36:55 +0000
committerEike Stepper2020-04-12 03:36:55 +0000
commite6e7a04a529fd54027673b553b838a35d36fe5df (patch)
treeab8c80e17ba3def548ed52b835c8eeb771b53768
parent1db6a4f69fab89de90034fcfa47d9c6191e10fc7 (diff)
downloadcdo-e6e7a04a529fd54027673b553b838a35d36fe5df.tar.gz
cdo-e6e7a04a529fd54027673b553b838a35d36fe5df.tar.xz
cdo-e6e7a04a529fd54027673b553b838a35d36fe5df.zip
[Releng] Refactor RepositoryConfig.getName()
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBMysql.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfig.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/DBOfflineConfig.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java12
4 files changed, 24 insertions, 12 deletions
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 766b4a7b73..bf8aef6144 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
@@ -48,14 +48,12 @@ public class AllTestsDBMysql extends DBConfigs
protected void initConfigSuites(TestSuite parent)
{
addScenario(parent, new MysqlConfig(), JVM, NATIVE);
- addScenario(parent, new MysqlConfig().idGenerationLocation(IDGenerationLocation.STORE), JVM, NATIVE);
+ addScenario(parent, new MysqlConfig().idGenerationLocation(IDGenerationLocation.CLIENT), JVM, NATIVE);
- // addScenario(parent, new MysqlConfig().supportingAudits(true).withRanges(true), JVM, NATIVE);
- // addScenario(parent, new
- // MysqlConfig().supportingAudits(true).withRanges(true).idGenerationLocation(IDGenerationLocation.STORE), JVM,
- // NATIVE);
+ addScenario(parent, new MysqlConfig().supportingAudits(true).withRanges(true), JVM, NATIVE);
+ addScenario(parent, new MysqlConfig().supportingAudits(true).withRanges(true).idGenerationLocation(IDGenerationLocation.CLIENT), JVM, NATIVE);
addScenario(parent, new MysqlConfig().supportingBranches(true).withRanges(true), JVM, NATIVE);
- addScenario(parent, new MysqlConfig().supportingBranches(true).withRanges(true).idGenerationLocation(IDGenerationLocation.STORE), JVM, NATIVE);
+ addScenario(parent, new MysqlConfig().supportingBranches(true).withRanges(true).idGenerationLocation(IDGenerationLocation.CLIENT), JVM, NATIVE);
}
}
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 b6748ad796..0ce48c6296 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
@@ -225,7 +225,12 @@ public abstract class DBConfig extends RepositoryConfig
}
@Override
- protected String getMappingStrategySpecialization()
+ protected String getModeSuffix()
+ {
+ return super.getModeSuffix() + getMappingStrategySuffix();
+ }
+
+ protected String getMappingStrategySuffix()
{
return (withRanges ? "-ranges" : "") + (copyOnBranch ? "-copy" : "") + (inverseLists ? "-inverse" : "");
}
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 d015fec09e..e8b36478bb 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
@@ -153,7 +153,12 @@ public abstract class DBOfflineConfig extends OfflineConfig
}
@Override
- protected String getMappingStrategySpecialization()
+ protected String getModeSuffix()
+ {
+ return super.getModeSuffix() + getMappingStrategySuffix();
+ }
+
+ protected String getMappingStrategySuffix()
{
return (withRanges ? "-ranges" : "") + (copyOnBranch ? "-copy" : "");
}
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 3e440428f2..94274551f0 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
@@ -315,13 +315,17 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
@Override
public String getName()
{
- return super.getName() + (supportingBranches ? "-branching" : supportingAudits ? "-auditing" : "") + getMappingStrategySpecialization()
- + (idGenerationLocation == IDGenerationLocation.CLIENT ? "-uuids" : "");
+ return super.getName() + getModeSuffix() + getUUIDSuffix();
}
- protected String getMappingStrategySpecialization()
+ protected String getModeSuffix()
{
- return "";
+ return supportingBranches ? "-branching" : supportingAudits ? "-auditing" : "";
+ }
+
+ protected String getUUIDSuffix()
+ {
+ return idGenerationLocation == IDGenerationLocation.CLIENT ? "-uuids" : "";
}
@Override

Back to the top