@@ -99,18 +99,16 @@ pub fn validate_semver(version: &str) -> Result<(), semver::Error> {
9999#[ cfg( test) ]
100100mod test {
101101 use crate :: {
102- dscerror:: DscError ,
103- dscresources:: resource_manifest:: ResourceManifest ,
104- schemas:: DscRepoSchema
102+ dscerror:: DscError , extensions:: extension_manifest:: ExtensionManifest , schemas:: DscRepoSchema
105103 } ;
106104
107105 #[ test]
108106 fn test_validate_schema_uri_with_invalid_uri ( ) {
109107 let invalid_uri = "https://invalid.schema.uri" . to_string ( ) ;
110108
111- let manifest = ResourceManifest {
109+ let manifest = ExtensionManifest {
112110 schema_version : invalid_uri. clone ( ) ,
113- resource_type : "Microsoft.Dsc.Test/InvalidSchemaUri" . to_string ( ) ,
111+ r#type : "Microsoft.Dsc.Test/InvalidSchemaUri" . to_string ( ) ,
114112 version : "0.1.0" . to_string ( ) ,
115113 ..Default :: default ( )
116114 } ;
@@ -122,7 +120,7 @@ mod test {
122120 match result. as_ref ( ) . unwrap_err ( ) {
123121 DscError :: UnrecognizedSchemaUri ( actual, recognized) => {
124122 assert_eq ! ( actual, & invalid_uri) ;
125- assert_eq ! ( recognized, & ResourceManifest :: recognized_schema_uris( ) )
123+ assert_eq ! ( recognized, & ExtensionManifest :: recognized_schema_uris( ) )
126124 } ,
127125 _ => {
128126 panic ! ( "Expected validate_schema_uri() to error on unrecognized schema uri, but was {:?}" , result. as_ref( ) . unwrap_err( ) )
@@ -132,9 +130,9 @@ mod test {
132130
133131 #[ test]
134132 fn test_validate_schema_uri_with_valid_uri ( ) {
135- let manifest = ResourceManifest {
136- schema_version : ResourceManifest :: default_schema_id_uri ( ) ,
137- resource_type : "Microsoft.Dsc.Test/ValidSchemaUri" . to_string ( ) ,
133+ let manifest = ExtensionManifest {
134+ schema_version : ExtensionManifest :: default_schema_id_uri ( ) ,
135+ r#type : "Microsoft.Dsc.Test/ValidSchemaUri" . to_string ( ) ,
138136 version : "0.1.0" . to_string ( ) ,
139137 ..Default :: default ( )
140138 } ;
0 commit comments