Add new test cases.

Improve pictures that have only '?' at the right part when applied to whole numbers.

Author: claudiamurialdo

dotnet/src/dotnetframework/GxClasses/Core/GXUtilsCommon.cs

@@ -696,10 +696,11 @@ static int LeadingBlanks(string gxpicture)
 			}
 			return leadingBlanks;
 		}
-		static int TrailingBlanks(string gxpicture)
+		static int TrailingBlanks(string gxpicture, out bool decimalsAsBlank)
 		{
 			int trailingBlanks = 0;
 			int sep = gxpicture.IndexOf('.');
+			decimalsAsBlank = false;
 			if (sep >= 0)
 			{
 				string rightPic = gxpicture.Substring(sep);
@@ -709,8 +710,16 @@ static int TrailingBlanks(string gxpicture)
 					{
 						if (gxpicture[i] == QUESTION_MARK && !EscapedSymbol(gxpicture, i))
 							trailingBlanks++;
-						else if (gxpicture[i] == '.' || gxpicture[i] == NUMBER_SIGN || gxpicture[i] == 'Z' || gxpicture[i] == '9')
+						else if (gxpicture[i] == '.')
+						{
+							decimalsAsBlank = true;
+							break;
+						}
+						else if (gxpicture[i] == NUMBER_SIGN || gxpicture[i] == 'Z' || gxpicture[i] == '9')
+						{
+							decimalsAsBlank = false;
 							break;
+						}
 					}
 				}
 			}
@@ -730,7 +739,7 @@ private static string GxPictureToNetPicture(string gxpicture, bool separatorsAsL
 			bool explicitSign = (gxpicture[0] == '+');
 			bool withoutMinusSign = (gxpicture[0] == '(' && gxpicture[gxpicture.Length - 1] == ')') || gxpicture.EndsWith("DB") || explicitSign;
 			int totalLeadingBlanks = LeadingBlanks(gxpicture);
-			int totalRighBlanks = TrailingBlanks(gxpicture);
+			int totalRighBlanks = TrailingBlanks(gxpicture, out bool decimalsAsBlank);
 			int lBlanks = 0;
 			int rDigits = 0;
 
@@ -828,7 +837,16 @@ private static string GxPictureToNetPicture(string gxpicture, bool separatorsAsL
 					if (separatorsAsLiterals)
 						strPicture.Append("\".\"");
 					else
-						strPicture.Append(gxpicture[i]);
+					{
+						if (decimalsAsBlank && decimals == 0)
+						{
+							strPicture.Append(BLANK); //Replace decimal separator by blank
+						}
+						else
+						{
+							strPicture.Append(gxpicture[i]);
+						}
+					}
 				}
 				else if (gxpicture[i] == ',')
 				{
@@ -1299,7 +1317,7 @@ public string Format(decimal value, string gxpicture)
 				section = FORMAT_SECTION.ZEROS;
 			}
 			bool separatorsAsLiterals = UseLiteralSeparators(gxpicture);
-			string invariantStrValue = value.ToString(CultureInfo.InvariantCulture.NumberFormat);
+			string invariantStrValue = Math.Abs(value).ToString(CultureInfo.InvariantCulture.NumberFormat);
 			int decSeparatorIdx = invariantStrValue.IndexOf(CultureInfo.InvariantCulture.NumberFormat.NumberDecimalSeparator);
 
 			int digits = WholeDigits(value, invariantStrValue, decSeparatorIdx);
@@ -1342,7 +1360,11 @@ int DecimalDigits(string invariantStrValue, int decSeparatorIdx)
 		int WholeDigits(decimal value, string invariantStrValue, int decSeparatorIdx)
 		{
 			int digits;
-			if (value < 1 && value >= 0)
+			if (value == 0)
+			{
+				digits = 1;
+			}
+			else if (value < 1 && value >= 0)
 				digits = 0;
 			else if (decSeparatorIdx < 0)
 			{

dotnet/test/DotNetUnitTest/StringUtil/StringUtilTests.cs

@@ -110,15 +110,48 @@ public void TestZPicture()
 			Assert.Equal("        123456.12    ", decStr);
 
 			//=====================Zero========================================
+
 			decNumber = 0;
+
+			decStr = context.localUtil.Format(decNumber, "ZZZZZZZZZZ9.ZZZZZZ");
+			Assert.Equal("          0.000000", decStr);
+
 			decStr = context.localUtil.Format(decNumber, "###########.######");
 			Assert.Equal("                  ", decStr);
 
 			decStr = context.localUtil.Format(decNumber, "???????????.??????");
 			Assert.Equal("                  ", decStr);
 
+			decStr = context.localUtil.Format(decNumber, "(??????????9.??????)");
+			Assert.Equal("           0        ", decStr);
+
+			decStr = context.localUtil.Format(decNumber, "\\# ??????????9.??????");
+			Assert.Equal("#           0       ", decStr);
+
+			decStr = context.localUtil.Format(decNumber, "(##########9.######)");
+			Assert.Equal("                  0 ", decStr);
+
+			//=====================One========================================
+
+			decNumber = 1;
+
+			decStr = context.localUtil.Format(decNumber, "ZZZZZZZZZZ9.ZZZZZZ");
+			Assert.Equal("          1.000000", decStr);
+
+			decStr = context.localUtil.Format(decNumber, "###########.######");
+			Assert.Equal("                 1", decStr);
+
+			decStr = context.localUtil.Format(decNumber, "???????????.??????");
+			Assert.Equal("          1       ", decStr);
+
+			decStr = context.localUtil.Format(decNumber, "(??????????9.??????)");
+			Assert.Equal("           1        ", decStr);
+
 			decStr = context.localUtil.Format(decNumber, "\\# ??????????9.??????");
-			Assert.Equal(" #           0      ", decStr);
+			Assert.Equal("#           1       ", decStr);
+
+			decStr = context.localUtil.Format(decNumber, "(##########9.######)");
+			Assert.Equal("                  1 ", decStr);
 
 			//=====================0.1========================================
 			decNumber = 0.1M;
@@ -129,7 +162,7 @@ public void TestZPicture()
 			//=====================Negatives========================================
 			decNumber = -123456.12M;
 			decStr = context.localUtil.Format(decNumber, "(??????????9.??????)");
-			Assert.Equal(" (    123456.12    )", decStr);
+			Assert.Equal("(     123456.12    )", decStr);
 
 			decStr = context.localUtil.Format(decNumber, "(##########9.######)");
 			Assert.Equal("         (123456.12)", decStr);