cleaning after test run added

converter-SBGNML/src/test/java/lcsb/mapviewer/converter/model/sbgnml/CellDesignerToSbgnTest.java

@@ -2,16 +2,16 @@ package lcsb.mapviewer.converter.model.sbgnml;
 
 import java.io.File;
 
-import lcsb.mapviewer.converter.ConverterParams;
-import lcsb.mapviewer.converter.IConverter;
-import lcsb.mapviewer.converter.model.celldesigner.CellDesignerXmlParser;
-import lcsb.mapviewer.model.map.model.Model;
-
 import org.apache.log4j.Logger;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import lcsb.mapviewer.converter.ConverterParams;
+import lcsb.mapviewer.converter.IConverter;
+import lcsb.mapviewer.converter.model.celldesigner.CellDesignerXmlParser;
+import lcsb.mapviewer.model.map.model.Model;
+
 public class CellDesignerToSbgnTest {
 	Logger logger = Logger.getLogger(CellDesignerToSbgnTest.class);
 
@@ -34,6 +34,7 @@ public class CellDesignerToSbgnTest {
 
 			String output = File.createTempFile("temp-sbgn-output", ".sbgn").getAbsolutePath();
 			converter2.exportModelToFile(model, output);
+			new File(output).delete();
 		} catch (Exception e) {
 			e.printStackTrace();
 			throw e;
@@ -51,6 +52,7 @@ public class CellDesignerToSbgnTest {
 
 			String output = File.createTempFile("temp-sbgn-output", ".sbgn").getAbsolutePath();
 			converter2.exportModelToFile(model, output);
+			new File(output).delete();
 		} catch (Exception e) {
 			e.printStackTrace();
 			throw e;

converter-SBGNML/src/test/java/lcsb/mapviewer/converter/model/sbgnml/SbgnmlXmlParserTest.java

@@ -4,6 +4,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -13,6 +14,7 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Logger;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -53,6 +55,8 @@ public class SbgnmlXmlParserTest {
 	@Test
 	public void createModelTest() throws Exception {
 		try {
+			String dir = Files.createTempDirectory("sbgn-temp-images-dir").toFile().getAbsolutePath();
+
 			IConverter converter = new SbgnmlXmlConverter();
 
 			Model model = converter.createModel(new ConverterParams().filename(filePath.toString()));
@@ -61,39 +65,27 @@ public class SbgnmlXmlParserTest {
 			AbstractImageGenerator.Params params = new AbstractImageGenerator.Params()
 					.height(model.getHeight()).width(model.getWidth()).nested(true).scale(1).level(20).x(0).y(0).model(model);
 			NormalImageGenerator nig = new PngImageGenerator(params);
-			String pngFilePath = Files
-					.createTempDirectory("sbgn-temp-images-dir").toFile().getAbsolutePath()
-					.concat(filePath.getFileName().toString().substring(0, filePath.getFileName().toString().indexOf(".sbgn"))).concat(".png");
-			// String pngFilePath = filePath.toString().substring(0,
-			// filePath.toString().indexOf(".sbgn")).concat(".png");
-			logger.debug(pngFilePath);
+			String pngFilePath = dir + "/".concat(filePath.getFileName().toString().substring(0, filePath.getFileName().toString().indexOf(".sbgn"))).concat(".png");
 			nig.saveToFile(pngFilePath);
 
 			CellDesignerXmlParser cellDesignerXmlParser = new CellDesignerXmlParser();
 			String xmlString = cellDesignerXmlParser.toXml(model);
 
-			String cellDesignerFilePath = Files
-					.createTempDirectory("sbgn-temp-dir").toFile().getAbsolutePath()
-					.concat(filePath.getFileName().toString().substring(0, filePath.getFileName().toString().indexOf(".sbgn"))).concat(".xml");
+			String cellDesignerFilePath = dir
+					+ "/".concat(filePath.getFileName().toString().substring(0, filePath.getFileName().toString().indexOf(".sbgn"))).concat(".xml");
 			PrintWriter out = new PrintWriter(cellDesignerFilePath);
 			out.print(xmlString);
 			out.close();
 
 			InputStream is = new ByteArrayInputStream(xmlString.getBytes("UTF-8"));
-			// InputStream is = new
-			// FileInputStream("testFiles/CellDesignerUnitOfInformationTest.xml");
 
 			Model model2 = cellDesignerXmlParser.createModel(new ConverterParams().inputStream(is).sizeAutoAdjust(false));
 
 			AbstractImageGenerator.Params params2 = new AbstractImageGenerator.Params()
 					.height(model2.getHeight()).width(model2.getWidth()).nested(true).scale(1).level(20).x(0).y(0).model(model2);
 			NormalImageGenerator nig2 = new PngImageGenerator(params2);
-			String pngFilePath2 = Files
-					.createTempDirectory("sbgn-temp-images-dir2").toFile().getAbsolutePath()
-					.concat(filePath.getFileName().toString().substring(0, filePath.getFileName().toString().indexOf(".sbgn"))).concat("_2.png");
-			// String pngFilePath2 = filePath.toString().substring(0,
-			// filePath.toString().indexOf(".sbgn")).concat("_2.png");
-			logger.debug(pngFilePath2);
+			String pngFilePath2 = dir
+					+ "/".concat(filePath.getFileName().toString().substring(0, filePath.getFileName().toString().indexOf(".sbgn"))).concat("_2.png");
 			nig2.saveToFile(pngFilePath2);
 
 			assertNotNull(model2);
@@ -116,8 +108,12 @@ public class SbgnmlXmlParserTest {
 			// logger.debug("--");
 			// }
 
+			// logger.debug(pngFilePath);
+			// logger.debug(pngFilePath2);
 			ModelComparator comparator = new ModelComparator(1.0);
 			assertEquals(0, comparator.compare(model, model2));
+			FileUtils.deleteDirectory(new File(dir));
+
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();