Fixed the tests by adding another option for the advanced property pass.

Long-term, I'd like to see both passes merged...

src/Generator/Driver.cs

@@ -298,10 +298,13 @@ namespace CppSharp
             }
 
             if (Options.GenerateVirtualTables)
-                TranslationUnitPasses.AddPass(new CheckVTableComponentsPass());
-
+                TranslationUnitPasses.AddPass(new CheckVTableComponentsPass());
+
             if (Options.GenerateProperties)
                 TranslationUnitPasses.AddPass(new GetterSetterToPropertyPass());
+
+            if (Options.GeneratePropertiesAdvanced)
+                TranslationUnitPasses.AddPass(new GetterSetterToPropertyAdvancedPass());
         }
 
         public void ProcessCode()

src/Generator/Options.cs

@@ -92,12 +92,25 @@ namespace CppSharp
         public bool GenerateVirtualTables;
         public bool GenerateAbstractImpls;
         public bool GenerateInterfacesForMultipleInheritance;
-        public bool GenerateProperties;
         public bool GenerateInternalImports;
         public bool GenerateClassMarshals;
         public bool GenerateInlines;
         public bool GenerateCopyConstructors;
         public bool UseHeaderDirectories;
+
+        /// <summary>
+        /// If set to true the generator will use GetterSetterToPropertyPass to
+        /// convert matching getter/setter pairs to properties.
+        /// </summary>
+        public bool GenerateProperties;
+
+        /// <summary>
+        /// If set to true the generator will use GetterSetterToPropertyAdvancedPass to
+        /// convert matching getter/setter pairs to properties. This pass has slightly
+        /// different semantics from GetterSetterToPropertyPass, it will more agressively
+        /// try to match for matching properties.
+        /// </summary>
+        public bool GeneratePropertiesAdvanced;
 
         //List of include directories that are used but not generated
         public List<string> NoGenIncludeDirs;

tests/CSharpTemp/CSharpTemp.cs

@@ -60,7 +60,7 @@ namespace CppSharp.Tests
         public override void SetupPasses(Driver driver)
         {
             driver.Options.GenerateInterfacesForMultipleInheritance = true;
-            driver.Options.GenerateProperties = true;
+            driver.Options.GeneratePropertiesAdvanced = true;
             driver.Options.GenerateVirtualTables = true;
             driver.Options.GenerateCopyConstructors = true;
             driver.TranslationUnitPasses.AddPass(new TestAttributesPass());