Start fixing error where classes are loaded before java files

src/main/java/de/dhbwstuttgart/bytecode/BytecodeGen.java

@@ -8,6 +8,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 
+import de.dhbwstuttgart.environment.DirectoryClassLoader;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.FieldVisitor;
@@ -120,10 +121,10 @@ public class BytecodeGen implements ASTVisitor {
 	private GenericsGeneratorResultForClass generatedGenerics;
 
 	private Resolver resolver;
-	private final ClassLoader classLoader;
+	private final DirectoryClassLoader classLoader;
 
 	public BytecodeGen(HashMap<JavaClassName, byte[]> classFiles, Collection<ResultSet> listOfResultSets, List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles, SourceFile sf,
-					   File path, ClassLoader classLoader) {
+					   File path, DirectoryClassLoader classLoader) {
 		this.classFiles = classFiles;
 		this.listOfResultSets = listOfResultSets;
 		this.simplifyResultsForAllSourceFiles = simplifyResultsForAllSourceFiles;

src/main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java

@@ -79,13 +79,13 @@ public class BytecodeGenMethod implements StatementVisitor {
 	private int constructorPos = 0;
 
 	private ArrayList<RefTypeOrTPHOrWildcardOrGeneric> varsFunInterface = new ArrayList<>();;
-	private final ClassLoader classLoader;
+	private final DirectoryClassLoader classLoader;
 
 	// generate bytecode for constructor
 	public BytecodeGenMethod(JavaClassName className, String superClass, ResultSet resultSet, Method m, MethodVisitor mv,
 							 HashMap<String, Integer> paramsAndLocals, ClassWriter cw, HashMap<String, String> genericsAndBoundsMethod,
 							 HashMap<String, String> genericsAndBounds, boolean isInterface, HashMap<JavaClassName, byte[]> classFiles,
-							 SourceFile sf, File path, Block block, int constructorPos, ClassLoader classLoader) {
+							 SourceFile sf, File path, Block block, int constructorPos, DirectoryClassLoader classLoader) {
 
 		this.className = className;
 		this.superClass = superClass;
@@ -111,7 +111,7 @@ public class BytecodeGenMethod implements StatementVisitor {
 	
 	public BytecodeGenMethod(JavaClassName className, String superClass,ResultSet resultSet, Method m, MethodVisitor mv,
 			HashMap<String, Integer> paramsAndLocals, ClassWriter cw, HashMap<String, String> genericsAndBoundsMethod,
-			HashMap<String, String> genericsAndBounds, boolean isInterface, HashMap<JavaClassName, byte[]> classFiles, SourceFile sf,File path, ClassLoader classLoader) {
+			HashMap<String, String> genericsAndBounds, boolean isInterface, HashMap<JavaClassName, byte[]> classFiles, SourceFile sf,File path, DirectoryClassLoader classLoader) {
 
 		this.className = className;
 		this.superClass = superClass;
@@ -135,7 +135,7 @@ public class BytecodeGenMethod implements StatementVisitor {
 
 	public BytecodeGenMethod(JavaClassName className, ClassWriter cw, LambdaExpression lambdaExpression, ArrayList<String> usedVars, ResultSet resultSet, MethodVisitor mv,
 			int indexOfFirstParamLam, boolean isInterface, HashMap<JavaClassName, byte[]> classFiles, File path, int lamCounter, SourceFile sf,HashMap<String, String> genericsAndBoundsMethod,
-			HashMap<String, String> genericsAndBounds, ClassLoader classLoader) {
+			HashMap<String, String> genericsAndBounds, DirectoryClassLoader classLoader) {
 		this.className = className;
 		this.cw = cw;
 		this.resultSet = resultSet;
@@ -762,10 +762,10 @@ public class BytecodeGenMethod implements StatementVisitor {
 		String mDesc = "";
 		
 		MethodCallHelper helper = new MethodCallHelper(methodCall, sf, resultSet, path);
-		
-		ClassLoader cLoader = this.classLoader;
+
+		DirectoryClassLoader cLoader = this.classLoader;
 		// This will be used if the class is not standard class (not in API)
-		ClassLoader cLoader2;
+		DirectoryClassLoader cLoader2;
 
 		String methCallType = resultSet.resolveType(methodCall.getType()).resolvedType.acceptTV(new TypeToDescriptor());
 		String[] typesOfParams = getTypes(methodCall.arglist.getArguments());

src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java

@@ -77,7 +77,7 @@ public class JavaTXCompiler {
     public final Map<File, SourceFile> sourceFiles = new HashMap<>();
     Boolean log = true; //gibt an ob ein Log-File nach System.getProperty("user.dir")+"src/test/java/logFiles" geschrieben werden soll?
     public volatile UnifyTaskModel usedTasks = new UnifyTaskModel();
-    private final ClassLoader classLoader;
+    private final DirectoryClassLoader classLoader;
 
 	public JavaTXCompiler(File sourceFile) throws IOException, ClassNotFoundException {
 		this(Arrays.asList(sourceFile), null);

src/main/java/de/dhbwstuttgart/environment/CompilationEnvironment.java

@@ -60,7 +60,7 @@ public class CompilationEnvironment {
         this.packageCrawler = new PackageCrawler(librarys);
 	}
 
-	public JavaClassRegistry getRegistry(File forSourceFile, ClassLoader classLoader) throws ClassNotFoundException, IOException {
+	public JavaClassRegistry getRegistry(File forSourceFile, DirectoryClassLoader classLoader) throws ClassNotFoundException, IOException {
 		Map<String, Integer> allNames;
 		CompilationUnitContext tree = JavaTXParser.parse(forSourceFile);
 		allNames = GatherNames.getNames(tree, packageCrawler, classLoader);
@@ -70,7 +70,7 @@ public class CompilationEnvironment {
 		return new JavaClassRegistry(allNames);
 	}
 
-	public static List<Class> loadDefaultPackageClasses(File forSourceFile, ClassLoader classLoader) throws IOException, ClassNotFoundException {
+	public static List<Class> loadDefaultPackageClasses(File forSourceFile, DirectoryClassLoader classLoader) throws IOException, ClassNotFoundException {
 		List<Class> ret = new ArrayList<>();
 		String packageName = getPackageName(JavaTXParser.parse(forSourceFile));
 		//Set classLoader to include default package for this specific source file

src/main/java/de/dhbwstuttgart/environment/DirectoryClassLoader.java

@@ -7,13 +7,23 @@ import java.net.URLClassLoader;
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class DirectoryClassLoader extends URLClassLoader {
+public class DirectoryClassLoader {
+    private final URLClassLoader classLoader;
+
     public DirectoryClassLoader(File directory, java.lang.ClassLoader parent) {
-        super(generateURLArray(dirToURL(directory)), parent);
+        classLoader = new URLClassLoader(generateURLArray(dirToURL(directory)), parent);
     }
 
     public DirectoryClassLoader(List<File> directory, java.lang.ClassLoader parent) {
-        super(directory.stream().map(DirectoryClassLoader::dirToURL).collect(Collectors.toList()).toArray(new URL[0]), parent);
+        classLoader = new URLClassLoader(directory.stream().map(DirectoryClassLoader::dirToURL).collect(Collectors.toList()).toArray(new URL[0]), parent);
+    }
+
+    public DirectoryClassLoader(File directory, DirectoryClassLoader parent) {
+        classLoader = new URLClassLoader(generateURLArray(dirToURL(directory)), parent.classLoader);
+    }
+
+    public DirectoryClassLoader(List<File> directory, DirectoryClassLoader parent) {
+        classLoader = new URLClassLoader(directory.stream().map(DirectoryClassLoader::dirToURL).collect(Collectors.toList()).toArray(new URL[0]), parent.classLoader);
     }
 
     private static URL[] generateURLArray(URL url) {
@@ -28,4 +38,8 @@ public class DirectoryClassLoader extends URLClassLoader {
             throw new RuntimeException(e);
         }
     }
+
+    public Class loadClass(String className) throws ClassNotFoundException {
+        return classLoader.loadClass(className);
+    }
 }

src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/FCGenerator.java

@@ -1,5 +1,6 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 
+import de.dhbwstuttgart.environment.DirectoryClassLoader;
 import de.dhbwstuttgart.exceptions.DebugException;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
@@ -22,11 +23,11 @@ public class FCGenerator {
      *
      * @param availableClasses - Alle geparsten Klassen
      */
-    public static Set<UnifyPair> toUnifyFC(Collection<ClassOrInterface> availableClasses, ClassLoader classLoader) throws ClassNotFoundException {
+    public static Set<UnifyPair> toUnifyFC(Collection<ClassOrInterface> availableClasses, DirectoryClassLoader classLoader) throws ClassNotFoundException {
         return toFC(availableClasses, classLoader).stream().map(t -> UnifyTypeFactory.convert(t)).collect(Collectors.toSet());
     }
 
-    public static Set<Pair> toFC(Collection<ClassOrInterface> availableClasses, ClassLoader classLoader) throws ClassNotFoundException {
+    public static Set<Pair> toFC(Collection<ClassOrInterface> availableClasses, DirectoryClassLoader classLoader) throws ClassNotFoundException {
         HashSet<Pair> pairs = new HashSet<>();
         //PL 2018-09-18: gtvs vor die for-Schleife gezogen, damit immer die gleichen Typeplaceholder eingesetzt werden.
         HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> gtvs = new HashMap<>();
@@ -48,7 +49,7 @@ public class FCGenerator {
      * @param forType
      * @return
      */
-    private static List<Pair> getSuperTypes(ClassOrInterface forType, Collection<ClassOrInterface> availableClasses, ClassLoader classLoader) throws ClassNotFoundException {
+    private static List<Pair> getSuperTypes(ClassOrInterface forType, Collection<ClassOrInterface> availableClasses, DirectoryClassLoader classLoader) throws ClassNotFoundException {
         return getSuperTypes(forType, availableClasses, new HashMap<>(), classLoader);
     }
 
@@ -61,7 +62,7 @@ public class FCGenerator {
      * @throws ClassNotFoundException
      */
     private static List<Pair> getSuperTypes(ClassOrInterface forType, Collection<ClassOrInterface> availableClasses,
-                                            HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> gtvs, ClassLoader classLoader) throws ClassNotFoundException {
+                                            HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> gtvs, DirectoryClassLoader classLoader) throws ClassNotFoundException {
         List<RefTypeOrTPHOrWildcardOrGeneric> params = new ArrayList<>();
         //Die GTVs, die in forType hinzukommen:
         HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> newGTVs = new HashMap<>();

src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java

@@ -1,5 +1,6 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 
+import de.dhbwstuttgart.environment.DirectoryClassLoader;
 import de.dhbwstuttgart.environment.PackageCrawler;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import java.lang.ClassNotFoundException;
@@ -75,7 +76,7 @@ public class SyntaxTreeGenerator{
     return ret;
   }
   
-  public SourceFile convert(Java8Parser.CompilationUnitContext ctx, PackageCrawler packageCrawler, ClassLoader classLoader) throws ClassNotFoundException{
+  public SourceFile convert(Java8Parser.CompilationUnitContext ctx, PackageCrawler packageCrawler, DirectoryClassLoader classLoader) throws ClassNotFoundException{
     if(ctx.packageDeclaration()!=null)this.pkgName = convert(ctx.packageDeclaration());
     List<ClassOrInterface> classes = new ArrayList<>();
     Map<String, Integer> imports = GatherNames.getImports(ctx, packageCrawler, classLoader);

src/main/java/de/dhbwstuttgart/parser/scope/GatherNames.java

@@ -4,6 +4,7 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.*;
 
+import de.dhbwstuttgart.environment.DirectoryClassLoader;
 import de.dhbwstuttgart.parser.antlr.Java8BaseListener;
 import de.dhbwstuttgart.syntaxtree.AbstractASTWalker;
 import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
@@ -15,7 +16,7 @@ import de.dhbwstuttgart.parser.antlr.Java8Parser;
 
 public class GatherNames {
 
-	  public static Map<String, Integer> getNames(Java8Parser.CompilationUnitContext ctx, PackageCrawler packages, ClassLoader classLoader) throws ClassNotFoundException{
+	  public static Map<String, Integer> getNames(Java8Parser.CompilationUnitContext ctx, PackageCrawler packages, DirectoryClassLoader classLoader) throws ClassNotFoundException{
 		  Map<String, Integer> ret = new HashMap<>();
 	    String pkgName = getPackageName(ctx);
 	    String nameString = "";
@@ -68,7 +69,7 @@ public class GatherNames {
 		  return ret;
 	  }
 
-	public static Map<String, Integer> getImports(Java8Parser.CompilationUnitContext ctx, PackageCrawler packages, ClassLoader classLoader) throws ClassNotFoundException {
+	public static Map<String, Integer> getImports(Java8Parser.CompilationUnitContext ctx, PackageCrawler packages, DirectoryClassLoader classLoader) throws ClassNotFoundException {
 		  Map<String, Integer> ret = new HashMap<>();
 		  //ret.putAll(packages.getClassNames("java.lang"));
 		  for(Java8Parser.ImportDeclarationContext importDeclCtx : ctx.importDeclaration()){

src/main/java/de/dhbwstuttgart/sat/asp/writer/ASPFactory.java

@@ -1,5 +1,6 @@
 package de.dhbwstuttgart.sat.asp.writer;
 
+import de.dhbwstuttgart.environment.DirectoryClassLoader;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.FCGenerator;
 import de.dhbwstuttgart.sat.asp.ASPStringConverter;
@@ -16,7 +17,7 @@ import java.util.*;
 
 public class ASPFactory implements TypeVisitor<String>{
 
-    public static String generateASP(ConstraintSet<Pair> constraints, Collection<ClassOrInterface> fcClasses, ClassLoader classLoader) throws ClassNotFoundException{
+    public static String generateASP(ConstraintSet<Pair> constraints, Collection<ClassOrInterface> fcClasses, DirectoryClassLoader classLoader) throws ClassNotFoundException{
         ASPFactory factory = new ASPFactory();
         factory.convertFC(fcClasses, classLoader);
         List<Constraint<Pair>> constraints1 = constraints.cartesianProduct().iterator().next();
@@ -32,7 +33,7 @@ public class ASPFactory implements TypeVisitor<String>{
     ASPWriter writer = new ASPWriter();
     boolean isFCType = false;
 
-    private void convertFC(Collection<ClassOrInterface> classes, ClassLoader classLoader) throws ClassNotFoundException {
+    private void convertFC(Collection<ClassOrInterface> classes, DirectoryClassLoader classLoader) throws ClassNotFoundException {
         Set<Pair> fc = FCGenerator.toFC(classes, classLoader);
         isFCType = true;
         for(Pair fcp : fc){

src/main/java/de/dhbwstuttgart/sat/asp/writer/ASPGencayFactory.java

@@ -1,5 +1,6 @@
 package de.dhbwstuttgart.sat.asp.writer;
 
+import de.dhbwstuttgart.environment.DirectoryClassLoader;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.FCGenerator;
 import de.dhbwstuttgart.sat.asp.ASPStringConverter;
@@ -55,7 +56,7 @@ public class ASPGencayFactory implements TypeVisitor<String> {
         return ret;
     }
 
-    public static String generateASP(ConstraintSet<Pair> constraints, Collection<ClassOrInterface> fcClasses, ClassLoader classLoader) throws ClassNotFoundException{
+    public static String generateASP(ConstraintSet<Pair> constraints, Collection<ClassOrInterface> fcClasses, DirectoryClassLoader classLoader) throws ClassNotFoundException{
         ASPGencayFactory factory = new ASPGencayFactory();
         factory.convertFC(fcClasses, classLoader);
         List<Constraint<Pair>> constraints1 = constraints.cartesianProduct().iterator().next();
@@ -69,7 +70,7 @@ public class ASPGencayFactory implements TypeVisitor<String> {
         return factory.writer.getASPFile();
     }
 
-    private void convertFC(Collection<ClassOrInterface> classes, ClassLoader classLoader) throws ClassNotFoundException {
+    private void convertFC(Collection<ClassOrInterface> classes, DirectoryClassLoader classLoader) throws ClassNotFoundException {
         Set<Pair> fc = FCGenerator.toFC(classes, classLoader);
         isFCType = true;
         for(Pair fcp : fc){

src/main/java/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java

@@ -7,6 +7,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import de.dhbwstuttgart.environment.DirectoryClassLoader;
 import de.dhbwstuttgart.exceptions.DebugException;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.NullToken;
@@ -31,7 +32,7 @@ public class UnifyTypeFactory {
 	
 	private static ArrayList<PlaceholderType> PLACEHOLDERS = new ArrayList<>(); 
 
-    public static FiniteClosure generateFC(List<ClassOrInterface> fromClasses, Writer logFile, ClassLoader classLoader) throws ClassNotFoundException {
+    public static FiniteClosure generateFC(List<ClassOrInterface> fromClasses, Writer logFile, DirectoryClassLoader classLoader) throws ClassNotFoundException {
         /*
         Die transitive Hülle muss funktionieren.
         Man darf schreiben List<A> extends AL<A>

src/test/java/asp/ClingoTest.java

@@ -1,52 +0,0 @@
-package asp;
-
-import de.dhbwstuttgart.parser.NullToken;
-import de.dhbwstuttgart.sat.asp.parser.ASPParser;
-import de.dhbwstuttgart.sat.asp.writer.ASPFactory;
-import de.dhbwstuttgart.sat.asp.Clingo;
-import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
-import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.constraints.Pair;
-import de.dhbwstuttgart.typeinference.result.ResultSet;
-import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
-import org.junit.Test;
-
-import javax.json.Json;
-import javax.json.JsonObject;
-import java.io.*;
-import java.util.*;
-
-public class ClingoTest {
-    public static final String tempDirectory = "/tmp/";
-    private final TypePlaceholder testType = TypePlaceholder.fresh(new NullToken());
-    @Test
-    public void test() throws IOException, InterruptedException, ClassNotFoundException {
-        String content = "";
-        content = ASPFactory.generateASP(this.getPairs(), this.getFC(), ClassLoader.getSystemClassLoader());
-        
-        PrintWriter writer = new PrintWriter(tempDirectory + "test.lp", "UTF-8");
-        writer.println(content);
-        writer.close();
-
-        Clingo clingo = new Clingo(Arrays.asList(new File(tempDirectory + "test.lp")));
-        String result = clingo.runClingo();
-        System.out.println(result);
-        ResultSet resultSet = ASPParser.parse(result, Arrays.asList(testType));
-        RefTypeOrTPHOrWildcardOrGeneric resolvedType = resultSet.resolveType(testType).resolvedType;
-        assert resolvedType.toString().equals(ASTFactory.createObjectType().toString());
-    }
-
-    public Collection<ClassOrInterface> getFC() {
-        Set<ClassOrInterface> ret = new HashSet<>();
-        return ret;
-    }
-
-    public ConstraintSet<Pair> getPairs() {
-        ConstraintSet<Pair> ret = new ConstraintSet<>();
-        ret.addUndConstraint(new Pair(testType, ASTFactory.createObjectType(), PairOperator.EQUALSDOT));
-        return ret;
-    }
-}

src/test/java/asp/UnifyWithoutWildcards.java

@@ -1,103 +0,0 @@
-package asp;
-
-import de.dhbwstuttgart.parser.NullToken;
-import de.dhbwstuttgart.parser.scope.JavaClassName;
-import de.dhbwstuttgart.sat.asp.Clingo;
-import de.dhbwstuttgart.sat.asp.parser.ASPParser;
-import de.dhbwstuttgart.sat.asp.writer.ASPFactory;
-import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
-import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
-import de.dhbwstuttgart.syntaxtree.type.*;
-import de.dhbwstuttgart.syntaxtree.visual.ResultSetPrinter;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.constraints.Pair;
-import de.dhbwstuttgart.typeinference.result.ResultSet;
-import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.sql.Ref;
-import java.util.*;
-
-public class UnifyWithoutWildcards {
-
-    public static final String tempDirectory = "/tmp/";
-
-    @Test
-    public void adapt() throws InterruptedException, IOException, ClassNotFoundException {
-        ConstraintSet<Pair> testSet = new ConstraintSet<>();
-        List<RefTypeOrTPHOrWildcardOrGeneric> list1 = Arrays.asList(TypePlaceholder.fresh(new NullToken()));
-        List<RefTypeOrTPHOrWildcardOrGeneric> list2 = Arrays.asList(TypePlaceholder.fresh(new NullToken()),TypePlaceholder.fresh(new NullToken()));
-        RefType t1 = new RefType(new JavaClassName("asp.UnifyWithoutWildcards$Matrix"), list1, new NullToken());
-        RefType t2 = new RefType(new JavaClassName("java.util.HashMap"), list2, new NullToken());
-        testSet.addUndConstraint(new Pair(t1, t2, PairOperator.SMALLERDOT));
-        ResultSet resultSet = run(testSet);
-        System.out.println(ResultSetPrinter.print(resultSet));
-        assert resultSet.results.size() > 0;
-    }
-
-    public ResultSet run(ConstraintSet<Pair> toTest) throws IOException, InterruptedException, ClassNotFoundException {
-        String content = "";
-        content = ASPFactory.generateASP(toTest, this.getFC(), ClassLoader.getSystemClassLoader());
-
-        PrintWriter writer = new PrintWriter(tempDirectory + "test.lp", "UTF-8");
-        writer.println(content);
-        writer.close();
-        Clingo clingo = new Clingo(Arrays.asList(new File(tempDirectory + "test.lp")));
-        String result = clingo.runClingo();
-        ResultSet resultSet = ASPParser.parse(result, getInvolvedTPHS(toTest));
-        return resultSet;
-    }
-
-    private static class TPHExtractor implements TypeVisitor<List<TypePlaceholder>>{
-        @Override
-        public List<TypePlaceholder> visit(RefType refType) {
-            ArrayList<TypePlaceholder> ret = new ArrayList<>();
-            for(RefTypeOrTPHOrWildcardOrGeneric param : refType.getParaList()){
-                ret.addAll(param.acceptTV(this));
-            }
-            return ret;
-        }
-
-        @Override
-        public List<TypePlaceholder> visit(SuperWildcardType superWildcardType) {
-            return superWildcardType.getInnerType().acceptTV(this);
-        }
-
-        @Override
-        public List<TypePlaceholder> visit(TypePlaceholder typePlaceholder) {
-            return Arrays.asList(typePlaceholder);
-        }
-
-        @Override
-        public List<TypePlaceholder> visit(ExtendsWildcardType extendsWildcardType) {
-            return extendsWildcardType.getInnerType().acceptTV(this);
-        }
-
-        @Override
-        public List<TypePlaceholder> visit(GenericRefType genericRefType) {
-            return new ArrayList<>();
-        }
-    }
-
-    protected Collection<TypePlaceholder> getInvolvedTPHS(ConstraintSet<Pair> toTest) {
-        List<TypePlaceholder> ret = new ArrayList<>();
-        toTest.map((Pair p)-> {
-            ret.addAll(p.TA1.acceptTV(new TPHExtractor()));
-            ret.addAll(p.TA2.acceptTV(new TPHExtractor()));
-            return p;
-        });
-        return ret;
-    }
-
-    private Collection<ClassOrInterface> getFC() {
-        Set<ClassOrInterface> ret = new HashSet<>();
-        ret.add(ASTFactory.createClass(Matrix.class));
-        //ret.add(ASTFactory.createObjectClass());
-        //ret.add(ASTFactory.createClass(java.util.List.class));
-        return ret;
-    }
-    private class Matrix<A> extends HashMap<A,Map<Integer, A>>{}
-}

src/test/java/asp/gencay/GeneratorTest.java

@@ -1,63 +0,0 @@
-package asp.gencay;
-
-import asp.UnifyWithoutWildcards;
-import de.dhbwstuttgart.parser.NullToken;
-import de.dhbwstuttgart.parser.scope.JavaClassName;
-import de.dhbwstuttgart.sat.asp.Clingo;
-import de.dhbwstuttgart.sat.asp.parser.ASPParser;
-import de.dhbwstuttgart.sat.asp.writer.ASPFactory;
-import de.dhbwstuttgart.sat.asp.writer.ASPGencayFactory;
-import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
-import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.syntaxtree.visual.ResultSetPrinter;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.constraints.Pair;
-import de.dhbwstuttgart.typeinference.result.ResultSet;
-import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.*;
-import java.util.concurrent.ArrayBlockingQueue;
-
-public class GeneratorTest extends UnifyWithoutWildcards{
-    @Test
-    public void simple() throws ClassNotFoundException {
-        ConstraintSet<Pair> testSet = new ConstraintSet<>();
-        List<RefTypeOrTPHOrWildcardOrGeneric> list1 = Arrays.asList(TypePlaceholder.fresh(new NullToken()));
-        List<RefTypeOrTPHOrWildcardOrGeneric> list2 = Arrays.asList(TypePlaceholder.fresh(new NullToken()));
-        RefType t1 = new RefType(new JavaClassName("java.util.List"), list1, new NullToken());
-        RefType t2 = new RefType(new JavaClassName("java.util.List"), list2, new NullToken());
-        testSet.addUndConstraint(new Pair(t1, t2, PairOperator.SMALLERDOT));
-        String resultSet = ASPGencayFactory.generateASP(testSet,
-                new HashSet<>(Arrays.asList(ASTFactory.createClass(List.class))), ClassLoader.getSystemClassLoader());
-        System.out.println(resultSet);
-    }
-
-    @Test
-    public void matrix() throws ClassNotFoundException {
-        ConstraintSet<Pair> testSet = new ConstraintSet<>();
-        List<RefTypeOrTPHOrWildcardOrGeneric> list1 = Arrays.asList(TypePlaceholder.fresh(new NullToken()));
-        List<RefTypeOrTPHOrWildcardOrGeneric> list2 = Arrays.asList(TypePlaceholder.fresh(new NullToken()),TypePlaceholder.fresh(new NullToken()));
-        RefType t1 = new RefType(new JavaClassName("asp.UnifyWithoutWildcards$Matrix"), list1, new NullToken());
-        RefType t2 = new RefType(new JavaClassName("java.util.HashMap"), list2, new NullToken());
-        testSet.addUndConstraint(new Pair(t1, t2, PairOperator.SMALLERDOT));
-        String resultSet = ASPGencayFactory.generateASP(testSet, this.getFC(), ClassLoader.getSystemClassLoader());
-        System.out.println(resultSet);
-    }
-
-    private Collection<ClassOrInterface> getFC() {
-        Set<ClassOrInterface> ret = new HashSet<>();
-        ret.add(ASTFactory.createClass(Matrix.class));
-        //ret.add(ASTFactory.createObjectClass());
-        //ret.add(ASTFactory.createClass(java.util.List.class));
-        return ret;
-    }
-}
-
-class Matrix extends Vector<Vector<Integer>> {}

src/test/java/asp/typeinference/ASPTest.java

@@ -1,70 +0,0 @@
-package asp.typeinference;
-
-import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.sat.asp.writer.ASPFactory;
-import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.constraints.Pair;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class ASPTest {
-
-    public static final String rootDirectory = System.getProperty("user.dir")+"/src/test/resources/javFiles/";
-    private static final List<File> filesToTest = new ArrayList<>();
-    protected File fileToTest = null;
-
-    public ASPTest(){
-    }
-
-
-    @Test
-    public void test() throws IOException, ClassNotFoundException {
-        if(fileToTest != null)filesToTest.add(fileToTest);
-        else return;
-        //filesToTest.add(new File(rootDirectory+"Faculty.jav"));
-        //filesToTest.add(new File(rootDirectory+"mathStruc.jav"));
-        //filesToTest.add(new File(rootDirectory+"test.jav"));
-        filesToTest.add(new File(rootDirectory+"EmptyMethod.jav"));
-        //filesToTest.add(new File(rootDirectory+"fc.jav"));
-        //filesToTest.add(new File(rootDirectory+"Lambda.jav"));
-        //filesToTest.add(new File(rootDirectory+"Lambda2.jav"));
-        //filesToTest.add(new File(rootDirectory+"Lambda3.jav"));
-        //filesToTest.add(new File(rootDirectory+"Vector.jav"));
-        //filesToTest.add(new File(rootDirectory+"Generics.jav"));
-        //filesToTest.add(new File(rootDirectory+"MethodsEasy.jav"));
-        //filesToTest.add(new File(rootDirectory+"Matrix.jav"));
-        //filesToTest.add(new File(rootDirectory+"Import.jav"));
-        JavaTXCompiler compiler = new JavaTXCompiler(fileToTest);
-        Set<ClassOrInterface> allClasses = new HashSet<>();
-        for(SourceFile sf : compiler.sourceFiles.values()) {
-            allClasses.addAll(compiler.getAvailableClasses(sf));
-        }
-        for(SourceFile sf : compiler.sourceFiles.values()) {
-            allClasses.addAll(sf.getClasses());
-        }
-
-        final ConstraintSet<Pair> cons = compiler.getConstraints();
-        String asp = ASPFactory.generateASP(cons, allClasses, ClassLoader.getSystemClassLoader());
-        System.out.println(asp);
-    }
-
-    static String readFile(String path, Charset encoding)
-            throws IOException
-    {
-        byte[] encoded = Files.readAllBytes(Paths.get(path));
-        return new String(encoded, encoding);
-    }
-
-}
-

src/test/java/asp/typeinference/GenericsTest.java

@@ -1,9 +0,0 @@
-package asp.typeinference;
-
-import java.io.File;
-
-public class GenericsTest extends ASPTest {
-    public GenericsTest() {
-        this.fileToTest = new File(rootDirectory+"Generics.jav");
-    }
-}

src/test/java/asp/typeinference/VectorTest.java

@@ -1,9 +0,0 @@
-package asp.typeinference;
-
-import java.io.File;
-
-public class VectorTest extends ASPTest {
-    public VectorTest() {
-        this.fileToTest = new File(rootDirectory+"Vector.jav");
-    }
-}

src/test/java/asp/unifywithoutwildcards/ASPTests.java

@@ -1,10 +0,0 @@
-package asp.unifywithoutwildcards;
-
-import org.junit.Test;
-
-public class ASPTests {
-    @Test
-    public void test(){
-
-    }
-}