Add code to handle obsolete conformance when rendering

Author: hasty

dm/conformance.go

@@ -90,6 +90,8 @@ func renderConformance(con conformance.Conformance, parentEntity types.Entity) (
 		element = etree.NewElement("deprecateConform")
 	case *conformance.Described:
 		element = etree.NewElement("describedConform")
+	case *conformance.Obsolete:
+		element = etree.NewElement("obsoleteConform")
 	case *conformance.Generic:
 		err = fmt.Errorf("generic conformance elements are not supported in XML")
 	case conformance.Set:

matter/conformance/obsolete.go

@@ -5,7 +5,7 @@ type Obsolete struct {
 }
 
 func (d *Obsolete) Type() Type {
-	return TypeDeprecated
+	return TypeObsolete
 }
 
 func (d *Obsolete) RawText() string {

matter/conformance/type.go

@@ -13,6 +13,7 @@ const (
 	TypeOptional
 	TypeProvisional
 	TypeDeprecated
+	TypeObsolete
 	TypeDisallowed
 	TypeDescribed
 	TypeGeneric
@@ -25,6 +26,7 @@ var TypeNames = map[Type]string{
 	TypeOptional:    "optional",
 	TypeProvisional: "provisional",
 	TypeDeprecated:  "deprecated",
+	TypeObsolete:    "obsolete",
 	TypeDisallowed:  "disallowed",
 	TypeDescribed:   "described",
 	TypeGeneric:     "generic",

matter/spec/conformance.go

@@ -171,7 +171,7 @@ func (sp *Builder) resolveEntityConformanceReferences(cluster *matter.Cluster, f
 		for _, c := range con {
 			sp.resolveEntityConformanceReferences(cluster, finder, source, c)
 		}
-	case *conformance.Disallowed, *conformance.Provisional, *conformance.Described, *conformance.Deprecated:
+	case *conformance.Disallowed, *conformance.Provisional, *conformance.Described, *conformance.Deprecated, *conformance.Obsolete:
 	case *conformance.Generic:
 		if !conformance.IsBlank(con) {
 			slog.Warn("Can not resolve entities on generic conformance", slog.String("conformance", con.RawText()), log.Path("source", source))

testscript/python/conformance.go

@@ -104,6 +104,8 @@ func buildPythonConformance(cluster *matter.Cluster, c conformance.Conformance,
 	switch c := c.(type) {
 	case *conformance.Deprecated:
 		return fmt.Errorf("deprecated conformance cannot be converted to Python")
+	case *conformance.Obsolete:
+		return fmt.Errorf("obsolete conformance cannot be converted to Python")
 	case *conformance.Described:
 		return fmt.Errorf("described conformance cannot be converted to Python")
 	case *conformance.Generic:

zap/parse/conformance.go

@@ -44,6 +44,9 @@ func parseConformance(d *xml.Decoder, e xml.StartElement) (c conformance.Conform
 	case "describedConform":
 		err = parseStandalone(d, e, e.Name.Local)
 		c = &conformance.Described{}
+	case "obsoleteConform":
+		err = parseStandalone(d, e, e.Name.Local)
+		c = &conformance.Obsolete{}
 	case "otherwiseConform":
 		c, err = parseOtherwiseConform(d, e)
 	default: