From 97de6a81b8589867f844993435cc4a0338f09905 Mon Sep 17 00:00:00 2001
From: Martin Taal
Date: Thu, 1 Nov 2012 18:30:01 +0100
Subject: Latest auditing changes

---
 .../src/org/eclipse/emf/teneo/test/AbstractActionTest.java         | 6 ++++++
 .../src/org/eclipse/emf/teneo/test/AbstractTestAction.java         | 4 ++++
 .../eclipse/emf/teneo/test/emf/annotations/EmbeddedIdAction.java   | 7 ++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'tests/org.eclipse.emf.teneo.commontest')

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;
+	}
+	
 }
-- 
cgit v1.2.3