Merge pull request #145 from Unity-Technologies/uni-25513-text-fix

Fix a unit test and document (and test) a behaviour.

Author: benoithudson

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -218,6 +218,7 @@ public static string IncrementFileName(string path, string filename)
             {
                 string fileWithoutExt = Path.GetFileNameWithoutExtension (filename);
                 string ext = Path.GetExtension (filename);
+                // file, space, number, extension.
                 string format = "{0} {1}{2}";
 
                 int index = 1;
@@ -226,10 +227,15 @@ public static string IncrementFileName(string path, string filename)
                 var result = System.Text.RegularExpressions.Regex.Match(fileWithoutExt, @"\d+$");
                 if (result != null) {
                     var number = result.Value;
+
+                    // Parse the number.
                     int tempIndex;
                     if (int.TryParse (number, out tempIndex)) {
                         fileWithoutExt = fileWithoutExt.Remove (fileWithoutExt.LastIndexOf (number));
-                        format = "{0}{1}{2}"; // remove space from format
+                        // Change the format to remove the extra space we'd add
+                        // if there weren't already a number. Also, try to use the
+                        // same width (so Cube001 increments to Cube002, not Cube2).
+                        format = "{0}{1:D" + number.Length + "}{2}"; // file, number with padding, extension
                         index = tempIndex+1;
                     }
                 }

Assets/FbxExporters/Editor/UnitTests/ConvertToModelTest.cs

@@ -25,17 +25,23 @@ public void TestStaticHelpers()
             {
                 var tempPath = Path.GetTempPath ();
                 var basename = Path.GetFileNameWithoutExtension (Path.GetRandomFileName ());
+                basename = basename + "yo"; // add some non-numeric stuff
 
-                var filename1 = basename + " 1.fbx";
-                var filename2 = Path.Combine(tempPath, basename + " 2.fbx");
+                var filename1 = basename + ".fbx";
+                var filename2 = Path.Combine(tempPath, basename + " 1.fbx");
+                Assert.AreEqual (filename2, ConvertToModel.IncrementFileName (tempPath, filename1));
+
+                filename1 = basename + " 1.fbx";
+                filename2 = Path.Combine(tempPath, basename + " 2.fbx");
                 Assert.AreEqual (filename2, ConvertToModel.IncrementFileName (tempPath, filename1));
 
                 filename1 = basename + "1.fbx";
                 filename2 = Path.Combine(tempPath, basename + "2.fbx");
                 Assert.AreEqual (filename2, ConvertToModel.IncrementFileName (tempPath, filename1));
 
-                filename1 = basename + "k.fbx";
-                filename2 = Path.Combine(tempPath, basename + "k 1.fbx");
+                // UNI-25513: bug was that Cube01.fbx => Cube2.fbx
+                filename1 = basename + "01.fbx";
+                filename2 = Path.Combine(tempPath, basename + "02.fbx");
                 Assert.AreEqual (filename2, ConvertToModel.IncrementFileName (tempPath, filename1));
             }