Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added abstract schema checking to CSharpValueGenerator.GetDefaultValue #1570

Merged
merged 1 commit into from
May 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public override string GetDefaultValue(JsonSchema schema, bool allowsNull, strin
? _settings.ArrayInstanceType + targetType.Substring(_settings.ArrayType.Length)
: targetType;

return $"new {targetType}()";
return schema.IsAbstract ? null : $"new {targetType}()";
}
}
}
Expand Down
27 changes: 27 additions & 0 deletions src/NJsonSchema.CodeGeneration.Tests/DefaultValueGeneratorTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -218,5 +218,32 @@ public void When_schema_has_default_value_of_enum_it_is_generated_in_CSharp_and_
Assert.Equal("Ns.MyEnum.bar", csharpValue);
Assert.Equal("MyEnum.bar", typescriptValue);
}

[Fact]
public void When_schema_has_required_abstract_class_it_generates_no_default_value_for_in_CSharp_and_TypeScript()
{
//// Arrange
var csharpSettings = new CSharpGeneratorSettings();
var csharpGenerator = new CSharpValueGenerator(csharpSettings);
var csharpTypeResolver = new CSharpTypeResolver(csharpSettings);

//// Act
var schema = new JsonSchema()
{
Type = JsonObjectType.Object,
IsAbstract = true
};

var typescriptSettings = new TypeScriptGeneratorSettings();
var typescriptGenerator = new TypeScriptValueGenerator(typescriptSettings);
var typescriptTypeResolver = new TypeScriptTypeResolver(typescriptSettings);

var csharpValue = csharpGenerator.GetDefaultValue(schema, false, "BaseClass", "BaseClass", true, csharpTypeResolver);
var typescriptValue = typescriptGenerator.GetDefaultValue(schema, false, "BaseClass", "BaseClass", true, typescriptTypeResolver);

//// Assert
Assert.Null(csharpValue);
Assert.Null(typescriptValue);
}
}
}