From 2ea8637ae533fdb927c7d22e4387a1416dd5abc8 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 16 Jul 2020 14:18:49 -0400 Subject: [PATCH] https://github.com/rusefi/web_backend/issues/76 --- .../inifile/src/main/java/com/rusefi/tune/xml/Msq.java | 5 ++--- .../src/main/java/com/rusefi/tune/xml/VersionInfo.java | 8 ++++---- .../ui/src/test/java/com/rusefi/ui/TuneReadWriteTest.java | 3 +++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/java_console/inifile/src/main/java/com/rusefi/tune/xml/Msq.java b/java_console/inifile/src/main/java/com/rusefi/tune/xml/Msq.java index 0b5e94f72f..cb2940f1d5 100644 --- a/java_console/inifile/src/main/java/com/rusefi/tune/xml/Msq.java +++ b/java_console/inifile/src/main/java/com/rusefi/tune/xml/Msq.java @@ -18,7 +18,7 @@ public class Msq { public List 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; } diff --git a/java_console/inifile/src/main/java/com/rusefi/tune/xml/VersionInfo.java b/java_console/inifile/src/main/java/com/rusefi/tune/xml/VersionInfo.java index acbad9ae14..d8c223e259 100644 --- a/java_console/inifile/src/main/java/com/rusefi/tune/xml/VersionInfo.java +++ b/java_console/inifile/src/main/java/com/rusefi/tune/xml/VersionInfo.java @@ -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; } } diff --git a/java_console/ui/src/test/java/com/rusefi/ui/TuneReadWriteTest.java b/java_console/ui/src/test/java/com/rusefi/ui/TuneReadWriteTest.java index 9421089de4..3b0448edf0 100644 --- a/java_console/ui/src/test/java/com/rusefi/ui/TuneReadWriteTest.java +++ b/java_console/ui/src/test/java/com/rusefi/ui/TuneReadWriteTest.java @@ -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);