From f78bb2a6d314add95e34691e7b43cb7655c81dda Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 6 Oct 2011 12:14:05 +0000 Subject: [PATCH] Improve diff issue git-svn-id: https://svn.argeo.org/slc/trunk@4807 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../ui/views/JcrExecutionModulesView.java | 7 +++---- ...DefaultExecutionFlowDescriptorConverter.java | 12 +++++++++--- .../java/org/argeo/slc/jcr/JcrTestResult.java | 17 +++++++++++++++-- .../main/java/org/argeo/slc/jcr/SlcTypes.java | 1 + .../main/resources/org/argeo/slc/jcr/slc.cnd | 5 +++++ 5 files changed, 33 insertions(+), 9 deletions(-) diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java index dd3c4593c..bbe3af402 100644 --- a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java +++ b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java @@ -39,7 +39,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.viewers.ColumnViewerToolTipSupport; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.IStructuredSelection; @@ -84,7 +83,7 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes, viewer.setComparer(new NodeElementComparer()); final ViewLabelProvider viewLabelProvider = new ViewLabelProvider(); viewer.setLabelProvider(viewLabelProvider); - //ColumnViewerToolTipSupport.enableFor(viewer); + // ColumnViewerToolTipSupport.enableFor(viewer); viewer.setInput(getViewSite()); viewer.addDoubleClickListener(new ViewDoubleClickListener()); getViewSite().setSelectionProvider(viewer); @@ -253,8 +252,8 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes, if (session.itemExists(path)) { Node parentNode = session.getNode(path);// .getParent(); - if (log.isDebugEnabled()) - log.debug("Refresh " + parentNode + " after event " + if (log.isTraceEnabled()) + log.trace("Refresh " + parentNode + " after event " + event); viewer.refresh(parentNode); } diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java index 27929b4b6..2fb897d3a 100644 --- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java +++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java @@ -269,9 +269,15 @@ public class DefaultExecutionFlowDescriptorConverter implements } } if (ref == null) { - log.warn("Cannot define reference for ref spec attribute " - + key + " in " + executionFlow + " (" + rsa + ")." - + " If it is an inner bean consider put it frozen."); + if (log.isTraceEnabled()) + log.trace("Cannot define reference for ref spec attribute " + + key + + " in " + + executionFlow + + " (" + + rsa + + ")." + + " If it is an inner bean consider put it frozen."); ref = REF_VALUE_INTERNAL; } else { if (log.isTraceEnabled()) diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/JcrTestResult.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/JcrTestResult.java index ea2495e3e..c9d802029 100644 --- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/JcrTestResult.java +++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/JcrTestResult.java @@ -15,13 +15,15 @@ import javax.jcr.query.QueryManager; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; +import org.argeo.slc.core.attachment.Attachment; +import org.argeo.slc.core.attachment.AttachmentsEnabled; import org.argeo.slc.test.TestResult; import org.argeo.slc.test.TestResultPart; import org.argeo.slc.test.TestRun; import org.argeo.slc.test.TestStatus; /** {@link TestResult} wrapping a JCR node of type {@link SlcTypes#SLC_RESULT}. */ -public class JcrTestResult implements TestResult, SlcNames { +public class JcrTestResult implements TestResult, SlcNames, AttachmentsEnabled { /** Should only be set for an already existing result. */ private String uuid; private Session session; @@ -30,6 +32,8 @@ public class JcrTestResult implements TestResult, SlcNames { /** cached for performance purposes */ private String nodeIdentifier = null; + private Boolean logoutWhenDestroyed = true; + private Map attributes = new HashMap(); public void init() { @@ -58,7 +62,8 @@ public class JcrTestResult implements TestResult, SlcNames { } public void destroy() { - + if (logoutWhenDestroyed) + JcrUtils.logoutQuietly(session); } public Node getNode() { @@ -157,6 +162,10 @@ public class JcrTestResult implements TestResult, SlcNames { } } + public void addAttachment(Attachment attachment) { + // TODO implement it + } + public void setUuid(String uuid) { this.uuid = uuid; } @@ -177,4 +186,8 @@ public class JcrTestResult implements TestResult, SlcNames { this.attributes = attributes; } + public void setLogoutWhenDestroyed(Boolean logoutWhenDestroyed) { + this.logoutWhenDestroyed = logoutWhenDestroyed; + } + } diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcTypes.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcTypes.java index ffc9bbd2f..e0e2d1e25 100644 --- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcTypes.java +++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcTypes.java @@ -19,6 +19,7 @@ public interface SlcTypes { public final static String SLC_RESULT = "slc:result"; public final static String SLC_CHECK = "slc:check"; public final static String SLC_PROPERTY = "slc:property"; + public final static String SLC_DIFF_RESULT = "slc:diffResult"; // Log levels public final static String SLC_LOG_ENTRY = "slc:logEntry"; 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 36ced22db..3117a3f1a 100644 --- 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 @@ -94,8 +94,13 @@ mixin // RESULT [slc:result] > nt:unstructured, mix:created, mix:lastModified - slc:uuid (STRING) ! m +- slc:testCase (STRING) - slc:completed (DATE) +[slc:diffResult] > slc:result ++ slc:summary ++ slc:issues + [slc:check] > nt:unstructured // true for PASSED, false for FAILED or ERROR - slc:success (BOOLEAN) ! m -- 2.39.5