*** empty log message ***

3 files changed, 22 insertions, 22 deletions

diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkTest.java
index 817a8c901..f7204e5a1 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkTest.java
@@ -38,11 +38,6 @@ public abstract class BenchmarkTest extends EclipseTest {
 	private HashMap groups;
     private PerformanceMeter currentMeter;
     private static SyncInfoSource source = new SynchronizeViewTestAdapter();
-    
-    // Global performance groups for CVS tests, these will be shown in the platform overview 
-    // diagram.
-    public final static String SYNC_GROUP = "CVS Synchronize";
-    public final static String WORKFLOW_GROUP = "CVS Workflow";
 
     protected BenchmarkTest() {
 	}
@@ -84,10 +79,10 @@ public abstract class BenchmarkTest extends EclipseTest {
      * @param performance_groups
      */
 	protected void setupGroups(String[] performance_groups) {
-        setupGroups(performance_groups, null);
+        setupGroups(performance_groups, null, false);
     }
 	
-	protected void setupGroups(String[] performance_groups, String globalName) {
+	protected void setupGroups(String[] performance_groups, String globalName, boolean global) {
         groups = new HashMap();
 	    Performance perf = Performance.getDefault();
         for (int i = 0; i < performance_groups.length; i++) {
@@ -95,7 +90,10 @@ public abstract class BenchmarkTest extends EclipseTest {
 		    PerformanceMeter meter = perf.createPerformanceMeter(perf.getDefaultScenarioId(this) + suffix);
             groups.put(suffix, meter);
             if(globalName != null) {
-    	    	perf.tagAsGlobalSummary(meter, globalName, Dimension.CPU_TIME);
+            	if(global)
+            		perf.tagAsGlobalSummary(meter, globalName, Dimension.CPU_TIME);
+            	else 
+            		perf.tagAsSummary(meter, globalName, Dimension.CPU_TIME);
     	    }
         }
     }
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/SyncTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/SyncTests.java
index 26f622b85..bfa886e09 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/SyncTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/SyncTests.java
@@ -50,15 +50,15 @@ public class SyncTests extends BenchmarkTest {
 	}
 
     public void testSync1() throws Exception {
-		runTestSync(1, null);
+		runTestSync(1, "CVS Synchronize 1");
 	}
 
 	public void testSync10() throws Exception {
-		runTestSync(10, null);
+		runTestSync(10, "CVS Synchronize 10");
 	}
 
 	public void testSync100() throws Exception {
-		runTestSync(100, SYNC_GROUP);
+		runTestSync(100, "CVS Synchronize 100");
 	}
 
 	protected IProject setupOutProject() throws Exception {
@@ -72,7 +72,7 @@ public class SyncTests extends BenchmarkTest {
 	 * A parallel project is used to generate incoming changes.
 	 */
 	protected void runTestSync(int size, String globalName) throws Exception {
-	    setupGroups(PERFORMANCE_GROUPS, globalName);
+	    setupGroups(PERFORMANCE_GROUPS, globalName, false);
 	    for (int i = 0; i < BenchmarkTestSetup.LOOP_COUNT; i++) {
 			final SequenceGenerator gen = new SequenceGenerator();
 	
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/WorkflowTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/WorkflowTests.java
index fa023f36c..35f4f5523 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/WorkflowTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/WorkflowTests.java
@@ -11,9 +11,7 @@
 package org.eclipse.team.tests.ccvs.ui.benchmark;
 
 import java.io.File;
-
 import junit.framework.Test;
-
 import org.eclipse.core.resources.*;
 import org.eclipse.team.internal.ccvs.core.CVSTag;
 
@@ -53,27 +51,31 @@ public class WorkflowTests extends BenchmarkTest {
 	}
 
 	public void testBigWorkflow() throws Exception {
-		runWorkflowTests("testBig", BenchmarkTestSetup.BIG_ZIP_FILE, WORKFLOW_GROUP);
+		runWorkflowTests("testBig", BenchmarkTestSetup.BIG_ZIP_FILE, "CVS Big Workflow", BenchmarkTestSetup.LOOP_COUNT, false);
 	}
 	
 	public void testSmallWorkflow() throws Exception {
-		runWorkflowTests("testSmall", BenchmarkTestSetup.SMALL_ZIP_FILE, null);
+		runWorkflowTests("testSmall", BenchmarkTestSetup.SMALL_ZIP_FILE, "CVS Small Workflow", BenchmarkTestSetup.LOOP_COUNT, false);
 	}
 
 	public void testTinyWorkflow() throws Exception {
-		runWorkflowTests("testTiny", BenchmarkTestSetup.TINY_ZIP_FILE, null);
+		runWorkflowTests("testTiny", BenchmarkTestSetup.TINY_ZIP_FILE, "CVS Tiny Workflow", BenchmarkTestSetup.LOOP_COUNT, false);
 	}
-
+	
+	public void testBigWorkflowForSummary() throws Exception {
+		runWorkflowTests("testBigGlobal", BenchmarkTestSetup.BIG_ZIP_FILE, "CVS Big Workflow", 1, true);
+	}
+	
 	/**
 	 * Runs a series of incoming and outgoing workflow-related tests.
 	 */
-	protected void runWorkflowTests(String name, File initialContents, String globalName) throws Exception {
-	    setupGroups(PERFORMANCE_GROUPS, globalName);
-	    for (int i = 0; i < BenchmarkTestSetup.LOOP_COUNT; i++) {
+	protected void runWorkflowTests(String name, File initialContents, String globalName, int loopCount, boolean global) throws Exception {
+	    setupGroups(PERFORMANCE_GROUPS, globalName, global);
+	    for (int i = 0; i < loopCount; i++) {
 			final SequenceGenerator gen = new SequenceGenerator();
 			IProject outProject = createAndImportProject(name, initialContents);
 			
-			// test project sharing
+			// test project sharing			
 			startGroup(SHARE_PROJECT);
 			shareProject(outProject);
 			endGroup();