rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

only:preparation for new test

This commit is contained in:
rusefillc 2023-09-10 11:17:14 -04:00
parent 093b2d5bf2
commit 94f6138735
3 changed files with 72 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
java_tools/configuration_definition/src/main/java/com/rusefi/pinout/FileSystemBoardInputsImpl.java
View File

@ -1,61 +1,12 @@
package com.rusefi.pinout;
import com.devexperts.logging.Logging;
import java.io.*;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import static com.devexperts.logging.Logging.getLogging;
public class FileSystemBoardInputsImpl implements BoardInputs {
private static final Logging log = getLogging(FileSystemBoardInputsImpl.class);
private final String boardName;
private final List<File> boardYamlFiles;
public class FileSystemBoardInputsImpl extends FileSystemBoardInputsReaderImpl {
public FileSystemBoardInputsImpl(String boardName) {
this.boardName = boardName;
String dirPath = boardName + PinoutLogic.CONNECTORS;
File dirName = new File(dirPath);
FilenameFilter filter = (f, name) -> name.endsWith(".yaml");
File[] boardYamlFilesArray = dirName.listFiles(filter);
if (boardYamlFilesArray == null) {
log.info("No yaml files in " + dirPath);
boardYamlFiles = Collections.emptyList();
return;
}
Arrays.sort(boardYamlFilesArray);
log.info(boardName + ": " + Arrays.toString(boardYamlFilesArray));
boardYamlFiles = Arrays.asList(boardYamlFilesArray);
}
@Override
public List<? extends File> getBoardYamlKeys() {
return boardYamlFiles;
}
@Override
public Reader getReader(File yamlKey) throws FileNotFoundException {
return new FileReader(yamlKey);
}
@Override
public String getName() {
return boardName;
}
@Override
public List<String> getInputFiles() {
List<String> result = new ArrayList<>();
for (File yamlFile : boardYamlFiles) {
result.add(boardName + PinoutLogic.CONNECTORS + File.separator + yamlFile.getName());
}
return result;
super(boardName);
}
@Override
@ -67,13 +18,4 @@ public class FileSystemBoardInputsImpl implements BoardInputs {
public Writer getOutputsWriter() throws IOException {
return new FileWriter(boardName + PinoutLogic.CONNECTORS + File.separator + "generated_outputs.h");
}
@Override
public List<String> getBoardMeta(String boardMetaFileName) {
try {
return Files.readAllLines(Paths.get(boardMetaFileName));
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}

69
java_tools/configuration_definition/src/main/java/com/rusefi/pinout/FileSystemBoardInputsReaderImpl.java Normal file
View File

@ -0,0 +1,69 @@
package com.rusefi.pinout;
import com.devexperts.logging.Logging;
import java.io.*;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import static com.devexperts.logging.Logging.getLogging;
public abstract class FileSystemBoardInputsReaderImpl implements BoardInputs {
private static final Logging log = getLogging(FileSystemBoardInputsImpl.class);
protected final String boardName;
private final List<File> boardYamlFiles;
public static String PREFIX = "";
public FileSystemBoardInputsReaderImpl(String boardName) {
this.boardName = boardName;
String dirPath = boardName + PinoutLogic.CONNECTORS;
File dirName = new File(dirPath);
FilenameFilter filter = (f, name) -> name.endsWith(".yaml");
File[] boardYamlFilesArray = dirName.listFiles(filter);
if (boardYamlFilesArray == null) {
log.info("No yaml files in " + dirPath);
boardYamlFiles = Collections.emptyList();
return;
}
Arrays.sort(boardYamlFilesArray);
log.info(boardName + ": " + Arrays.toString(boardYamlFilesArray));
boardYamlFiles = Arrays.asList(boardYamlFilesArray);
}
@Override
public List<? extends File> getBoardYamlKeys() {
return boardYamlFiles;
}
@Override
public Reader getReader(File yamlKey) throws FileNotFoundException {
return new FileReader(yamlKey);
}
@Override
public String getName() {
return boardName;
}
@Override
public List<String> getInputFiles() {
List<String> result = new ArrayList<>();
for (File yamlFile : boardYamlFiles) {
result.add(boardName + PinoutLogic.CONNECTORS + File.separator + yamlFile.getName());
}
return result;
}
@Override
public List<String> getBoardMeta(String boardMetaFileName) {
try {
return Files.readAllLines(Paths.get(PREFIX + boardMetaFileName));
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}

2
java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigDefinitionTest.java
View File

@ -12,7 +12,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class ConfigDefinitionTest {
private static final String FIRMWARE = "../../firmware";
public static final String FIRMWARE = "../../firmware";
@Test
public void testEnumIntoType() throws IOException {