Specified culture for string conversion in TLVItem

shtrih-m · Mar 2, 2017 · b6fe532 · b6fe532
1 parent 79d117c
commit b6fe532
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 73 deletions.
diff --git a/Source/Core/src/com/shtrih/fiscalprinter/TLVItem.java b/Source/Core/src/com/shtrih/fiscalprinter/TLVItem.java
@@ -10,6 +10,7 @@
 import com.shtrih.util.encoding.IBM866;
 
 import java.util.Date;
+import java.util.Locale;
 
 /**
  * @author V.Kravtsov
@@ -40,7 +41,7 @@ public int getLevel() {
 
     public long toInt(byte[] d) {
         long result = 0;
-        for (int i = d.length-1; i >= 0; i--) {
+        for (int i = d.length - 1; i >= 0; i--) {
             result <<= 8;
             result |= d[i] & 0xFF;
         }
@@ -126,7 +127,7 @@ public double toFVLN(byte[] data) throws Exception {
     public String toFVLNS(byte[] data) throws Exception {
         double result = toFVLN(data);
         int power = data[0];
-        return String.format("%." + power + "f", result);
+        return String.format(Locale.US, "%." + power + "f", result);
     }
 
     public String getText() throws Exception {
@@ -142,7 +143,7 @@ public String getText() throws Exception {
             case itUnixTime:
                 return toDate(data).toString();
             case itVLN:
-                return String.format("%.2f", toInt(data) / 100.0);
+                return String.format(Locale.US, "%.2f", toInt(data) / 100.0);
             case itFVLN:
                 return toFVLNS(data);
             case itASCII:

diff --git a/Source/FiscalPrinterService/test/FileAppenderTest.java b/Source/FiscalPrinterService/test/FileAppenderTest.java
diff --git a/Source/FiscalPrinterService/test/com/shtrih/fiscalprinter/TLVItemTests.java b/Source/FiscalPrinterService/test/com/shtrih/fiscalprinter/TLVItemTests.java
@@ -28,7 +28,7 @@ public void Should_decode_int() throws Exception {
 
         TLVItem item = new TLVItem(new TLVInfo(666, TLVInfo.TLVType.itVLN), data, 12);
         assertEquals(12345, item.toInt(item.getData()));
-        assertEquals("123,45", item.getText());
+        assertEquals("123.45", item.getText());
     }
 
     @Test
@@ -37,7 +37,7 @@ public void Should_decode_vln() throws Exception {
 
         TLVItem item = new TLVItem(new TLVInfo(666, TLVInfo.TLVType.itVLN), data, 12);
         assertEquals(132, item.toInt(item.getData()));
-        assertEquals("1,32", item.getText());
+        assertEquals("1.32", item.getText());
     }
 
     @Test
@@ -46,7 +46,7 @@ public void Should_decode_vln2() throws Exception {
 
         TLVItem item = new TLVItem(new TLVInfo(666, TLVInfo.TLVType.itVLN), data, 12);
         assertEquals(132, item.toInt(item.getData()));
-        assertEquals("1,32", item.getText());
+        assertEquals("1.32", item.getText());
     }
 
     @Test
@@ -55,7 +55,7 @@ public void Should_decode_vln3() throws Exception {
 
         TLVItem item = new TLVItem(new TLVInfo(666, TLVInfo.TLVType.itVLN), data, 12);
         assertEquals(132, item.toInt(item.getData()));
-        assertEquals("1,32", item.getText());
+        assertEquals("1.32", item.getText());
     }
 
     private byte[] fsWriteTag(final int data) throws Exception {

diff --git a/Source/FiscalPrinterService/test/com/shtrih/fiscalprinter/TLVReaderTests.java b/Source/FiscalPrinterService/test/com/shtrih/fiscalprinter/TLVReaderTests.java
@@ -26,7 +26,7 @@ public void Should_decode_vln_tag() throws Exception {
         TLVItem item = items.get(0);
 
         assertEquals(12345, item.toInt(item.getData()));
-        assertEquals("123,45", item.getText());
+        assertEquals("123.45", item.getText());
     }
 
     private byte[] fsWriteTag(final int tag, final int data) throws Exception {

diff --git a/Source/build.bat b/Source/build.bat
@@ -1,4 +1,4 @@
 @echo off
 
-cmd /c gradlew clean build uploadArchives
+cmd /c gradlew clean build uploadArchives -i
 pause