From 32e856463c124401d58f1c0c42277478bfec21c6 Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Tue, 28 Jun 2022 10:39:01 -0500
Subject: [PATCH] [generator] Fix <remove-attr> metadata.

---
 .../Metadata/FixupXmlDocument.cs                   |  2 +-
 .../Unit-Tests/FixupXmlDocumentTests.cs            | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Java.Interop.Tools.Generator/Metadata/FixupXmlDocument.cs b/src/Java.Interop.Tools.Generator/Metadata/FixupXmlDocument.cs
index 50e459ebe..7202b8af5 100644
--- a/src/Java.Interop.Tools.Generator/Metadata/FixupXmlDocument.cs
+++ b/src/Java.Interop.Tools.Generator/Metadata/FixupXmlDocument.cs
@@ -153,7 +153,7 @@ public void Apply (ApiXmlDocument apiDocument, string apiLevelString, int produc
 						var matched = false;
 
 						foreach (var node in nodes) {
-							node.RemoveAttributes ();
+							node.Attributes (name).Remove ();
 							matched = true;
 						}
 						
diff --git a/tests/generator-Tests/Unit-Tests/FixupXmlDocumentTests.cs b/tests/generator-Tests/Unit-Tests/FixupXmlDocumentTests.cs
index 42e849c1d..728b3c2cd 100644
--- a/tests/generator-Tests/Unit-Tests/FixupXmlDocumentTests.cs
+++ b/tests/generator-Tests/Unit-Tests/FixupXmlDocumentTests.cs
@@ -82,7 +82,19 @@ public void RemoveAttribute ()
 
 			api.ApplyFixupFile (fixup);
 
-			Assert.AreEqual ("<api><package /><package name='java' jni-name='java' /></api>", api.ApiDocument.ToString (SaveOptions.DisableFormatting).Replace ('\"', '\''));
+			Assert.AreEqual ("<api><package jni-name='android' /><package name='java' jni-name='java' /></api>", api.ApiDocument.ToString (SaveOptions.DisableFormatting).Replace ('\"', '\''));
+		}
+
+		[Test]
+		public void RemoveNotFoundAttribute ()
+		{
+			// Attribute 'foo' doesn't exist on node
+			var api = GetXmlApiDocument ();
+			var fixup = GetFixupXmlDocument ("<remove-attr path=\"/api/package[@name='android']\" name='foo' />");
+
+			api.ApplyFixupFile (fixup);
+
+			Assert.AreEqual ("<api><package name='android' jni-name='android' /><package name='java' jni-name='java' /></api>", api.ApiDocument.ToString (SaveOptions.DisableFormatting).Replace ('\"', '\''));
 		}
 
 		[Test]