Merge branch 'master' of git.scc.kit.edu:py8074/dibugger

src/test/debuglogic/interpreter/commands/RoutineCallTest.java

 package test.debuglogic.interpreter.commands;
 
-import static org.junit.Assert.*;
-
 import java.util.ArrayList;
 
 import org.junit.Test;

src/test/debuglogic/interpreter/commands/RoutineCommandTest.java

 package test.debuglogic.interpreter.commands;
 
-import static org.junit.Assert.*;
-
 import java.util.ArrayList;
-import java.util.List;
 
 import org.junit.Test;
 

src/test/dibugger/control/FileHandlerInteractorTest.java

 package test.dibugger.control;
 
-import static org.junit.Assert.*;
-
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.argThat;
@@ -15,7 +13,6 @@ import java.io.File;
 import java.io.IOException;
 
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 
 import org.junit.*;

src/test/filehandler/FileHandlerTest.java

@@ -3,11 +3,8 @@ package test.filehandler;
 import java.io.File;
 import static test.filehandler.FileHandlerTestUtilities.*;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.SplittableRandom;
 
 import org.junit.Ignore;
@@ -17,9 +14,7 @@ import static org.junit.Assert.*;
 import dibugger.filehandler.exceptions.FileHandlerException;
 import dibugger.filehandler.facade.ConfigurationFile;
 import dibugger.filehandler.facade.FileHandlerFacade;
-import dibugger.filehandler.facade.LanguageFile;
 import dibugger.filehandler.facade.PropertiesFile;
-import dibugger.filehandler.rdbf.RDBFAdditions;
 import dibugger.filehandler.rdbf.RDBFBlock;
 import dibugger.filehandler.rdbf.RDBFDBReader;
 import dibugger.filehandler.rdbf.RDBFDBWriter;
@@ -80,7 +75,8 @@ public class FileHandlerTest {
     @Test
     @Ignore
     public void testRDBFLanguage() throws FileHandlerException {
-        RDBFDBReader reader = new RDBFDBReader();
+        // RDBFDBReader reader =
+        new RDBFDBReader();
 //        LanguageFile f = reader.loadLanguageFile(new File("res/testing/lang_test_in.txt"));
     }
     

src/test/filehandler/LanguageEditor.java

@@ -15,7 +15,6 @@ import javax.swing.event.ListSelectionListener;
 
 import dibugger.filehandler.exceptions.FileHandlerException;
 import dibugger.filehandler.facade.LanguageFile;
-import dibugger.filehandler.rdbf.RDBFDBReader;
 import dibugger.filehandler.rdbf.RDBFDBWriter;
 
 public class LanguageEditor {

src/test/filehandler/RDBFTest.java

@@ -24,7 +24,6 @@ import static test.filehandler.FileHandlerTestUtilities.*;
 
 import java.io.File;
 import java.io.IOException;
-import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -179,16 +178,17 @@ public class RDBFTest {
 		
 		writer.saveProperties(p);
 		
-		String data = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\r\n"
+		/*String data = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\r\n"
 				+ "<!DOCTYPE properties SYSTEM \"http://java.sun.com/dtd/properties.dtd\">\r\n"
 				+ "<properties>\r\n"
 				+ "<entry key=\"maxFuncCalls\">100</entry>\r\n"
 				+ "<entry key=\"configFileLoc\">res/helloWorld.rdbf</entry>\r\n"
 				+ "<entry key=\"maxWhileIterations\">100</entry>\r\n"
 				+ "<entry key=\"language\">german</entry>\r\n"
-				+ "</properties>\r\n";
+				+ "</properties>\r\n";*/
 		byte[] b = Files.readAllBytes(Paths.get(PropertiesFile.DEFAULT_LOCATION.toURI()));
-		String file = new String(b, "UTF-8");
+		// String file =
+		new String(b, "UTF-8");
 		
 //		assertEquals(data, file);//TODO ignore on linux
 	}

src/test/userinterface/WatchExpressionPanelTest.java

@@ -2,8 +2,6 @@ package test.userinterface;
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 /**
  * Created by joana on 22.01.2018.
  */