Attachment 62518 Details for Bug 157300 – Fix patch file for org.eclipse.hyades.test.ui plugin

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix patch file for org.eclipse.hyades.test.ui plugin

org.eclipse.hyades.test.ui_patch.txt (text/plain), 5.57 KB, created by Bianca Jiang

on 2007-03-30 12:39:12 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Bianca Jiang

Created: 2007-03-30 12:39:12 EDT

Size: 5.57 KB

patch

obsolete

>Index: schema/executionHistoryExtension.exsd
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/schema/executionHistoryExtension.exsd,v
>retrieving revision 1.14
>diff -u -r1.14 executionHistoryExtension.exsd
>--- schema/executionHistoryExtension.exsd	1 May 2006 21:28:23 -0000	1.14
>+++ schema/executionHistoryExtension.exsd	30 Mar 2007 16:34:21 -0000
>@@ -28,7 +28,7 @@
>             <choice>
>                <element ref="actionExtension" minOccurs="0" maxOccurs="unbounded"/>
>                <element ref="eventExtension" minOccurs="0" maxOccurs="unbounded"/>
>-               <element ref="verdictProvider" minOccurs="0" maxOccurs="1"/>
>+               <element ref="verdictProvider" minOccurs="0" maxOccurs="unbounded"/>
>                <element ref="resultExtension" minOccurs="0" maxOccurs="1"/>
>             </choice>
>          </sequence>
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/plugin.xml,v
>retrieving revision 1.68
>diff -u -r1.68 plugin.xml
>--- plugin.xml	21 Mar 2007 21:03:17 -0000	1.68
>+++ plugin.xml	30 Mar 2007 16:34:21 -0000
>@@ -919,6 +919,21 @@
>          </action>
>       </actionSet>
>    </extension>
>+       <extension
>+             point="org.eclipse.hyades.test.ui.executionHistoryExtension">
>+          <verdictProvider
>+                provider="org.eclipse.hyades.test.ui.forms.extensions.provisional.TPTPVerdictCategoryProvider"
>+                testType="org.eclipse.hyades.test.manual.testSuite">
>+          </verdictProvider>
>+          <verdictProvider
>+                provider="org.eclipse.hyades.test.ui.forms.extensions.provisional.TPTPVerdictCategoryProvider"
>+                testType="org.eclipse.hyades.test.java.junit.testSuite">
>+          </verdictProvider>
>+          <verdictProvider
>+                provider="org.eclipse.hyades.test.ui.forms.extensions.provisional.TPTPVerdictCategoryProvider"
>+                testType="org.eclipse.hyades.test.http.junit.testSuite">
>+          </verdictProvider>
>+       </extension>
>    
>    
> </plugin>
>Index: src/org/eclipse/hyades/test/ui/forms/extensions/provisional/TPTPVerdictCategoryProvider.java
>===================================================================
>RCS file: src/org/eclipse/hyades/test/ui/forms/extensions/provisional/TPTPVerdictCategoryProvider.java
>diff -N src/org/eclipse/hyades/test/ui/forms/extensions/provisional/TPTPVerdictCategoryProvider.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/hyades/test/ui/forms/extensions/provisional/TPTPVerdictCategoryProvider.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,75 @@
>+/********************************************************************** 
>+ * Copyright (c) 2006 IBM Corporation and others. 
>+ * All rights reserved.   This program and the accompanying materials 
>+ * are made available under the terms of the Eclipse Public License v1.0 
>+ * which accompanies this distribution, and is available at 
>+ * http://www.eclipse.org/legal/epl-v10.html         
>+ * $Id: DefaultVerdictCategoryProvider.java,v 1.1 2006/03/16 00:38:02 bjiang Exp $ 
>+ * 
>+ * Contributors: 
>+ * IBM - Initial API and implementation 
>+ **********************************************************************/ 
>+package org.eclipse.hyades.test.ui.forms.extensions.provisional;
>+
>+import java.util.List;
>+
>+import org.eclipse.hyades.models.common.testprofile.TPFExecutionResult;
>+import org.eclipse.hyades.models.common.testprofile.TPFVerdictEvent;
>+
>+/**
>+ * This class is the verdict category provider for TPTP test types implementing "executionHistoryExtension.verdictProvider"
>+ * extention point. The purpose of this class is to handle the special rolled up verdict in TPTP test logs. 
>+ * 
>+ * @author bjiang
>+ * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=157300
>+ * @since 4.4
>+ */
>+public class TPTPVerdictCategoryProvider extends DefaultVerdictCategoryProvider {
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * @see org.eclipse.hyades.test.ui.forms.extensions.provisional.DefaultVerdictCategoryProvider#getVerdictCategories(org.eclipse.hyades.models.common.testprofile.TPFExecutionResult)
>+	 */
>+	public VerdictCategory[] getVerdictCategories(TPFExecutionResult executionResult) {
>+		
>+		List execEvents = executionResult.getExecutionHistory().getExecutionEvents();
>+		TPFVerdictEvent verdict = null;
>+		if(execEvents != null) 
>+		{
>+			for(int i = (execEvents.size() - 1); i >=0; i--)
>+			{
>+				if(execEvents.get(i) instanceof TPFVerdictEvent)
>+					// This is the rolled up verdict to be filtered out.
>+					verdict = (TPFVerdictEvent)execEvents.get(i);
>+			}
>+		}
>+		
>+		VerdictCategory[] vc = super.getVerdictCategories(executionResult);
>+		if(vc != null && verdict != null)
>+		{
>+			for(int i = 0; i < vc.length; i++)
>+			{
>+				if(vc[i].getText().equals(verdict.getVerdict().getLabel()))
>+				{
>+					TPFVerdictEvent[] verdicts = vc[i].getVerdicts();
>+					for(int v = (verdicts.length - 1); v >=0; v--)
>+					{
>+						if(verdicts[v] == verdict)
>+						{
>+							// verdicts[v] is the one to be filtered out from the list.
>+							TPFVerdictEvent[] filteredVerdicts = new TPFVerdictEvent[verdicts.length - 1];
>+							if(v > 0)
>+								System.arraycopy(verdicts, 0, filteredVerdicts, 0, v);
>+							if(v < filteredVerdicts.length)
>+								System.arraycopy(verdicts, (v+1), filteredVerdicts, v, (filteredVerdicts.length - v));
>+							
>+							vc[i].setVerdicts(filteredVerdicts);
>+							return vc;
>+						}
>+					}
>+				}
>+			}
>+		}
>+		return vc;
>+	}
>+}

Actions: View | Diff

Attachments on bug 157300: 50149 | 50150 | 62518