Converted to 6.7.1. Dependency with ObjectHanling module instead of community commons

RoelandSalij · RoelandSalij · commit 648f6ffcd4b5 · 2017-02-22T16:48:22.000+01:00
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ UnitTesting
 Module to run Mendix and JUnit unit tests inside a project.
 
 ## Dependencies
-- 'CoCo:ObjectHandling' module
+- 'ObjectHandling' module
 - junit-4.11.jar
 - org.apache.commons.io-2.3.0.jar
 - org.apache.commons.lang3.jar
@@ -14,7 +14,7 @@ Module to run Mendix and JUnit unit tests inside a project.
 ## Installation
 
 - Import the module in your project (from the Mendix AppStore or by downloading and exporting the module from this project)
-- Download the latest 'CoCo:ObjectHandling' module in your project
+- Download the latest 'ObjectHandling' module in your project
 - Map the module role 'TestRunner' to the applicable user roles in your application
 - Add the 'UnitTestOverview' microflow to your navigation structure or include the 'UnitTestOverview' snippet to a custom page.
 - [Optional for including JUnit tests] Set the `UnitTesting.FindJUnitTests` constant to true. (Please take [Project settings regarding Cloud Security](https://docs.mendix.com/mendixcloud/java-in-the-cloud#emulate-cloud-security) and  [Security Constraits in the Mendix Cloud](https://docs.mendix.com/mendixcloud/security-constraints-in-the-mendix-cloud) into consideration)
diff --git a/src/UnitTesting.mpr b/src/UnitTesting.mpr
diff --git a/src/javasource/objecthandling/ImmutablePair.java b/src/javasource/objecthandling/ImmutablePair.java
@@ -1,4 +1,4 @@
-package coco_objecthandling;
+package objecthandling;
 
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
diff --git a/src/javasource/objecthandling/ORM.java b/src/javasource/objecthandling/ORM.java
@@ -1,4 +1,4 @@
-package coco_objecthandling;
+package objecthandling;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
diff --git a/src/javasource/objecthandling/XPath.java b/src/javasource/objecthandling/XPath.java
@@ -1,4 +1,4 @@
-package coco_objecthandling;
+package objecthandling;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -20,6 +20,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import objecthandling.ImmutablePair;
 
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -30,8 +31,6 @@
 import com.mendix.systemwideinterfaces.core.IMendixIdentifier;
 import com.mendix.systemwideinterfaces.core.IMendixObject;
 
-import coco_objecthandling.ImmutablePair;
-
 public class XPath<T>
 {
 	/** Build in tokens, see: https://world.mendix.com/display/refguide3/XPath+Keywords+and+System+Variables
diff --git a/src/javasource/objecthandling/actions/EndTransaction.java b/src/javasource/objecthandling/actions/EndTransaction.java
@@ -7,7 +7,7 @@
 // Other code you write will be lost the next time you deploy the project.
 // Special characters, e.g., é, ö, à, etc. are supported in comments.
 
-package coco_objecthandling.actions;
+package objecthandling.actions;
 
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.webui.CustomJavaAction;
diff --git a/src/javasource/objecthandling/actions/StartTransaction.java b/src/javasource/objecthandling/actions/StartTransaction.java
@@ -7,7 +7,7 @@
 // Other code you write will be lost the next time you deploy the project.
 // Special characters, e.g., é, ö, à, etc. are supported in comments.
 
-package coco_objecthandling.actions;
+package objecthandling.actions;
 
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.webui.CustomJavaAction;
diff --git a/src/javasource/objecthandling/actions/clone.java b/src/javasource/objecthandling/actions/clone.java
@@ -7,12 +7,12 @@
 // Other code you write will be lost the next time you deploy the project.
 // Special characters, e.g., é, ö, à, etc. are supported in comments.
 
-package coco_objecthandling.actions;
+package objecthandling.actions;
 
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.systemwideinterfaces.core.IMendixObject;
 import com.mendix.webui.CustomJavaAction;
-import coco_objecthandling.ORM;
+import objecthandling.ORM;
 
 /**
  * Clones objects
diff --git a/src/javasource/objecthandling/actions/commitInSeparateDatabaseTransaction.java b/src/javasource/objecthandling/actions/commitInSeparateDatabaseTransaction.java
@@ -7,7 +7,7 @@
 // Other code you write will be lost the next time you deploy the project.
 // Special characters, e.g., é, ö, à, etc. are supported in comments.
 
-package coco_objecthandling.actions;
+package objecthandling.actions;
 
 import com.mendix.core.Core;
 import com.mendix.systemwideinterfaces.core.IContext;
diff --git a/src/javasource/objecthandling/actions/copyAttributes.java b/src/javasource/objecthandling/actions/copyAttributes.java
@@ -7,12 +7,12 @@
 // Other code you write will be lost the next time you deploy the project.
 // Special characters, e.g., é, ö, à, etc. are supported in comments.
 
-package coco_objecthandling.actions;
+package objecthandling.actions;
 
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.systemwideinterfaces.core.IMendixObject;
 import com.mendix.webui.CustomJavaAction;
-import coco_objecthandling.ORM;
+import objecthandling.ORM;
 
 /**
  * Copies all common primitive attributes from source to target, which are not necessarily of the same type. This is useful to, for example, translate persistent object into non-persistant (view) objects.
diff --git a/src/javasource/objecthandling/actions/createObjectListFromObject.java b/src/javasource/objecthandling/actions/createObjectListFromObject.java
@@ -7,7 +7,7 @@
 // Other code you write will be lost the next time you deploy the project.
 // Special characters, e.g., é, ö, à, etc. are supported in comments.
 
-package coco_objecthandling.actions;
+package objecthandling.actions;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/javasource/objecthandling/actions/deepClone.java b/src/javasource/objecthandling/actions/deepClone.java
@@ -7,12 +7,12 @@
 // Other code you write will be lost the next time you deploy the project.
 // Special characters, e.g., é, ö, à, etc. are supported in comments.
 
-package coco_objecthandling.actions;
+package objecthandling.actions;
 
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.systemwideinterfaces.core.IMendixObject;
 import com.mendix.webui.CustomJavaAction;
-import coco_objecthandling.ORM;
+import objecthandling.ORM;
 
 /**
  * Clones objects, their associations and even referred objects. 
diff --git a/src/javasource/objecthandling/actions/deleteAll.java b/src/javasource/objecthandling/actions/deleteAll.java
@@ -7,12 +7,12 @@
 // Other code you write will be lost the next time you deploy the project.
 // Special characters, e.g., é, ö, à, etc. are supported in comments.
 
-package coco_objecthandling.actions;
+package objecthandling.actions;
 
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.systemwideinterfaces.core.IMendixObject;
 import com.mendix.webui.CustomJavaAction;
-import coco_objecthandling.XPath;
+import objecthandling.XPath;
 
 /**
  * Removes ALL instances of a certain domain object type using batches.
diff --git a/src/javasource/objecthandling/actions/deleteInSeparateTransaction.java b/src/javasource/objecthandling/actions/deleteInSeparateTransaction.java
@@ -7,7 +7,7 @@
 // Other code you write will be lost the next time you deploy the project.
 // Special characters, e.g., é, ö, à, etc. are supported in comments.
 
-package coco_objecthandling.actions;
+package objecthandling.actions;
 
 import com.mendix.core.Core;
 import com.mendix.systemwideinterfaces.core.IContext;
diff --git a/src/javasource/objecthandling/actions/deleteWithoutEvents.java b/src/javasource/objecthandling/actions/deleteWithoutEvents.java
@@ -7,7 +7,7 @@
 // Other code you write will be lost the next time you deploy the project.
 // Special characters, e.g., é, ö, à, etc. are supported in comments.
 
-package coco_objecthandling.actions;
+package objecthandling.actions;
 
 import com.mendix.core.Core;
 import com.mendix.systemwideinterfaces.core.IContext;
diff --git a/src/javasource/objecthandling/actions/getCreatedByUser.java b/src/javasource/objecthandling/actions/getCreatedByUser.java
@@ -7,12 +7,12 @@
 // Other code you write will be lost the next time you deploy the project.
 // Special characters, e.g., é, ö, à, etc. are supported in comments.
 
-package coco_objecthandling.actions;
+package objecthandling.actions;
 
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.systemwideinterfaces.core.IMendixObject;
 import com.mendix.webui.CustomJavaAction;
-import coco_objecthandling.ORM;
+import objecthandling.ORM;
 
 /**
  * Returns the user that created the object 
diff --git a/src/javasource/objecthandling/actions/getGUID.java b/src/javasource/objecthandling/actions/getGUID.java
@@ -7,12 +7,12 @@
 // Other code you write will be lost the next time you deploy the project.
 // Special characters, e.g., é, ö, à, etc. are supported in comments.
 
-package coco_objecthandling.actions;
+package objecthandling.actions;
 
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.systemwideinterfaces.core.IMendixObject;
 import com.mendix.webui.CustomJavaAction;
-import coco_objecthandling.ORM;
+import objecthandling.ORM;
 
 /**
  * returns the Global Unique Identifier (GUID, or id) of an object.
diff --git a/src/javasource/objecthandling/actions/getLastChangedByUser.java b/src/javasource/objecthandling/actions/getLastChangedByUser.java
@@ -7,12 +7,12 @@
 // Other code you write will be lost the next time you deploy the project.
 // Special characters, e.g., é, ö, à, etc. are supported in comments.
 
-package coco_objecthandling.actions;
+package objecthandling.actions;
 
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.systemwideinterfaces.core.IMendixObject;
 import com.mendix.webui.CustomJavaAction;
-import coco_objecthandling.ORM;
+import objecthandling.ORM;
 
 /**
  * Returns the user that last changed this object as System.User 
diff --git a/src/javasource/objecthandling/actions/getOriginalValueAsString.java b/src/javasource/objecthandling/actions/getOriginalValueAsString.java
@@ -7,12 +7,12 @@
 // Other code you write will be lost the next time you deploy the project.
 // Special characters, e.g., é, ö, à, etc. are supported in comments.
 
-package coco_objecthandling.actions;
+package objecthandling.actions;
 
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.systemwideinterfaces.core.IMendixObject;
 import com.mendix.webui.CustomJavaAction;
-import coco_objecthandling.ORM;
+import objecthandling.ORM;
 
 /**
  * Returns the original value of an object member, that is, the last committed value.
diff --git a/src/javasource/objecthandling/actions/getTypeAsString.java b/src/javasource/objecthandling/actions/getTypeAsString.java
@@ -7,7 +7,7 @@
 // Other code you write will be lost the next time you deploy the project.
 // Special characters, e.g., é, ö, à, etc. are supported in comments.
 
-package coco_objecthandling.actions;
+package objecthandling.actions;
 
 import com.mendix.systemwideinterfaces.core.IMendixObject;
 import com.mendix.systemwideinterfaces.core.IContext;
diff --git a/src/javasource/objecthandling/actions/memberHasChanged.java b/src/javasource/objecthandling/actions/memberHasChanged.java
@@ -7,12 +7,12 @@
 // Other code you write will be lost the next time you deploy the project.
 // Special characters, e.g., é, ö, à, etc. are supported in comments.
 
-package coco_objecthandling.actions;
+package objecthandling.actions;
 
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.systemwideinterfaces.core.IMendixObject;
 import com.mendix.webui.CustomJavaAction;
-import coco_objecthandling.ORM;
+import objecthandling.ORM;
 
 /**
  * Checks whether a member has changed since the last commit. Useful in combination with getOriginalValueAsString.
diff --git a/src/javasource/objecthandling/actions/objectHasChanged.java b/src/javasource/objecthandling/actions/objectHasChanged.java
@@ -7,12 +7,12 @@
 // Other code you write will be lost the next time you deploy the project.
 // Special characters, e.g., é, ö, à, etc. are supported in comments.
 
-package coco_objecthandling.actions;
+package objecthandling.actions;
 
-import com.mendix.systemwideinterfaces.core.IMendixObject;
-import coco_objecthandling.ORM;
 import com.mendix.systemwideinterfaces.core.IContext;
+import com.mendix.systemwideinterfaces.core.IMendixObject;
 import com.mendix.webui.CustomJavaAction;
+import objecthandling.ORM;
 
 /**
  * Returns true if at least one member (including owned associations) of this object has changed.
diff --git a/src/javasource/objecthandling/actions/refreshClassByObject.java b/src/javasource/objecthandling/actions/refreshClassByObject.java
@@ -7,7 +7,7 @@
 // Other code you write will be lost the next time you deploy the project.
 // Special characters, e.g., é, ö, à, etc. are supported in comments.
 
-package coco_objecthandling.actions;
+package objecthandling.actions;
 
 import com.mendix.systemwideinterfaces.core.IContext;
 import com.mendix.systemwideinterfaces.core.IMendixObject;
diff --git a/src/javasource/system/UserActionsRegistrar.java b/src/javasource/system/UserActionsRegistrar.java
@@ -38,24 +38,24 @@ public void handleEvent(Event event)
 		{
 			component = mxRuntime.getMainComponent();
 			Core.initialize(component, integration);   
-			component.actionRegistry().registerUserAction(coco_objecthandling.actions.clone.class);
-			component.actionRegistry().registerUserAction(coco_objecthandling.actions.commitInSeparateDatabaseTransaction.class);
-			component.actionRegistry().registerUserAction(coco_objecthandling.actions.copyAttributes.class);
-			component.actionRegistry().registerUserAction(coco_objecthandling.actions.createObjectListFromObject.class);
-			component.actionRegistry().registerUserAction(coco_objecthandling.actions.deepClone.class);
-			component.actionRegistry().registerUserAction(coco_objecthandling.actions.deleteAll.class);
-			component.actionRegistry().registerUserAction(coco_objecthandling.actions.deleteInSeparateTransaction.class);
-			component.actionRegistry().registerUserAction(coco_objecthandling.actions.deleteWithoutEvents.class);
-			component.actionRegistry().registerUserAction(coco_objecthandling.actions.EndTransaction.class);
-			component.actionRegistry().registerUserAction(coco_objecthandling.actions.getCreatedByUser.class);
-			component.actionRegistry().registerUserAction(coco_objecthandling.actions.getGUID.class);
-			component.actionRegistry().registerUserAction(coco_objecthandling.actions.getLastChangedByUser.class);
-			component.actionRegistry().registerUserAction(coco_objecthandling.actions.getOriginalValueAsString.class);
-			component.actionRegistry().registerUserAction(coco_objecthandling.actions.getTypeAsString.class);
-			component.actionRegistry().registerUserAction(coco_objecthandling.actions.memberHasChanged.class);
-			component.actionRegistry().registerUserAction(coco_objecthandling.actions.objectHasChanged.class);
-			component.actionRegistry().registerUserAction(coco_objecthandling.actions.refreshClassByObject.class);
-			component.actionRegistry().registerUserAction(coco_objecthandling.actions.StartTransaction.class);
+			component.actionRegistry().registerUserAction(objecthandling.actions.clone.class);
+			component.actionRegistry().registerUserAction(objecthandling.actions.commitInSeparateDatabaseTransaction.class);
+			component.actionRegistry().registerUserAction(objecthandling.actions.copyAttributes.class);
+			component.actionRegistry().registerUserAction(objecthandling.actions.createObjectListFromObject.class);
+			component.actionRegistry().registerUserAction(objecthandling.actions.deepClone.class);
+			component.actionRegistry().registerUserAction(objecthandling.actions.deleteAll.class);
+			component.actionRegistry().registerUserAction(objecthandling.actions.deleteInSeparateTransaction.class);
+			component.actionRegistry().registerUserAction(objecthandling.actions.deleteWithoutEvents.class);
+			component.actionRegistry().registerUserAction(objecthandling.actions.EndTransaction.class);
+			component.actionRegistry().registerUserAction(objecthandling.actions.getCreatedByUser.class);
+			component.actionRegistry().registerUserAction(objecthandling.actions.getGUID.class);
+			component.actionRegistry().registerUserAction(objecthandling.actions.getLastChangedByUser.class);
+			component.actionRegistry().registerUserAction(objecthandling.actions.getOriginalValueAsString.class);
+			component.actionRegistry().registerUserAction(objecthandling.actions.getTypeAsString.class);
+			component.actionRegistry().registerUserAction(objecthandling.actions.memberHasChanged.class);
+			component.actionRegistry().registerUserAction(objecthandling.actions.objectHasChanged.class);
+			component.actionRegistry().registerUserAction(objecthandling.actions.refreshClassByObject.class);
+			component.actionRegistry().registerUserAction(objecthandling.actions.StartTransaction.class);
 			component.actionRegistry().registerUserAction(system.actions.VerifyPassword.class);
 			component.actionRegistry().registerUserAction(unittesting.actions.FindAllUnitTests.class);
 			component.actionRegistry().registerUserAction(unittesting.actions.ReportStepJava.class);
diff --git a/src/javasource/unittesting/RemoteApiServlet.java b/src/javasource/unittesting/RemoteApiServlet.java
@@ -18,7 +18,7 @@
 import com.mendix.m2ee.api.IMxRuntimeResponse;
 import com.mendix.systemwideinterfaces.core.IContext;
 
-import coco_objecthandling.XPath;
+import objecthandling.XPath;
 import unittesting.proxies.TestSuite;
 import unittesting.proxies.UnitTest;
 import unittesting.proxies.UnitTestResult;
diff --git a/src/javasource/unittesting/TestManager.java b/src/javasource/unittesting/TestManager.java
@@ -31,7 +31,7 @@
 import com.mendix.systemwideinterfaces.core.IDataType;
 import com.mendix.systemwideinterfaces.core.IMendixObject;
 
-import coco_objecthandling.XPath;
+import objecthandling.XPath;
 import unittesting.proxies.TestSuite;
 import unittesting.proxies.UnitTest;
 import unittesting.proxies.UnitTestResult;
@@ -57,8 +57,6 @@ public AssertionException(String message)
 		}
 	}
 
-
-	private static final String	TEST_MICROFLOW_PREFIX_1	= "Test_";
 	private static final String	TEST_MICROFLOW_PREFIX_2	= "UT_";
 
 	static final String	CLOUD_SECURITY_ERROR = "Unable to find JUnit test classes or methods. \n\n";
@@ -254,8 +252,16 @@ public List<String> findMicroflowUnitTests(TestSuite testRun)
 	{
 		List<String> mfnames = new ArrayList<String>();
 
-		String basename1 = (testRun.getModule() + "." + TEST_MICROFLOW_PREFIX_1).toLowerCase();
-		String basename2 = (testRun.getModule() + "." + TEST_MICROFLOW_PREFIX_2).toLowerCase();
+		if(testRun.getPrefix1() == null) {
+			testRun.setPrefix1("Test_");
+		}
+		if(testRun.getPrefix2() == null) {
+			testRun.setPrefix2("UT_");
+		}
+			
+		
+		String basename1 = (testRun.getModule() + "." + testRun.getPrefix1()).toLowerCase();
+		String basename2 = (testRun.getModule() + "." + testRun.getPrefix2()).toLowerCase();
 		
 		//Find microflownames
 		for (String mf : Core.getMicroflowNames()) 
diff --git a/src/userlib/org.apache.commons.lang3.jar.ObjectHandling.RequiredLib b/src/userlib/org.apache.commons.lang3.jar.ObjectHandling.RequiredLib

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package coco_objecthandling;`
	`1`	`+package objecthandling;`
`2`	`2`
`3`	`3`	`import org.apache.commons.lang3.builder.HashCodeBuilder;`
`4`	`4`