X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.runtime%2Fsrc%2Forg%2Fargeo%2Fslc%2Fruntime%2Ftest%2FContextUtils.java;h=96ce5e1bfb8fbfcc7d247470fa1bc3bef78f8ce7;hb=8b6ef8eb76eb746509b2f48f1d927f532d0c986a;hp=f3ce14a3de3cf53abe2f428ac9605200807c3019;hpb=fbde11e8a342318876a4744c4676d3618bdf8583;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/ContextUtils.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/ContextUtils.java
index f3ce14a3d..96ce5e1bf 100644
--- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/ContextUtils.java
+++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/ContextUtils.java
@@ -3,7 +3,6 @@ package org.argeo.slc.runtime.test;
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.argeo.api.cms.CmsLog;
 import org.argeo.slc.test.TestResult;
 import org.argeo.slc.test.TestStatus;
 import org.argeo.slc.test.context.ContextAware;
@@ -11,19 +10,15 @@ import org.argeo.slc.test.context.ParentContextAware;
 
 /** Utilities for comparing and synchronising contexts. */
 public class ContextUtils {
-	private final static CmsLog log = CmsLog.getLog(ContextUtils.class);
-
-	public static void compareReachedExpected(ContextAware contextAware,
-			TestResult testResult) {
+	public static void compareReachedExpected(ContextAware contextAware, TestResult testResult) {
 		for (String key : contextAware.getExpectedValues().keySet()) {
 
 			// Compare expected values with reached ones
 			Object expectedValue = contextAware.getExpectedValues().get(key);
 
-			if (expectedValue.toString().equals(
-					contextAware.getContextSkipFlag())) {
-				if (log.isDebugEnabled())
-					log.debug("Skipped check for key '" + key + "'");
+			if (expectedValue.toString().equals(contextAware.getContextSkipFlag())) {
+//				if (log.isDebugEnabled())
+//					log.debug("Skipped check for key '" + key + "'");
 				continue;
 			}
 
@@ -31,42 +26,35 @@ public class ContextUtils {
 				Object reachedValue = contextAware.getValues().get(key);
 
 				if (expectedValue.equals(contextAware.getContextAnyFlag())) {
-					testResult.addResultPart(new SimpleResultPart(
-							TestStatus.PASSED, "Expected any value for key '"
-									+ key + "'"));
+					testResult.addResultPart(
+							new SimpleResultPart(TestStatus.PASSED, "Expected any value for key '" + key + "'"));
 				} else if (expectedValue.equals(reachedValue)) {
-					testResult.addResultPart(new SimpleResultPart(
-							TestStatus.PASSED, "Values matched for key '" + key
-									+ "'"));
+					testResult.addResultPart(
+							new SimpleResultPart(TestStatus.PASSED, "Values matched for key '" + key + "'"));
 				} else {
-					testResult.addResultPart(new SimpleResultPart(
-							TestStatus.FAILED, "Mismatch for key '" + key
-									+ "': expected '" + expectedValue
-									+ "' but reached '" + reachedValue + "'"));
+					testResult.addResultPart(new SimpleResultPart(TestStatus.FAILED, "Mismatch for key '" + key
+							+ "': expected '" + expectedValue + "' but reached '" + reachedValue + "'"));
 				}
 			} else {
-				testResult.addResultPart(new SimpleResultPart(
-						TestStatus.FAILED, "No value reached for key '" + key
-								+ "'"));
+				testResult.addResultPart(
+						new SimpleResultPart(TestStatus.FAILED, "No value reached for key '" + key + "'"));
 			}
 		}
 	}
 
 	/**
-	 * Makes sure that all children and sub-children of parent share the same
-	 * maps for values and expected values.
+	 * Makes sure that all children and sub-children of parent share the same maps
+	 * for values and expected values.
 	 */
 	public static void synchronize(ParentContextAware parent) {
-		Map<String, Object> expectedValuesCommon = new TreeMap<String, Object>(
-				parent.getExpectedValues());
+		Map<String, Object> expectedValuesCommon = new TreeMap<String, Object>(parent.getExpectedValues());
 		synchronize(parent, expectedValuesCommon);
-		if (log.isDebugEnabled())
-			log.debug("Synchronized context " + parent);
+//		if (log.isDebugEnabled())
+//			log.debug("Synchronized context " + parent);
 
 	}
 
-	private static void synchronize(ParentContextAware parent,
-			Map<String, Object> expectedValuesCommon) {
+	private static void synchronize(ParentContextAware parent, Map<String, Object> expectedValuesCommon) {
 		for (ContextAware child : parent.getChildContexts()) {
 			// Values
 			putNotContained(parent.getValues(), child.getValues());
@@ -79,26 +67,22 @@ public class ContextUtils {
 
 			// Creates a new Map in order not to disturb other context using the
 			// same keys
-			Map<String, Object> expectedValuesCommonChild = new TreeMap<String, Object>(
-					expectedValuesCommon);
-			putNotContained(expectedValuesCommonChild,
-					child.getExpectedValues());
+			Map<String, Object> expectedValuesCommonChild = new TreeMap<String, Object>(expectedValuesCommon);
+			putNotContained(expectedValuesCommonChild, child.getExpectedValues());
 
 			if (child instanceof ParentContextAware) {
 				// Recursive sync
-				synchronize((ParentContextAware) child,
-						expectedValuesCommonChild);
+				synchronize((ParentContextAware) child, expectedValuesCommonChild);
 			}
 		}
 
 	}
 
 	/**
-	 * Put into common map the values from child map which are not already
-	 * defined in common map.
+	 * Put into common map the values from child map which are not already defined
+	 * in common map.
 	 */
-	public static void putNotContained(Map<String, Object> commonMap,
-			Map<String, Object> childMap) {
+	public static void putNotContained(Map<String, Object> commonMap, Map<String, Object> childMap) {
 		for (String key : childMap.keySet()) {
 			if (!commonMap.containsKey(key)) {
 				commonMap.put(key, childMap.get(key));
@@ -107,8 +91,7 @@ public class ContextUtils {
 	}
 
 	/** Overrides child map values with the values already set in common map */
-	public static void overrideContained(Map<String, Object> commonMap,
-			Map<String, Object> childMap) {
+	public static void overrideContained(Map<String, Object> commonMap, Map<String, Object> childMap) {
 		for (String key : childMap.keySet()) {
 			if (commonMap.containsKey(key)) {
 				childMap.put(key, commonMap.get(key));