updated TestDataGenerator to create lists with strings instead of files

Author: steffenjacobs

…acobs/jsonmatcher/TestFileGenerator.java …acobs/jsonmatcher/TestDataGenerator.javasrc/main/java/me/steffenjacobs/jsonmatcher/TestFileGenerator.java renamed to src/main/java/me/steffenjacobs/jsonmatcher/TestDataGenerator.java src/main/java/me/steffenjacobs/jsonmatcher/TestFileGenerator.java renamed to src/main/java/me/steffenjacobs/jsonmatcher/TestDataGenerator.java

@@ -1,13 +1,11 @@
 package me.steffenjacobs.jsonmatcher;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
 import java.util.Collection;
 import java.util.LinkedList;
+import java.util.List;
 
 /** @author Steffen Jacobs */
-public class TestFileGenerator {
+public class TestDataGenerator {
 	private static final String[] KEYS_TEMPERATURE = new String[] { "temperature", "temp", "t", "temperatura", "Temperatur", "temperatur" };
 	private static final String[] VALUES_TEMPERATURE = new String[] { "23", "\"23\"", "23.1", "\"23.1\"", "23°F", "23°C", "23.1°F" };
 
@@ -25,18 +23,14 @@ public class TestFileGenerator {
 
 	private static final double RANDOM_SAMPLING_RATE = .00008;
 
-	public static void main(String[] args) throws FileNotFoundException {
-		new TestFileGenerator().generateFull("all.lst");
-	}
-
-	public void generateFull(String filename) throws FileNotFoundException {
+	public List<String> generateSampled() {
 		Collection<String> temperature = getAllPermutations(KEYS_TEMPERATURE, VALUES_TEMPERATURE);
 		Collection<String> humidity = getAllPermutations(KEYS_HUMIDITY, VALUES_HUMIDITY);
 		Collection<String> pressure = getAllPermutations(KEYS_PRESSURE, VALUES_PRESSURE);
 		Collection<String> co2 = getAllPermutations(KEYS_CO2, VALUES_CO2);
 		Collection<String> light = getAllPermutations(KEYS_LIGHT, VALUES_LIGHT);
 
-		final PrintWriter printWriter = new PrintWriter(new File(filename));
+		final List<String> result = new LinkedList<>();
 
 		for (String temp : temperature) {
 			StringBuilder sbT = new StringBuilder("{");
@@ -59,15 +53,15 @@ public void generateFull(String filename) throws FileNotFoundException {
 								StringBuilder sb = new StringBuilder(sbC);
 								sb.append(l);
 								sb.append("}");
-								printWriter.println(sb.toString());
+								result.add(sb.toString());
 							}
 						}
 					}
 				}
 			}
 		}
 
-		printWriter.close();
+		return result;
 	}
 
 	private Collection<String> getAllPermutations(String[] keys, String[] values) {

src/test/java/me/steffenjacobs/jsonmatcher/TestMapperWithBigList.java

@@ -19,8 +19,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import me.steffenjacobs.jsonmatcher.Mapper;
-import me.steffenjacobs.jsonmatcher.TestFileGenerator;
 import me.steffenjacobs.jsonmatcher.domain.MappingDTO;
 import me.steffenjacobs.jsonmatcher.service.PrintingService;
 
@@ -70,23 +68,22 @@ public static void initAllowedMappings() {
 
 	@Test
 	public void testMapperWithBigList() throws IOException, URISyntaxException {
-		File f = new File("all.list");
-		new TestFileGenerator().generateFull("all.lst");
-		testForList("all.lst");
-
-		f.delete();
+		testForList(new TestDataGenerator().generateSampled());
 	}
 
 	private boolean isMappingAllowed(MappingDTO<Object, Object> mapping) {
 		return allowedMappings.get(mapping.getKeySource()).contains(mapping.getKeyTarget());
 	}
 
-	public void testForList(String listFile) throws IOException, URISyntaxException {
+	public void testForFile(String listFile) throws IOException, URISyntaxException {
+		testForList(Files.readAllLines(new File(listFile).toPath()));
+	}
+
+	public void testForList(List<String> lines) {
 
 		long countTotalMappings = 0;
 		long countErrors = 0;
 
-		List<String> lines = Files.readAllLines(new File(listFile).toPath());
 		lines = lines.stream().filter(l -> !"".equals(l)).collect(Collectors.toList());
 		List<String> lines2 = new ArrayList<>(lines);
 		LOG.info("Checking mapper for {} permutations...", lines.size() * lines2.size());
@@ -106,7 +103,7 @@ public void testForList(String listFile) throws IOException, URISyntaxException
 					} catch (AssertionError error) {
 						countErrors++;
 						if (PRINT_ERRORS) {
-							System.out.println("Bad mapping: " + mapping.getKeySource() + " -> " + mapping.getKeyTarget() + " (" + listFile + ")");
+							System.out.println("Bad mapping: " + mapping.getKeySource() + " -> " + mapping.getKeyTarget());
 							for (MappingDTO<Object, Object> m : mappings) {
 								System.out.println(printingService.mappingToString(line, line2, m, SHOW_JSON));
 							}