Fix some minor bugs to enhance test processing and analysing

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

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcUiConstants.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcUiConstants.java
index 6fd862876c916bf00c5cd04758fefc9a5a3a7f67..6aa176bfe06b461675d9762c5efff709d602672d 100644 (file)
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcUiConstants.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcUiConstants.java
@@ -26,6 +26,5 @@ public interface SlcUiConstants {
        /*
         * MISCEALLENEOUS
         */
-       public final static String DEFAULT_DISPLAY_DATE_FORMAT = "MM/dd/yy";
-       public final static String DEFAULT_DISPLAY_DATE_TIME_FORMAT = "MM/dd/yyyy, HH:mm:ss";
+       public final static String DEFAULT_DISPLAY_DATE_TIME_FORMAT = "yyyy-MM-dd, HH:mm:ss";
 }

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java
index e6f7a96c10af34596ef36d2846867a7beff043ca..e714756485e284368969f6c3ad5e17611619e0e3 100644 (file)
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java
@@ -23,6 +23,7 @@ import javax.jcr.RepositoryException;
 
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.ClientUiPlugin;
+import org.argeo.slc.client.ui.SlcUiConstants;
 import org.argeo.slc.client.ui.model.ResultParent;
 import org.argeo.slc.client.ui.model.SingleResultNode;
 import org.argeo.slc.jcr.SlcNames;
