import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import org.aspectj.ajdt.internal.core.builder.AjState;
+import org.aspectj.asm.IRelationship;
+import org.aspectj.asm.IRelationshipMap;
import org.aspectj.testing.util.FileUtil;
-public class AbstractMultiProjectIncrementalAjdeInteractionTestbed extends
- AjdeInteractionTestbed {
+public class AbstractMultiProjectIncrementalAjdeInteractionTestbed extends AjdeInteractionTestbed {
public static boolean VERBOSE = false;
}
public void build(String projectName) {
- constructUpToDateLstFile(projectName,"build.lst");
+ constructUpToDateLstFile(projectName, "build.lst");
doBuild(projectName);
- if (AjdeInteractionTestbed.VERBOSE) printBuildReport(projectName);
+ if (AjdeInteractionTestbed.VERBOSE)
+ printBuildReport(projectName);
+ }
+
+ public int getRelationshipCount(String project) {
+ IRelationshipMap relmap = getModelFor(project).getRelationshipMap();
+ int ctr = 0;
+ Set entries = relmap.getEntries();
+ for (Iterator iter = entries.iterator(); iter.hasNext();) {
+ String hid = (String) iter.next();
+ List rels = relmap.get(hid);
+ for (Iterator iterator = rels.iterator(); iterator.hasNext();) {
+ IRelationship ir = (IRelationship) iterator.next();
+ List targets = ir.getTargets();
+ for (Iterator iterator2 = targets.iterator(); iterator2.hasNext();) {
+ String thid = (String) iterator2.next();
+ ctr++;
+ }
+ }
+ }
+ return ctr;
}
public void fullBuild(String projectName) {
- constructUpToDateLstFile(projectName,"build.lst");
+ constructUpToDateLstFile(projectName, "build.lst");
doFullBuild(projectName);
- if (AjdeInteractionTestbed.VERBOSE) printBuildReport(projectName);
+ if (AjdeInteractionTestbed.VERBOSE)
+ printBuildReport(projectName);
}
private void constructUpToDateLstFile(String pname, String configname) {
- File projectBase = new File(sandboxDir,pname);
- File toConstruct = new File(projectBase,configname);
+ File projectBase = new File(sandboxDir, pname);
+ File toConstruct = new File(projectBase, configname);
List filesForCompilation = new ArrayList();
- collectUpFiles(projectBase,projectBase,filesForCompilation);
-
+ collectUpFiles(projectBase, projectBase, filesForCompilation);
+
try {
FileOutputStream fos = new FileOutputStream(toConstruct);
DataOutputStream dos = new DataOutputStream(fos);
for (Iterator iter = filesForCompilation.iterator(); iter.hasNext();) {
String file = (String) iter.next();
- dos.writeBytes(file+"\n");
+ dos.writeBytes(file + "\n");
}
dos.close();
} catch (IOException ioe) {
private void collectUpFiles(File location, File base, List collectionPoint) {
String contents[] = location.list();
- if (contents==null) return;
+ if (contents == null)
+ return;
for (int i = 0; i < contents.length; i++) {
String string = contents[i];
- File f = new File(location,string);
+ File f = new File(location, string);
if (f.isDirectory()) {
- collectUpFiles(f,base,collectionPoint);
+ collectUpFiles(f, base, collectionPoint);
} else if (f.isFile() && (f.getName().endsWith(".aj") || f.getName().endsWith(".java"))) {
String fileFound;
try {
fileFound = f.getCanonicalPath();
- String toRemove = base.getCanonicalPath();
- if (!fileFound.startsWith(toRemove)) throw new RuntimeException("eh? "+fileFound+" "+toRemove);
- collectionPoint.add(fileFound.substring(toRemove.length()+1));//+1 captures extra separator
+ String toRemove = base.getCanonicalPath();
+ if (!fileFound.startsWith(toRemove))
+ throw new RuntimeException("eh? " + fileFound + " " + toRemove);
+ collectionPoint.add(fileFound.substring(toRemove.length() + 1));// +1 captures extra separator
} catch (IOException e) {
e.printStackTrace();
}
}
/**
- * Fill in the working directory with the project base files,
- * from the 'base' folder.
+ * Fill in the working directory with the project base files, from the 'base' folder.
*/
protected void initialiseProject(String p) {
- File projectSrc=new File(testdataSrcDir+File.separatorChar+p+File.separatorChar+"base");
- File destination=new File(getWorkingDir(),p);
- if (!destination.exists()) {destination.mkdir();}
- copy(projectSrc,destination);//,false);
+ File projectSrc = new File(testdataSrcDir + File.separatorChar + p + File.separatorChar + "base");
+ File destination = new File(getWorkingDir(), p);
+ if (!destination.exists()) {
+ destination.mkdir();
+ }
+ copy(projectSrc, destination);// ,false);
// create the AjCompiler instance associated with this project
// (has id of the form c:\temp\ajcSandbox\<workspace_name>\<project_name>)
CompilerFactory.getCompilerForProjectWithDir(sandboxDir + File.separator + p);
}
/**
- * Applies an overlay onto the project being tested - copying
- * the contents of the specified overlay directory.
+ * Applies an overlay onto the project being tested - copying the contents of the specified overlay directory.
*/
- public void alter(String projectName,String overlayDirectory) {
- File projectSrc =new File(testdataSrcDir+File.separatorChar+projectName+
- File.separatorChar+overlayDirectory);
- File destination=new File(getWorkingDir(),projectName);
+ public void alter(String projectName, String overlayDirectory) {
+ File projectSrc = new File(testdataSrcDir + File.separatorChar + projectName + File.separatorChar + overlayDirectory);
+ File destination = new File(getWorkingDir(), projectName);
- if (AjdeInteractionTestbed.VERBOSE) System.out.println("Altering project "+projectName);
- copy(projectSrc,destination);
+ if (AjdeInteractionTestbed.VERBOSE)
+ System.out.println("Altering project " + projectName);
+ copy(projectSrc, destination);
}
-
+
/**
- * Copy the contents of some directory to another location - the
- * copy is recursive.
+ * Copy the contents of some directory to another location - the copy is recursive.
*/
protected void copy(File from, File to) {
String contents[] = from.list();
- if (contents==null) return;
+ if (contents == null)
+ return;
for (int i = 0; i < contents.length; i++) {
String string = contents[i];
- File f = new File(from,string);
- File t = new File(to,string);
-
+ File f = new File(from, string);
+ File t = new File(to, string);
+
if (f.isDirectory() && !f.getName().startsWith("inc")) {
t.mkdir();
- copy(f,t);
+ copy(f, t);
} else if (f.isFile()) {
StringBuffer sb = new StringBuffer();
- //if (VERBOSE) System.err.println("Copying "+f+" to "+t);
- FileUtil.copyFile(f,t,sb);
- if (sb.length()!=0) { System.err.println(sb.toString());}
- }
+ // if (VERBOSE) System.err.println("Copying "+f+" to "+t);
+ FileUtil.copyFile(f, t, sb);
+ if (sb.length() != 0) {
+ System.err.println(sb.toString());
+ }
+ }
}
}
/**
- * Count the number of times a specified aspectName appears in the default
- * aop.xml file and compare with the expected number of occurrences. If just
- * want to count the number of aspects mentioned within the file then
- * pass "" for the aspectName, otherwise, specify the name of the
- * aspect interested in.
+ * Count the number of times a specified aspectName appears in the default aop.xml file and compare with the expected number of
+ * occurrences. If just want to count the number of aspects mentioned within the file then pass "" for the aspectName,
+ * otherwise, specify the name of the aspect interested in.
*/
- protected void checkXMLAspectCount(String projectName, String aspectName,
- int expectedOccurrences, String outputDir) {
- int aspectCount = 0;
- File aopXML = new File(outputDir + File.separatorChar + "META-INF" + File.separatorChar + "aop-ajc.xml");
-
- if (!aopXML.exists()) {
- fail("Expected file " + aopXML.getAbsolutePath() + " to exist but it doesn't");
- }
- try {
- BufferedReader reader = new BufferedReader(new FileReader(aopXML));
- String line = reader.readLine();
- while (line != null) {
- if (aspectName.equals("") && line.indexOf("aspect name=\"") != -1) {
- aspectCount++;
- } else if (line.indexOf("aspect name=\""+aspectName+"\"") != -1) {
- aspectCount++;
- }
- line = reader.readLine();
- }
- reader.close();
- } catch (IOException ie) {
- ie.printStackTrace();
- }
- if (aspectCount != expectedOccurrences) {
- fail("Expected aspect " + aspectName + " to appear " + expectedOccurrences + " times" +
- " in the aop.xml file but found " + aspectCount + " occurrences");
+ protected void checkXMLAspectCount(String projectName, String aspectName, int expectedOccurrences, String outputDir) {
+ int aspectCount = 0;
+ File aopXML = new File(outputDir + File.separatorChar + "META-INF" + File.separatorChar + "aop-ajc.xml");
+
+ if (!aopXML.exists()) {
+ fail("Expected file " + aopXML.getAbsolutePath() + " to exist but it doesn't");
+ }
+ try {
+ BufferedReader reader = new BufferedReader(new FileReader(aopXML));
+ String line = reader.readLine();
+ while (line != null) {
+ if (aspectName.equals("") && line.indexOf("aspect name=\"") != -1) {
+ aspectCount++;
+ } else if (line.indexOf("aspect name=\"" + aspectName + "\"") != -1) {
+ aspectCount++;
}
+ line = reader.readLine();
}
+ reader.close();
+ } catch (IOException ie) {
+ ie.printStackTrace();
+ }
+ if (aspectCount != expectedOccurrences) {
+ fail("Expected aspect " + aspectName + " to appear " + expectedOccurrences + " times"
+ + " in the aop.xml file but found " + aspectCount + " occurrences");
+ }
+ }
}
projects / aspectj.git / commitdiff