Remove deprecated APIs

[gpl/argeo-slc.git] / runtime / org.argeo.slc.core / src / main / java / org / argeo / slc / core / test / context / ContextUtils.java

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/ContextUtils.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/ContextUtils.java
index 0d4ab6034dab145f4fb739af67d1df33bbfb8fbb..ce1b000f3ee5022d9e88336f34b261cda32f8523 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/ContextUtils.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/ContextUtils.java
@@ -20,13 +20,7 @@ import java.util.TreeMap;
 \r
 import org.apache.commons.logging.Log;\r
 import org.apache.commons.logging.LogFactory;\r
-\r
-import org.argeo.slc.core.structure.tree.TreeSPath;\r
-import org.argeo.slc.core.structure.tree.TreeSRelated;\r
 import org.argeo.slc.core.test.SimpleResultPart;\r
-import org.argeo.slc.structure.StructureAware;\r
-import org.argeo.slc.structure.StructureElement;\r
-import org.argeo.slc.structure.StructureRegistry;\r
 import org.argeo.slc.test.TestResult;\r
 import org.argeo.slc.test.TestStatus;\r
 import org.argeo.slc.test.context.ContextAware;\r
@@ -36,7 +30,7 @@ public class ContextUtils {
        private final static Log log = LogFactory.getLog(ContextUtils.class);\r
 \r
        public static void compareReachedExpected(ContextAware contextAware,\r
-                       TestResult testResult, TreeSRelated treeSRelated) {\r
+                       TestResult testResult) {\r
                for (String key : contextAware.getExpectedValues().keySet()) {\r
 \r
                        // Compare expected values with reached ones\r
@@ -49,9 +43,6 @@ public class ContextUtils {
                                continue;\r
                        }\r
 \r
-                       // Register in structure\r
-                       registerInStructure(testResult, treeSRelated, key);\r
-\r
                        if (contextAware.getValues().containsKey(key)) {\r
                                Object reachedValue = contextAware.getValues().get(key);\r
 \r
@@ -74,42 +65,6 @@ public class ContextUtils {
                                                TestStatus.FAILED, "No value reached for key '" + key\r
                                                                + "'"));\r
                        }\r
-                       resetStructure(testResult, treeSRelated);\r
-               }\r
-       }\r
-\r
-       @SuppressWarnings("unchecked")\r
-       private static void registerInStructure(TestResult testResult,\r
-                       TreeSRelated treeSRelated, String key) {\r
-               if (treeSRelated != null) {\r
-                       if (treeSRelated.getBasePath() != null) {\r
-                               TreeSPath path = treeSRelated.getBasePath().createChild(key);\r
-                               StructureRegistry<TreeSPath> registry = treeSRelated\r
-                                               .getRegistry();\r
-                               final StructureElement element = treeSRelated\r
-                                               .getStructureElement(key);\r
-                               registry.register(path, element);\r
-                               if (testResult instanceof StructureAware)\r
-                                       ((StructureAware<TreeSPath>) testResult).notifyCurrentPath(\r
-                                                       registry, path);\r
-\r
-                               if (log.isDebugEnabled())\r
-                                       log.debug("Checking key " + key + " for path " + path);\r
-                       }\r
-               }\r
-       }\r
-\r
-       @SuppressWarnings("unchecked")\r
-       private static void resetStructure(TestResult testResult,\r
-                       TreeSRelated treeSRelated) {\r
-               if (treeSRelated != null) {\r
-                       if (treeSRelated.getBasePath() != null) {\r
-                               if (testResult instanceof StructureAware) {\r
-                                       ((StructureAware<TreeSPath>) testResult).notifyCurrentPath(\r
-                                                       treeSRelated.getRegistry(), treeSRelated\r
-                                                                       .getBasePath());\r
-                               }\r
-                       }\r
                }\r
        }\r
 \r