FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://github.com/rusefi/web_backend/issues/76

This commit is contained in:
rusefi 2020-07-16 14:18:49 -04:00
parent 582d36c543
commit 2ea8637ae5
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java_console/inifile/src/main/java/com/rusefi/tune/xml/Msq.java
View File

@ -18,7 +18,7 @@ public class Msq {
public List<Page> page = new ArrayList<>();
private final VersionInfo versionInfo;
public final VersionInfo versionInfo;
public Msq() {
versionInfo = new VersionInfo("rusEFI+2020");
@ -36,7 +36,7 @@ public class Msq {
@NotNull
public static Msq create(int totalConfigSize, String tsSignature) {
Msq tune = new Msq();
tune.versionInfo.setTsSignature(tsSignature);
tune.versionInfo.setSignature(tsSignature);
tune.page.add(new Page(null, null));
tune.page.add(new Page(0, totalConfigSize));
return tune;
@ -84,7 +84,6 @@ public class Msq {
return new Bibliography();
}
@XmlElement
public VersionInfo getVersionInfo() {
return versionInfo;
}

8
java_console/inifile/src/main/java/com/rusefi/tune/xml/VersionInfo.java
View File

@ -4,7 +4,7 @@ import javax.xml.bind.annotation.XmlAttribute;
public class VersionInfo {
private String firmwareInfo;
private String tsSignature;
private String signature;
public VersionInfo() {
}
@ -30,14 +30,14 @@ public class VersionInfo {
@XmlAttribute
public String getSignature() {
return tsSignature;
return signature;
}
public void setFirmwareInfo(String firmwareInfo) {
this.firmwareInfo = firmwareInfo;
}
public void setTsSignature(String tsSignature) {
this.tsSignature = tsSignature;
public void setSignature(String signature) {
this.signature = signature;
}
}

3
java_console/ui/src/test/java/com/rusefi/ui/TuneReadWriteTest.java
View File

@ -14,6 +14,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
/**
* from IDEA this unit test needs to be executed with "empty" working directory
@ -32,6 +33,7 @@ public class TuneReadWriteTest {
public void testCompareBinaryToTSTune() throws Exception {
Msq tsTune = Msq.readTune(PATH + "CurrentTune.msq");
System.out.println(tsTune);
assertNotNull("signature", tsTune.getVersionInfo().getSignature());
ConfigurationImage tsBinaryData = tsTune.asImage(IniFileModel.getInstance(), Fields.TOTAL_CONFIG_SIZE);
@ -55,6 +57,7 @@ public class TuneReadWriteTest {
// and now reading that XML back
Msq tuneFromFile = Msq.readTune(fileName);
assertNotNull(tuneFromFile.getVersionInfo().getSignature());
ConfigurationImage binaryDataFromXml = tuneFromFile.asImage(IniFileModel.getInstance(), Fields.TOTAL_CONFIG_SIZE);