Replace test result id by UUID

git-svn-id: https://svn.argeo.org/slc/trunk@1082 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/NumericTRId.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/NumericTRId.java
index cd04ad7cbf7a3e7e96b40285cbb1ef155c2c848b..0b1674ae9fe1b7bece80d0ac3b6b89a88cf3b160 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/NumericTRId.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/NumericTRId.java
@@ -5,6 +5,8 @@ import org.argeo.slc.core.deploy.DeployedSystemId;
 /**\r
  * Basic implementation of test run id based on a long value and a reference to\r
  * a deployed system id.\r
+ * \r
+ * @deprecated\r
  */\r
 public class NumericTRId implements TestResultId {\r
        /** For ORM */\r
@@ -12,13 +14,13 @@ public class NumericTRId implements TestResultId {
 \r
        private Long value;\r
        private DeployedSystemId deployedSystemId;\r
-       \r
-       /** For ORM*/\r
-       public NumericTRId(){\r
-               \r
+\r
+       /** For ORM */\r
+       public NumericTRId() {\r
+\r
        }\r
 \r
-       public NumericTRId(Long value){\r
+       public NumericTRId(Long value) {\r
                this.value = value;\r
        }\r
 \r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestResult.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestResult.java
index d865d62b2c9a9aeaf1a73094ad88a3a9497e9888..f4dde542abb587c01ae7508ac151abd5546e5315 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestResult.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestResult.java
@@ -4,9 +4,6 @@ import java.util.Date;
 \r
 /** The result of a test */\r
 public interface TestResult extends TestStatus {\r
-       /** Gets the id of the related test result. */\r
-       public TestResultId getTestResultId();\r
-\r
        /** Adds a part of the result. */\r
        public void addResultPart(TestResultPart part);\r
 \r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestResultId.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestResultId.java
index 9440287a4144e7dd420be027e7f264134498a53f..46af5279951ba5a29e9adf8957f939def959f5ae 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestResultId.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestResultId.java
@@ -2,7 +2,11 @@ package org.argeo.slc.core.test;
 \r
 import org.argeo.slc.core.deploy.DeployedSystemId;\r
 \r
-/** The unique id referencing a test result. */\r
+/**\r
+ * The unique id referencing a test result.\r
+ * \r
+ * @deprecated\r
+ */\r
 public interface TestResultId {\r
        /** Gets the id of the related deployed system. */\r
        public DeployedSystemId getDeployedSystemId();\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/AsynchronousTreeTestResultListener.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/AsynchronousTreeTestResultListener.java
index 7713e46168b89e5def6037dcb963d0a5cd104d68..59a58987436cff0a73c0121008ad76db36f69f0c 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/AsynchronousTreeTestResultListener.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/AsynchronousTreeTestResultListener.java
@@ -20,12 +20,12 @@ public abstract class AsynchronousTreeTestResultListener implements
        private Thread thread;\r
 \r
        private Boolean synchronous = true;\r
-       \r
-       protected AsynchronousTreeTestResultListener(){\r
+\r
+       protected AsynchronousTreeTestResultListener() {\r
                this(true);\r
        }\r
 \r
-       protected AsynchronousTreeTestResultListener(Boolean synchronousByDefault){\r
+       protected AsynchronousTreeTestResultListener(Boolean synchronousByDefault) {\r
                synchronous = synchronousByDefault;\r
        }\r
 \r
@@ -59,8 +59,8 @@ public abstract class AsynchronousTreeTestResultListener implements
        public final void resultPartAdded(TestResult testResult,\r
                        TestResultPart testResultPart) {\r
                TreeTestResult result = (TreeTestResult) testResult;\r
-               PartStruct partStruct = new PartStruct(result.getCurrentPath(),\r
-                               (NumericTRId) result.getTestResultId(), testResultPart, result);\r
+               PartStruct partStruct = new PartStruct(result.getCurrentPath(), result\r
+                               .getUuid(), testResultPart, result);\r
 \r
                if (!synchronous) {\r
                        synchronized (partStructs) {\r
@@ -108,18 +108,18 @@ public abstract class AsynchronousTreeTestResultListener implements
                /** The tree path of this part. */\r
                public final TreeSPath path;\r
                /** The test result id of the related test result */\r
-               public final NumericTRId resultId;\r
+               public final String uuid;\r
                /** The part itself */\r
                public final TestResultPart part;\r
                /** The tree test result itself. */\r
                public final TreeTestResult result;\r
 \r
                /** Constructor */\r
-               public PartStruct(TreeSPath path, NumericTRId resultId,\r
-                               TestResultPart part, TreeTestResult result) {\r
+               public PartStruct(TreeSPath path, String uuid, TestResultPart part,\r
+                               TreeTestResult result) {\r
                        super();\r
                        this.path = path;\r
-                       this.resultId = resultId;\r
+                       this.uuid = uuid;\r
                        this.part = part;\r
                        this.result = result;\r
                }\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java
index 43a3607108ef7ba18318a888d89109293ae5cf35..6d39d210e9c27f17e00c22cd7f8ce76d5532be2d 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResult.java
@@ -33,7 +33,7 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
        /** For ORM */\r
        private Long tid;\r
 \r
-       private NumericTRId testResultId;\r
+       //private NumericTRId testResultId;\r
        private List<TestResultListener> listeners = new Vector<TestResultListener>();\r
 \r
        private TreeSPath currentPath;\r
@@ -44,27 +44,29 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
 \r
        private boolean isClosed = false;\r
 \r
+       private String uuid;\r
+\r
        private SortedMap<TreeSPath, PartSubList> resultParts = new TreeMap<TreeSPath, PartSubList>();\r
        private SortedMap<TreeSPath, StructureElement> elements = new TreeMap<TreeSPath, StructureElement>();\r
 \r
        private StructureRegistry<TreeSPath> registry;\r
 \r
-       public TestResultId getTestResultId() {\r
-               return testResultId;\r
-       }\r
+//     public TestResultId getTestResultId() {\r
+//             return testResultId;\r
+//     }\r
 \r
        /**\r
         * Use of a <code>NumericTRId</code> is required by Hibernate. <b>It may\r
         * change in the future.</b>\r
         */\r
-       public NumericTRId getNumericResultId() {\r
-               return testResultId;\r
-       }\r
+//     public NumericTRId getNumericResultId() {\r
+//             return testResultId;\r
+//     }\r
 \r
        /** Sets the test result id as a numeric test result id. */\r
-       public void setNumericResultId(NumericTRId testResultId) {\r
-               this.testResultId = testResultId;\r
-       }\r
+//     public void setNumericResultId(NumericTRId testResultId) {\r
+//             this.testResultId = testResultId;\r
+//     }\r
 \r
        /** Sets the list of listeners. */\r
        public void setListeners(List<TestResultListener> listeners) {\r
@@ -130,7 +132,7 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
 \r
        public void close() {\r
                if (isClosed) {\r
-                       throw new SlcException("Test Result #" + getTestResultId()\r
+                       throw new SlcException("Test Result #" + getUuid()\r
                                        + " alredy closed.");\r
                }\r
                closeDate = new Date();\r
@@ -143,7 +145,7 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
                }\r
                isClosed = true;\r
 \r
-               log.info("Test Result #" + getTestResultId() + " closed.");\r
+               log.info("Test Result #" + getUuid() + " closed.");\r
        }\r
 \r
        Long getTid() {\r
@@ -188,4 +190,12 @@ public class TreeTestResult implements TestResult, StructureAware<TreeSPath>,
                this.elements = pathNames;\r
        }\r
 \r
+       public String getUuid() {\r
+               return uuid;\r
+       }\r
+\r
+       public void setUuid(String uuid) {\r
+               this.uuid = uuid;\r
+       }\r
+\r
 }\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultLogger.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultLogger.java
index c09c18ac323923f7c7b1822845c8dc0c88cdb31d..832d8655457ec55929bc4b469d2dc947cff3686a 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultLogger.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultLogger.java
@@ -24,7 +24,7 @@ public class TreeTestResultLogger extends AsynchronousTreeTestResultListener {
        @Override\r
        protected void resultPartAdded(PartStruct partStruct) {\r
                TestResultPart part = partStruct.part;\r
-               String msg = partStruct.part + " - " + partStruct.resultId + ":"\r
+               String msg = partStruct.part + " - " + partStruct.uuid + ":"\r
                                + partStruct.path;\r
                if (part.getStatus().equals(TestStatus.PASSED)) {\r
                        log.info(msg);\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultPersister.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultPersister.java
index 12eed249afd5c98650a6ef3e1bbb268817b83fda..d1679f5ac66616c6905032ceb933e7fc65169c77 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultPersister.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultPersister.java
@@ -29,59 +29,51 @@ public class TreeTestResultPersister extends AsynchronousTreeTestResultListener
        protected void resultPartAdded(PartStruct partStruct) {\r
                try {\r
                        TreeTestResult persistedResult = testResultDao\r
-                                       .getTestResult(partStruct.resultId);\r
-                       \r
-                       if(persistedResult==null){\r
-                               testResultDao.create(partStruct.result);\r
-                       }\r
-                       else{\r
-                               testResultDao.update(partStruct.result);\r
-                       }\r
-/*\r
-                       TreeSPath path = treeSPathDao.getOrCreate(partStruct.path);\r
-\r
-                       StructureRegistry<TreeSPath> localRegistry = partStruct.result\r
-                                       .getRegistry();\r
-                       TreeSRegistry registry = getOrCreateTreeSRegistry(path);\r
-                       treeSRegistryDao.syncPath(registry, localRegistry, path);\r
+                                       .getTestResult(partStruct.uuid);\r
 \r
                        if (persistedResult == null) {\r
-                               persistedResult = new TreeTestResult();\r
-                               persistedResult.setNumericResultId(partStruct.resultId);\r
-                               PartSubList subList = new PartSubList();\r
-                               subList.getParts().add(partStruct.part);\r
-                               persistedResult.getResultParts().put(path, subList);\r
-\r
-                               testResultDao.create(persistedResult);\r
+                               testResultDao.create(partStruct.result);\r
                        } else {\r
-                               PartSubList subList = persistedResult.getResultParts()\r
-                                               .get(path);\r
-                               if (subList == null) {\r
-                                       subList = new PartSubList();\r
-                                       persistedResult.getResultParts().put(path, subList);\r
-                               }\r
-                               persistedResult.getResultParts().get(path).getParts().add(\r
-                                               partStruct.part);\r
-\r
-                               if (log.isTraceEnabled()) {\r
-                                       log.trace("ResultId:" + persistedResult.getTestResultId());\r
-                                       log.trace("ResultParts size:"\r
-                                                       + persistedResult.getResultParts().size());\r
-                                       log.trace("Sublist size:" + subList.getParts().size());\r
-                                       log.trace("Part: " + partStruct.part);\r
-                               }\r
-                               testResultDao.update(persistedResult);\r
-                       }*/\r
+                               testResultDao.update(partStruct.result);\r
+                       }\r
+                       /*\r
+                        * TreeSPath path = treeSPathDao.getOrCreate(partStruct.path);\r
+                        * \r
+                        * StructureRegistry<TreeSPath> localRegistry = partStruct.result\r
+                        * .getRegistry(); TreeSRegistry registry =\r
+                        * getOrCreateTreeSRegistry(path);\r
+                        * treeSRegistryDao.syncPath(registry, localRegistry, path);\r
+                        * \r
+                        * if (persistedResult == null) { persistedResult = new\r
+                        * TreeTestResult();\r
+                        * persistedResult.setNumericResultId(partStruct.resultId);\r
+                        * PartSubList subList = new PartSubList();\r
+                        * subList.getParts().add(partStruct.part);\r
+                        * persistedResult.getResultParts().put(path, subList);\r
+                        * \r
+                        * testResultDao.create(persistedResult); } else { PartSubList\r
+                        * subList = persistedResult.getResultParts() .get(path); if\r
+                        * (subList == null) { subList = new PartSubList();\r
+                        * persistedResult.getResultParts().put(path, subList); }\r
+                        * persistedResult.getResultParts().get(path).getParts().add(\r
+                        * partStruct.part);\r
+                        * \r
+                        * if (log.isTraceEnabled()) { log.trace("ResultId:" +\r
+                        * persistedResult.getTestResultId()); log.trace("ResultParts size:" +\r
+                        * persistedResult.getResultParts().size()); log.trace("Sublist\r
+                        * size:" + subList.getParts().size()); log.trace("Part: " +\r
+                        * partStruct.part); } testResultDao.update(persistedResult); }\r
+                        */\r
                } catch (Exception e) {\r
-                       log.error("Could not persist part for result #"\r
-                                       + partStruct.resultId, e);\r
+                       log.error("Could not persist part for result #" + partStruct.uuid,\r
+                                       e);\r
                }\r
        }\r
 \r
        @Override\r
        protected void postClose(TreeTestResult testResult) {\r
                TreeTestResult persistedResult = (TreeTestResult) testResultDao\r
-                               .getTestResult(testResult.getTestResultId());\r
+                               .getTestResult(testResult.getUuid());\r
 \r
                if (persistedResult != null) {\r
                        persistedResult.setCloseDate(testResult.getCloseDate());\r
@@ -89,7 +81,7 @@ public class TreeTestResultPersister extends AsynchronousTreeTestResultListener
                }\r
                if (log.isDebugEnabled())\r
                        log.debug("Closed result persister for result "\r
-                                       + testResult.getNumericResultId());\r
+                                       + testResult.getUuid());\r
        }\r
 \r
        private TreeSRegistry getOrCreateTreeSRegistry(TreeSPath path) {\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/FullHtmlTreeReport.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/FullHtmlTreeReport.java
index d69dfa4f9647818de5d302320d58d930d75ae5ec..a77eb34f0b4b5d4c6e43f0722d3c22c34240939b 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/FullHtmlTreeReport.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/FullHtmlTreeReport.java
@@ -95,7 +95,7 @@ public class FullHtmlTreeReport implements TestReport, StructureAware {
         */\r
        protected File getResultFile(TreeTestResult result) {\r
                return new File(reportDir.getPath() + File.separator + "slc-result-"\r
-                               + result.getTestResultId() + ".html");\r
+                               + result.getUuid() + ".html");\r
        }\r
 \r
        /** Sets the DAO to use to extract all data. */\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultPage.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultPage.java
index e805714f9ffcc5d2cf8440e3af3432badb52d648..31560541dc9fd3e365c6de319581062c58f1bdbd 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultPage.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultPage.java
@@ -44,7 +44,7 @@ class ResultPage {
                StringBuffer buf = new StringBuffer("");\r
                buf.append("<html>\n");\r
                buf.append("<header>");\r
-               buf.append("<title>Result #").append(result.getTestResultId());\r
+               buf.append("<title>Result #").append(result.getUuid());\r
                buf.append("</title>\n");\r
                report.addStyles(buf);\r
                buf.append("</header>\n");\r
@@ -53,7 +53,7 @@ class ResultPage {
 \r
                // Header\r
                buf.append("<a name=\"top\"/>\n");\r
-               buf.append("<h1>Result #").append(result.getTestResultId()).append(\r
+               buf.append("<h1>Result #").append(result.getUuid()).append(\r
                                "</h1>\n");\r
                Date closeDate = result.getCloseDate();\r
                if (closeDate == null) {\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultsList.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultsList.java
index ad9b2bfec0fc85ec37511d52492edf63466e8857..09895d454d5277a0a92803a7b98b529512506ac5 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultsList.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultsList.java
@@ -41,7 +41,7 @@ class ResultsList {
                buf.append("<td><a class=\"nav\" href=\"");\r
                buf.append(report.getResultFile(result).getName());\r
                buf.append("\" target=\"main\">#");\r
-               buf.append(result.getTestResultId()).append("</a></td>\n");\r
+               buf.append(result.getUuid()).append("</a></td>\n");\r
 \r
                buf.append("</tr>\n");\r
        }\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/TestResultDao.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/TestResultDao.java
index 3c8033050cfcb8d84a59a0ddff40078769b9f046..b67fa895f908d39202ff27f05db007a74fa6dc3c 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/TestResultDao.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/TestResultDao.java
@@ -12,7 +12,7 @@ import org.argeo.slc.core.test.TestResultId;
  */\r
 public interface TestResultDao<T extends TestResult> {\r
        /** Gets a test result based on its id. */\r
-       public T getTestResult(TestResultId id);\r
+       public T getTestResult(String uuid);\r
 \r
        /** Persists a new test result. */\r
        public void create(TestResult testResult);\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/test/tree/TestResultDaoHibernate.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/test/tree/TestResultDaoHibernate.java
index 9dc76d6e1dc886463238f7506d289789b3123ffb..3dcf0088738237f884b85977518806e0d9569559 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/test/tree/TestResultDaoHibernate.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/test/tree/TestResultDaoHibernate.java
@@ -27,11 +27,9 @@ public class TestResultDaoHibernate extends HibernateDaoSupport implements
                getHibernateTemplate().saveOrUpdate(testResult);\r
        }\r
 \r
-       public TreeTestResult getTestResult(TestResultId id) {\r
-               NumericTRId ntrid = (NumericTRId) id;\r
+       public TreeTestResult getTestResult(String uuid) {\r
                List<?> list = getHibernateTemplate().find(\r
-                               "from TreeTestResult where numericResultId.value=?",\r
-                               ntrid.getValue());\r
+                               "from TreeTestResult where uuid=?", uuid);\r
                if (list.size() == 0) {\r
                        return null;\r
                } else {\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
index 6f5e7b63b56864ceba761f81858caf3f0a4bba2e..237811ebee583ba94331d3df018e2d81c170aeb7 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
@@ -17,7 +17,7 @@ import org.argeo.slc.core.test.tree.TreeTestResult;
 public class UnitTestTreeUtil {\r
        public static void assertTreeTestResult(TreeTestResult expected,\r
                        TreeTestResult reached) {\r
-               assertEquals(expected.getTestResultId(), reached.getTestResultId());\r
+               assertEquals(expected.getUuid(), reached.getUuid());\r
                assertDateSec(expected.getCloseDate(), reached.getCloseDate());\r
 \r
                assertEquals(expected.getResultParts().size(), reached.getResultParts()\r

diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/tree/mapping.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/tree/mapping.xml
index 16b4970e4ee0bf14af472932ec73f4714dbd6543..45d9dd9cf6012860662bcd3cd8f6b659f38a8fe9 100644 (file)
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/tree/mapping.xml
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/tree/mapping.xml
@@ -7,13 +7,10 @@
                auto-complete="false">\r
                <map-to ns-uri="http://argeo.org/projects/slc/schemas"\r
                        ns-prefix="slc" />\r
-               <field name="closeDate" />\r
-               <field name="numericResultId"\r
-                       type="org.argeo.slc.core.test.NumericTRId">\r
-                       <bind-xml auto-naming="deriveByClass"\r
-                               location="result-id">\r
-                       </bind-xml>\r
+               <field name="uuid" type="string">\r
+                       <bind-xml name="uuid" node="attribute" />\r
                </field>\r
+               <field name="closeDate" />\r
                <field name="resultParts" collection="map">\r
                        <bind-xml name="result-part" location="result-parts">\r
                                <class name="org.exolab.castor.mapping.MapItem">\r
@@ -48,15 +45,6 @@
                </field>\r
        </class>\r
 \r
-       <class name="org.argeo.slc.core.test.NumericTRId"\r
-               auto-complete="false">\r
-               <map-to ns-uri="http://argeo.org/projects/slc/schemas"\r
-                       ns-prefix="slc" />\r
-               <field name="value">\r
-                       <bind-xml node="attribute" />\r
-               </field>\r
-       </class>\r
-\r
        <class name="org.argeo.slc.core.test.tree.PartSubList"\r
                auto-complete="false">\r
                <map-to ns-uri="http://argeo.org/projects/slc/schemas"\r

diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
index 971469fd1c586f53e850141434fd0555ba8a8983..f1eecccba747e2ca2ad9d49b70851a45f3f889ad 100644 (file)
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
@@ -4,16 +4,11 @@
        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">\r
 <hibernate-mapping package="org.argeo.slc.core.test.tree">\r
        <class name="TreeTestResult" table="TREE_TEST_RESULT">\r
-               <id name="tid" column="T_ID">\r
-                       <generator class="native" />\r
-               </id>\r
+               <id name="uuid" column="UUID"/>\r
 \r
                <property name="closeDate" column="CLOSE_DATE" type="timestamp"\r
                        not-null="false" />\r
 \r
-               <many-to-one name="numericResultId" unique="true"\r
-                       not-null="true" column="TEST_RESULT_ID" cascade="all" lazy="false" />\r
-\r
                <map name="resultParts" table="RESULT_PARTS_MAP" cascade="all"\r
                        lazy="false" sort="natural">\r
                        <key column="PARENT_ID" />\r

diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd b/org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd
index fc8493e42ab241e7b4e77d649528302916bb4764..69700597fb26205fcdf14555cd6a2da7c4250f07 100644 (file)
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd
@@ -6,22 +6,13 @@
        <xs:element name="tree-test-result" type="slc:TreeTestResultType" />\r
        <xs:complexType name="TreeTestResultType">\r
                <xs:all>\r
-                       <xs:element name="result-id" type="slc:ResultIdType" />\r
                        <xs:element name="close-date" type="xs:dateTime" />\r
                        <xs:element name="result-parts" minOccurs="0"\r
                                type="slc:ResultPartsType" />\r
                        <xs:element name="elements" minOccurs="0"\r
                                type="slc:ElementsType" />\r
                </xs:all>\r
-       </xs:complexType>\r
-       <xs:complexType name="ResultIdType">\r
-               <xs:all>\r
-                       <xs:element name="numeric-tRId"\r
-                               type="slc:NumericResultIdType" />\r
-               </xs:all>\r
-       </xs:complexType>\r
-       <xs:complexType name="NumericResultIdType">\r
-               <xs:attribute name="value" type="xs:integer" use="required" />\r
+               <xs:attribute name="uuid" use="required"/>\r
        </xs:complexType>\r
        <xs:complexType name="ResultPartsType">\r
                <xs:sequence>\r

diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultTestUtils.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultTestUtils.java
index 591a1d3680328e783b164ff3cae6ca3e46e41114..9b26ac8fae94fd9f0fe953b7dd10ec62e4908ff7 100644 (file)
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultTestUtils.java
+++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultTestUtils.java
@@ -1,6 +1,7 @@
 package org.argeo.slc.core.test.tree;\r
 \r
 import java.util.Date;\r
+import java.util.UUID;\r
 \r
 import org.argeo.slc.core.process.SlcExecution;\r
 import org.argeo.slc.core.process.SlcExecutionStep;\r
@@ -8,7 +9,6 @@ import org.argeo.slc.core.process.SlcExecutionTestUtils;
 import org.argeo.slc.core.structure.SimpleSElement;\r
 import org.argeo.slc.core.structure.tree.TreeSPath;\r
 import org.argeo.slc.core.structure.tree.TreeSRegistry;\r
-import org.argeo.slc.core.test.NumericTRId;\r
 import org.argeo.slc.core.test.SimpleResultPart;\r
 import org.argeo.slc.core.test.TestStatus;\r
 \r
@@ -16,8 +16,7 @@ public abstract class TreeTestResultTestUtils {
 \r
        public static TreeTestResult createSimpleTreeTestResult() {\r
                TreeTestResult treeTestResult = new TreeTestResult();\r
-               treeTestResult.setNumericResultId(new NumericTRId(System\r
-                               .currentTimeMillis()));\r
+               treeTestResult.setUuid(UUID.randomUUID().toString());\r
                treeTestResult.setCloseDate(new Date());\r
                return treeTestResult;\r
        }\r

diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernateTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernateTest.java
index b8d29881a0f28d4c5a73ff67e634388d20ebdc7a..bb80ddca0c29de9d8667bf5f84566813118df305 100644 (file)
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernateTest.java
+++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernateTest.java
@@ -23,7 +23,7 @@ public class TreeTestResultDaoHibernateTest extends AbstractSpringTestCase {
                testResultDao.create(ttr);\r
 \r
                TreeTestResult ttrPersisted = (TreeTestResult) testResultDao\r
-                               .getTestResult(ttr.getTestResultId());\r
+                               .getTestResult(ttr.getUuid());\r
                \r
                UnitTestTreeUtil.assertTreeTestResult(ttr, ttrPersisted);\r
        }\r
@@ -36,7 +36,7 @@ public class TreeTestResultDaoHibernateTest extends AbstractSpringTestCase {
                testResultDao.create(ttr);\r
 \r
                TreeTestResult ttrUpdated = (TreeTestResult) testResultDao\r
-                               .getTestResult(ttr.getTestResultId());\r
+                               .getTestResult(ttr.getUuid());\r
                \r
                // Modifying ttrUpdated\r
                \r
@@ -64,7 +64,7 @@ public class TreeTestResultDaoHibernateTest extends AbstractSpringTestCase {
                \r
                // comparison of ttrUpdated and ttrRetrieved\r
                TreeTestResult ttrRetrieved = (TreeTestResult) testResultDao\r
-               .getTestResult(ttr.getTestResultId());\r
+               .getTestResult(ttr.getUuid());\r
                \r
                UnitTestTreeUtil.assertTreeTestResult(ttrRetrieved, ttrUpdated);\r
        }\r

diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/applicationContext.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/applicationContext.xml
index b874191eb759d3dd5700cae2c57083b9038fcde1..37fd9d3866c357ca8ea59ce3ba99d9aa5c418017 100644 (file)
--- a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/applicationContext.xml
+++ b/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/applicationContext.xml
@@ -9,10 +9,8 @@
 \r
        <bean id="testResult"\r
                class="org.argeo.slc.core.test.tree.TreeTestResult">\r
-               <property name="numericResultId">\r
-                       <bean class="org.argeo.slc.core.test.NumericTRId">\r
-                               <property name="value" value="1" />\r
-                       </bean>\r
+               <property name="uuid">\r
+                       <bean factory-bean="uuid" factory-method="toString"></bean>\r
                </property>\r
                <property name="listeners">\r
                        <list>\r
@@ -21,6 +19,10 @@
                </property>\r
        </bean>\r
 \r
+       <bean name="uuid" class="java.util.UUID" factory-method="randomUUID"\r
+               scope="prototype">\r
+       </bean>\r
+\r
        <bean id="resultLogger"\r
                class="org.argeo.slc.core.test.tree.TreeTestResultLogger"\r
                init-method="init">\r