[CIShell-SVN] SF.net SVN: cishell: [457] trunk/testing/org.cishell.testing. convertertester.core.new/src/org/cishell/testing/convertertester/core/ converter

[<tea...@us...>]

Revision: 457
          http://cishell.svn.sourceforge.net/cishell/?rev=457&view=rev
Author:   teakettle22
Date:     2007-08-06 08:28:57 -0700 (Mon, 06 Aug 2007)

Log Message:
-----------
changed how the ConverterPath[][] was generated in getTestPaths.

Modified Paths:
--------------
    trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/ConverterLoaderImpl.java
    trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java

Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/ConverterLoaderImpl.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/ConverterLoaderImpl.java	2007-08-01 19:16:21 UTC (rev 456)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/ConverterLoaderImpl.java	2007-08-06 15:28:57 UTC (rev 457)
@@ -51,8 +51,19 @@
 
             ServiceReference[] refs = bContext.getServiceReferences(
                     AlgorithmFactory.class.getName(), filter);
+           /* ConverterGraph g = new ConverterGraph(refs);
+            System.out.println(g.printComparisonConverterPaths() + "\n" +
+            		g.getComparePaths().length + "\n" + g.printTestConverterPaths() + "\n");
+            int length = 0;
+            for(int i = 0; i < g.getTestPaths().length; i++){
+            	for(int j = 0; j < g.getTestPaths()[i].length; j++){
+            		length++;
+            	}
+            }
+            System.out.println(length + " " + g.getTestPaths().length);
             
-            if (refs != null) {
+          //  System.out.println(g);*/
+*/            if (refs != null) {
 				for (int i = 0; i < refs.length; ++i) {
 					
 					this.converterList.put(refs[i].getProperty("service.pid").toString(), refs[i]);

Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java	2007-08-01 19:16:21 UTC (rev 456)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java	2007-08-06 15:28:57 UTC (rev 457)
@@ -89,7 +89,7 @@
 		firstOutData = ((ServiceReference)cp.getPath().get(0)).getProperty("out_data").toString();
 		lastInData = ((ServiceReference)cp.getPath().get(cp.getPath().size()-1)).getProperty("in_data").toString();
 		if(firstOutData.equals(lastInData)){
-			addPath(cp);
+			addTestPath(cp);
 		}
 	}
 	
@@ -130,7 +130,7 @@
 		return srs;
 	}
 	
-	private void addPath(ConverterPath p){
+	private void addTestPath(ConverterPath p){
 		if(this.fileExtensionTestConverters.get(p.getInData()) == null){
 		
 			ArrayList paths = new ArrayList();
@@ -140,7 +140,7 @@
 		}
 		else{
 			
-			((ArrayList)this.fileExtensionTestConverters.get(p.getInData())).add(p);
+			((ArrayList)this.fileExtensionTestConverters.get((p.getInData()))).add(p);
 			
 		}
 	}
@@ -151,7 +151,7 @@
 		ArrayList al = (ArrayList)this.fileExtensionTestConverters.get(s);
 			for(int i = 0; i < al.size(); i++){
 				ConverterPath cp = (ConverterPath)al.get(i);
-				sb.append(cp.toString());
+				sb.append(s + cp.toString());
 			}
 			sb.trimToSize();
 		return sb.toString();
@@ -213,13 +213,13 @@
 	}
 	
 	public ConverterPath[][] getTestPaths(){
+		ConverterPath[][] paths = new ConverterPath[this.fileExtensionTestConverters.keySet().size()][];
 		String[] fileExtensions = (String[])this.fileExtensionTestConverters.keySet().toArray(new String[0]);
-		ArrayList graphs = new ArrayList();
 		for(int i = 0; i < fileExtensions.length; i++){
-			graphs.add(getTestPath(fileExtensions[i]));
+			paths[i] = (getTestPath(fileExtensions[i]));
 		}
 		//this line may be busted
-		return (ConverterPath[][])graphs.toArray(new ConverterPath[0][]);
+		return paths;
 	}
 	
 	public ConverterPath getComparePath(String s){


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.