Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2012-11-01 17:30:01 +0000
committerMartin Taal2012-11-01 17:30:01 +0000
commit97de6a81b8589867f844993435cc4a0338f09905 (patch)
tree442eb7addf7d43e452a546ca9f555f2a7a8b20d6 /tests/org.eclipse.emf.teneo.commontest
parent067dae9cc6f419ad4b9113df6a6b08881c998e6c (diff)
downloadorg.eclipse.emf.teneo-97de6a81b8589867f844993435cc4a0338f09905.tar.gz
org.eclipse.emf.teneo-97de6a81b8589867f844993435cc4a0338f09905.tar.xz
org.eclipse.emf.teneo-97de6a81b8589867f844993435cc4a0338f09905.zip
Latest auditing changes
Diffstat (limited to 'tests/org.eclipse.emf.teneo.commontest')
-rwxr-xr-xtests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/AbstractActionTest.java6
-rwxr-xr-xtests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/AbstractTestAction.java4
-rwxr-xr-xtests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/EmbeddedIdAction.java7
3 files changed, 16 insertions, 1 deletions
diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/AbstractActionTest.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/AbstractActionTest.java
index 90ae9c790..a382b0581 100755
--- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/AbstractActionTest.java
+++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/AbstractActionTest.java
@@ -19,6 +19,7 @@ package org.eclipse.emf.teneo.test;
import java.util.Properties;
import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.teneo.Constants;
import org.eclipse.emf.teneo.PersistenceOptions;
import org.eclipse.emf.teneo.extension.ExtensionManager;
@@ -102,6 +103,10 @@ public class AbstractActionTest extends AbstractTest {
public Properties getExtraConfigurationProperties() {
Properties allProperties = getTestAction().getExtraConfigurationProperties();
+ if (!getTestAction().supportAuditing()) {
+ allProperties.setProperty(Constants.ANNOTATION_AUDITING_NOT, "true");
+ }
+
// override some defaults
if (allProperties.get(PersistenceOptions.SET_DEFAULT_CASCADE_ON_NON_CONTAINMENT) == null) {
allProperties.setProperty(PersistenceOptions.SET_DEFAULT_CASCADE_ON_NON_CONTAINMENT, "true");
@@ -114,6 +119,7 @@ public class AbstractActionTest extends AbstractTest {
if (this.properties != null) {
allProperties.putAll(this.properties);
}
+
return allProperties;
}
diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/AbstractTestAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/AbstractTestAction.java
index 777fc95e7..4a8b83e7c 100755
--- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/AbstractTestAction.java
+++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/AbstractTestAction.java
@@ -120,4 +120,8 @@ public abstract class AbstractTestAction extends TestCase {
protected boolean isEAVTest() {
return this.getClass().getName().contains("EAV");
}
+
+ protected boolean supportAuditing() {
+ return true;
+ }
} \ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/EmbeddedIdAction.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/EmbeddedIdAction.java
index 650b9f614..9bb3f95eb 100755
--- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/EmbeddedIdAction.java
+++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/emf/annotations/EmbeddedIdAction.java
@@ -26,7 +26,7 @@ public class EmbeddedIdAction extends AbstractTestAction {
public EmbeddedIdAction() {
super(EmbeddedidPackage.eINSTANCE);
}
-
+
@Override
public void doAction(TestStore store) {
storePerson(store);
@@ -56,4 +56,9 @@ public class EmbeddedIdAction extends AbstractTestAction {
store.commitTransaction();
}
+ @Override
+ public boolean supportAuditing() {
+ return false;
+ }
+
}

Back to the top