@@ -41,7 +42,7 @@ public class ResultFailedDecorator extends LabelProvider implements
        // .getLog(ResultFailedDecorator.class);
 
        private final static DateFormat dateFormat = new SimpleDateFormat(
-                       "yyyy-MM-dd HH:mm");
+                       SlcUiConstants.DEFAULT_DISPLAY_DATE_TIME_FORMAT);
 
        public ResultFailedDecorator() {
                super();

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java
index 152e15c6e89bdf4f40cc44a1664d4a701b2ae0f2..8fcea20aa0ecb23def8c1ffcc2270c2c468f18e2 100644 (file)
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java
@@ -15,6 +15,8 @@
  */\r
 package org.argeo.slc.client.ui.views;\r
 \r
+import java.text.DateFormat;\r
+import java.text.SimpleDateFormat;\r
 import java.util.ArrayList;\r
 import java.util.Calendar;\r
 import java.util.List;\r
@@ -22,11 +24,8 @@ import java.util.List;
 import javax.jcr.Node;\r
 import javax.jcr.NodeIterator;\r
 import javax.jcr.Property;\r
-import javax.jcr.PropertyIterator;\r
-import javax.jcr.PropertyType;\r
 import javax.jcr.RepositoryException;\r
 import javax.jcr.Session;\r
-import javax.jcr.Value;\r
 import javax.jcr.nodetype.NodeType;\r
 import javax.jcr.observation.Event;\r
 import javax.jcr.observation.EventListener;\r
@@ -101,6 +100,9 @@ import org.eclipse.ui.part.ViewPart;
 public class JcrResultTreeView extends ViewPart {\r
        public final static String ID = ClientUiPlugin.ID + ".jcrResultTreeView";\r
 \r
+       private final static DateFormat dateFormat = new SimpleDateFormat(\r
+                       SlcUiConstants.DEFAULT_DISPLAY_DATE_TIME_FORMAT);\r
+\r
        // private final static Log log =\r
        // LogFactory.getLog(JcrResultTreeView.class);\r
 \r
@@ -259,11 +261,23 @@ public class JcrResultTreeView extends ViewPart {
                TableViewerColumn col = new TableViewerColumn(propertiesViewer,\r
                                SWT.NONE);\r
                col.getColumn().setText("Name");\r
-               col.getColumn().setWidth(200);\r
+               col.getColumn().setWidth(100);\r
                col.setLabelProvider(new ColumnLabelProvider() {\r
                        public String getText(Object element) {\r
                                try {\r
-                                       return ((Property) element).getName();\r
+                                       String name = ((Property) element).getName();\r
+                                       String value = null;\r
+                                       if (SlcNames.SLC_TEST_CASE.equals(name))\r
+                                               value = "Test case";\r
+                                       else if (SlcNames.SLC_COMPLETED.equals(name))\r
+                                               value = "Completed on";\r
+                                       else if (SlcNames.SLC_SUCCESS.equals(name))\r
+                                               value = "Status";\r
+                                       else if (SlcNames.SLC_MESSAGE.equals(name))\r
+                                               value = "Message";\r
+                                       else if (SlcNames.SLC_ERROR_MESSAGE.equals(name))\r
+                                                       value = "Error";\r
+                                       return value;\r
                                } catch (RepositoryException e) {\r
                                        throw new ArgeoException(\r
                                                        "Unexpected exception in label provider", e);\r
@@ -272,39 +286,33 @@ public class JcrResultTreeView extends ViewPart {
                });\r
                col = new TableViewerColumn(propertiesViewer, SWT.NONE);\r
                col.getColumn().setText("Value");\r
-               col.getColumn().setWidth(400);\r
+               col.getColumn().setWidth(200);\r
                col.setLabelProvider(new ColumnLabelProvider() {\r
                        public String getText(Object element) {\r
                                try {\r
                                        Property property = (Property) element;\r
-                                       if (property.getType() == PropertyType.BINARY)\r
-                                               return "<binary>";\r
-                                       else if (property.isMultiple()) {\r
-                                               StringBuffer buf = new StringBuffer("[");\r
-                                               Value[] values = property.getValues();\r
-                                               for (int i = 0; i < values.length; i++) {\r
-                                                       if (i != 0)\r
-                                                               buf.append(", ");\r
-                                                       buf.append(values[i].getString());\r
+                                       String name = property.getName();\r
+                                       String value = null;\r
+\r
+                                       if (SlcNames.SLC_TEST_CASE.equals(name)\r
+                                                       || SlcNames.SLC_ERROR_MESSAGE.equals(name)\r
+                                                       || SlcNames.SLC_MESSAGE.equals(name))\r
+                                               value = property.getValue().getString();\r
+                                       else if (SlcNames.SLC_COMPLETED.equals(name)) {\r
+                                               Calendar date = property.getValue().getDate();\r
+                                               value = dateFormat.format(date.getTime());\r
+                                       } else if (SlcNames.SLC_SUCCESS.equals(name)) {\r
+                                               if (property.getValue().getBoolean())\r
+                                                       value = "SUCCESS";\r
+                                               else {\r
+                                                       if (property.getParent().hasNode(\r
+                                                                       SlcNames.SLC_ERROR_MESSAGE))\r
+                                                               value = "ERROR";\r
+                                                       else\r
+                                                               value = "FAILED";\r
                                                }\r
-                                               buf.append(']');\r
-                                               return buf.toString();\r
-                                       } else\r
-                                               return property.getValue().getString();\r
-                               } catch (RepositoryException e) {\r
-                                       throw new ArgeoException(\r
-                                                       "Unexpected exception in label provider", e);\r
-                               }\r
-                       }\r
-               });\r
-               col = new TableViewerColumn(propertiesViewer, SWT.NONE);\r
-               col.getColumn().setText("Type");\r
-               col.getColumn().setWidth(200);\r
-               col.setLabelProvider(new ColumnLabelProvider() {\r
-                       public String getText(Object element) {\r
-                               try {\r
-                                       return PropertyType.nameFromValue(((Property) element)\r
-                                                       .getType());\r
+                                       }\r
+                                       return value;\r
                                } catch (RepositoryException e) {\r
                                        throw new ArgeoException(\r
                                                        "Unexpected exception in label provider", e);\r
@@ -777,14 +785,28 @@ public class JcrResultTreeView extends ViewPart {
                public Object[] getElements(Object inputElement) {\r
                        try {\r
                                if (inputElement instanceof Node) {\r
-                                       List<Property> props = new ArrayList<Property>();\r
-                                       PropertyIterator pit = ((Node) inputElement)\r
-                                                       .getProperties();\r
-                                       while (pit.hasNext())\r
-                                               props.add(pit.nextProperty());\r
-                                       return props.toArray();\r
+                                       Node node = (Node) inputElement;\r
+                                       if (node.isNodeType(SlcTypes.SLC_TEST_RESULT)) {\r
+                                               List<Property> props = new ArrayList<Property>();\r
+                                               if (node.hasProperty(SlcNames.SLC_TEST_CASE))\r
+                                                       props.add(node.getProperty(SlcNames.SLC_TEST_CASE));\r
+                                               if (node.hasProperty(SlcNames.SLC_COMPLETED))\r
+                                                       props.add(node.getProperty(SlcNames.SLC_COMPLETED));\r
+                                               if (node.hasNode(SlcNames.SLC_STATUS)) {\r
+                                                       Node status = node.getNode(SlcNames.SLC_STATUS);\r
+                                                       props.add(status.getProperty(SlcNames.SLC_SUCCESS));\r
+                                                       if (status.hasProperty(SlcNames.SLC_MESSAGE))\r
+                                                               props.add(status\r
+                                                                               .getProperty(SlcNames.SLC_MESSAGE));\r
+                                                       if (status.hasProperty(SlcNames.SLC_ERROR_MESSAGE))\r
+                                                               props.add(status\r
+                                                                               .getProperty(SlcNames.SLC_ERROR_MESSAGE));\r
+                                               }\r
+                                               return props.toArray();\r
+                                       }\r
                                }\r
                                return new Object[] {};\r
+\r
                        } catch (RepositoryException e) {\r
                                throw new ArgeoException("Cannot get element for "\r
                                                + inputElement, e);\r

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/resources/org/argeo/slc/jcr/slc.cnd b/runtime/org.argeo.slc.support.jcr/src/main/resources/org/argeo/slc/jcr/slc.cnd
index 96439ca602b6091e33c40f1349f52de0bf5dda7c..92e81a4ef58a9d0c2489aeb825d3d44e72f79b91 100644 (file)
--- a/runtime/org.argeo.slc.support.jcr/src/main/resources/org/argeo/slc/jcr/slc.cnd
+++ b/runtime/org.argeo.slc.support.jcr/src/main/resources/org/argeo/slc/jcr/slc.cnd
@@ -99,6 +99,11 @@ mixin
 - slc:uuid (STRING) ! m
 - slc:testCase (STRING)
 - slc:completed (DATE)
+// Added by the engine once the test has been fully processed. 
+// If the test is killed before it ends, this node is not created
++ slc:status (slc:check)
+// DEPRECATED. This Node is now rather called slc:status (see above)
+// Should be removed in Argeo 2.
 + slc:testStatus (slc:check)
 
 [slc:diffResult] > slc:testResult