Merge 40ee77c into acbd871

mkaring · web-flow · commit fdaafafc88d0 · 2020-07-11T10:55:18.000+02:00
diff --git a/Confuser.Renamer/NameService.cs b/Confuser.Renamer/NameService.cs
@@ -213,16 +213,15 @@ string MakeGenericName(string name, int? count) {
 
 		public string ObfuscateName(string name, RenameMode mode) {
 			string newName = null;
-			int? count;
-			name = ParseGenericName(name, out count);
+			name = ParseGenericName(name, out var count);
 
 			if (string.IsNullOrEmpty(name))
 				return string.Empty;
 
 			if (mode == RenameMode.Empty)
 				return "";
 			if (mode == RenameMode.Debug)
-				return "_" + name;
+				return MakeGenericName("_" + name, count);
 			if (mode == RenameMode.Reversible) {
 				if (reversibleRenamer == null)
 					throw new ArgumentException("Password not provided for reversible renaming.");
diff --git a/Tests/123_InheritCustomAttr.Test/InheritCustomAttributeTest.cs b/Tests/123_InheritCustomAttr.Test/InheritCustomAttributeTest.cs
@@ -1,9 +1,11 @@
 ﻿using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 using Confuser.Core;
 using Confuser.Core.Project;
+using Confuser.Renamer;
 using Confuser.UnitTest;
 using Xunit;
 using Xunit.Abstractions;
@@ -15,13 +17,15 @@ public class InheritCustomAttributeTest {
 		public InheritCustomAttributeTest(ITestOutputHelper outputHelper) =>
 			this.outputHelper = outputHelper ?? throw new ArgumentNullException(nameof(outputHelper));
 
-		[Fact]
+		[Theory]
+		[MemberData(nameof(InheritCustomAttributeData))]
 		[Trait("Category", "Protection")]
 		[Trait("Protection", "rename")]
 		[Trait("Issue", "https://github.com/mkaring/ConfuserEx/issues/123")]
-		public async Task InheritCustomAttribute() {
+		[Trait("Issue", "https://github.com/mkaring/ConfuserEx/issues/161")]
+		public async Task InheritCustomAttribute(string renameMode, bool flatten) {
 			var baseDir = Environment.CurrentDirectory;
-			var outputDir = Path.Combine(baseDir, "testtmp");
+			var outputDir = Path.Combine(baseDir, "testtmp_" + Guid.NewGuid().ToString());
 			var inputFile = Path.Combine(baseDir, "123_InheritCustomAttr.exe");
 			var outputFile = Path.Combine(outputDir, "123_InheritCustomAttr.exe");
 			FileUtilities.ClearOutput(outputFile);
@@ -31,7 +35,10 @@ public async Task InheritCustomAttribute() {
 			};
 			proj.Add(new ProjectModule() { Path = inputFile });
 			proj.Rules.Add(new Rule() {
-				new SettingItem<Protection>("rename")
+				new SettingItem<Protection>("rename") {
+					{ "mode", renameMode },
+					{ "flatten", flatten ? "True" : "False" }
+				}
 			});
 
 			var parameters = new ConfuserParameters {
@@ -62,5 +69,11 @@ public async Task InheritCustomAttribute() {
 
 			FileUtilities.ClearOutput(outputFile);
 		}
+
+		public static IEnumerable<object[]> InheritCustomAttributeData() {
+			foreach (var renameMode in new string[] { nameof(RenameMode.Unicode), nameof(RenameMode.ASCII), nameof(RenameMode.Letters), nameof(RenameMode.Debug) })
+				foreach (var flatten in new bool[] { true, false })
+					yield return new object[] { renameMode, flatten };
+		}
 	}
 }
diff --git a/Tests/Confuser.UnitTest/FileUtilities.cs b/Tests/Confuser.UnitTest/FileUtilities.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.IO;
+using System.Linq;
 using System.Security.Cryptography;
 
 namespace Confuser.UnitTest {
@@ -18,6 +19,14 @@ public static void ClearOutput(string outputFile) {
 				}
 			}
 			catch (UnauthorizedAccessException) { }
+
+			try {
+				var directoryName = Path.GetDirectoryName(outputFile);
+				if (Directory.Exists(directoryName) && !Directory.EnumerateFileSystemEntries(directoryName).Any()) {
+					Directory.Delete(directoryName);
+				}
+			}
+			catch (UnauthorizedAccessException) { }
 		}
 
 		public static byte[] ComputeFileChecksum(string file) {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.IO;`
	`3`	`+using System.Linq;`
`3`	`4`	`using System.Security.Cryptography;`
`4`	`5`
`5`	`6`	`namespace Confuser.UnitTest {`
`@@ -18,6 +19,14 @@ public static void ClearOutput(string outputFile) {`
`18`	`19`	`}`
`19`	`20`	`}`
`20`	`21`	`catch (UnauthorizedAccessException) { }`
	`22`	`+`
	`23`	`+ try {`
	`24`	`+ var directoryName = Path.GetDirectoryName(outputFile);`
	`25`	`+ if (Directory.Exists(directoryName) && !Directory.EnumerateFileSystemEntries(directoryName).Any()) {`
	`26`	`+ Directory.Delete(directoryName);`
	`27`	`+ }`
	`28`	`+ }`
	`29`	`+ catch (UnauthorizedAccessException) { }`
`21`	`30`	`}`
`22`	`31`
`23`	`32`	`public static byte[] ComputeFileChecksum(string file) {`