Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/bp/CommentReporter.java4
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/i18n/Messages.java2
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/i18n/messages.properties4
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/properties/ProjectALMPropertyPage.java8
4 files changed, 15 insertions, 3 deletions
diff --git a/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/bp/CommentReporter.java b/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/bp/CommentReporter.java
index 0bb09ff5c..908b38815 100644
--- a/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/bp/CommentReporter.java
+++ b/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/bp/CommentReporter.java
@@ -255,13 +255,13 @@ public class CommentReporter implements ITestresultSummaryEventListener {
Set<String> taskIds = taskIdToALMChange.keySet();
int taskAmount = taskIds.size();
IProgressConsole c = getConsole();
+ int successCount = 0;
if (taskAmount > 0) {
String out = NLS.bind(Messages.ReportToALMJob, taskAmount,
repoLabel);
monitor.beginTask(out, taskAmount);
c.writeLine(out);
- int successCount = 0;
int overallCommentCount = 0;
int overallFieldUpdateCount = 0;
for (String taskId : taskIds) {
@@ -314,7 +314,7 @@ public class CommentReporter implements ITestresultSummaryEventListener {
} else {
c.writeLine(Messages.NothingToReport);
}
- if (!failed) {
+ if (!failed || successCount > 0) {
return Status.OK_STATUS;
}
return new Status(IStatus.ERROR, Activator.ID,
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/i18n/Messages.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/i18n/Messages.java
index bcfea886c..ac5819b6c 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/i18n/Messages.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/i18n/Messages.java
@@ -566,7 +566,9 @@ public class Messages extends NLS {
public static String ProjectPropertyPageReportOnSuccessLabel;
public static String ProjectPropertyPageReportOnFailureLabel;
public static String ProjectPropertyPageReportRulesLabel;
+ public static String ProjectPropertyPageReportRulesTooltip;
public static String ProjectPropertyPageReportWriteCommentLabel;
+ public static String ProjectPropertyPageReportWriteCommentTooltip;
public static String ProjectPropertyPageAutToolKitLabel;
public static String ProjectPropertyPageDownToolTip;
public static String ProjectPropertyPageIsProtected;
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/i18n/messages.properties b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/i18n/messages.properties
index 6044f877a..e017c8101 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/i18n/messages.properties
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/i18n/messages.properties
@@ -549,8 +549,10 @@ ProjectPropertyPageALMReportingRuleEditDialog=Edit ALM reporting rule
ProjectPropertyPageReportOptionsLabel=Reporting options\:
ProjectPropertyPageReportOnSuccessLabel=On success
ProjectPropertyPageReportOnFailureLabel=On failure
-ProjectPropertyPageReportRulesLabel=Use the following rules to update task attributes:
+ProjectPropertyPageReportRulesLabel=Use the following rules to update fields:
+ProjectPropertyPageReportRulesTooltip=Use this option to update attributes on each referenced task ID\nbased on the status of the test for this task.
ProjectPropertyPageReportWriteCommentLabel=Write test result link as a comment in the ALM system.
+ProjectPropertyPageReportWriteCommentTooltip=Use this option to add a comment to each referenced task ID.\nThe comment contains the status and a link to the results.
ProjectPropertyPageDownToolTip=Add a selected available language to the list of Project languages.
ProjectPropertyPageIsProtected=Is Protected\:
ProjectPropertyPageIsReusable=Is Reusable\:
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/properties/ProjectALMPropertyPage.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/properties/ProjectALMPropertyPage.java
index 0426dd2ad..3dcd84070 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/properties/ProjectALMPropertyPage.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/properties/ProjectALMPropertyPage.java
@@ -44,6 +44,7 @@ import org.eclipse.jubula.client.ui.constants.IconConstants;
import org.eclipse.jubula.client.ui.rcp.Plugin;
import org.eclipse.jubula.client.ui.rcp.factory.ControlFactory;
import org.eclipse.jubula.client.ui.rcp.i18n.Messages;
+import org.eclipse.jubula.client.ui.rcp.provider.ControlDecorator;
import org.eclipse.jubula.client.ui.rcp.widgets.CheckedText;
import org.eclipse.jubula.client.ui.rcp.widgets.CheckedURLText;
import org.eclipse.jubula.client.ui.utils.LayoutUtil;
@@ -319,6 +320,8 @@ public class ProjectALMPropertyPage extends AbstractProjectPropertyPage {
leftPart.setParent(group);
report.setText(Messages
.ProjectPropertyPageReportWriteCommentLabel);
+ ControlDecorator.createInfo(report, Messages
+ .ProjectPropertyPageReportWriteCommentTooltip, false);
GridData labelGridData = new GridData(GridData.FILL_VERTICAL);
labelGridData.grabExcessHorizontalSpace = false;
report.setLayoutData(labelGridData);
@@ -333,6 +336,11 @@ public class ProjectALMPropertyPage extends AbstractProjectPropertyPage {
});
rulesLabel.setText(Messages
.ProjectPropertyPageReportRulesLabel);
+ ControlDecorator.createInfo(rulesLabel, Messages
+ .ProjectPropertyPageReportRulesTooltip, false);
+ GridData rulesLabelGridData = new GridData(GridData.FILL_VERTICAL);
+ rulesLabelGridData.verticalIndent = 15;
+ rulesLabel.setLayoutData(rulesLabelGridData);
ArrayContentProvider provider = new ArrayContentProvider();
tableViewer.setContentProvider(provider);
m_reportingRules = getProject().getProjectProperties()

Back to the top