BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-04 20:48:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Nullable scalars to Optional scalars (#6112)

Browse Source 
Co-authored-by: Casper Neo <cneo@google.com>
This commit is contained in:
Casper
2020-09-10 16:04:36 -04:00
committed by GitHub
parent f5ab24bc41
commit 338944d3d9
6 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/test.cpp
View File

@@ -3427,8 +3427,8 @@ void TestEmbeddedBinarySchema() {
0);
}
void NullableScalarsTest() {
// Simple schemas and a "has nullable scalar" sentinal.
void OptionalScalarsTest() {
// Simple schemas and a "has optional scalar" sentinal.
std::vector<std::string> schemas;
schemas.push_back("table Monster { mana : int; }");
schemas.push_back("table Monster { mana : int = 42; }");
@@ -3452,10 +3452,10 @@ void NullableScalarsTest() {
flatbuffers::Parser parser;
TEST_ASSERT(parser.Parse(schema->c_str()));
const auto *mana = parser.structs_.Lookup("Monster")->fields.Lookup("mana");
TEST_EQ(mana->nullable, has_null);
TEST_EQ(mana->optional, has_null);
}
// Test if nullable scalars are allowed for each language.
// Test if optional scalars are allowed for each language.
const int kNumLanguages = 17;
const auto supported = (flatbuffers::IDLOptions::kRust |
flatbuffers::IDLOptions::kSwift |
@@ -3475,9 +3475,9 @@ void NullableScalarsTest() {
void ParseFlexbuffersFromJsonWithNullTest() {
// Test nulls are handled appropriately through flexbuffers to exercise other
// code paths of ParseSingleValue in the nullable scalars change.
// code paths of ParseSingleValue in the optional scalars change.
// TODO(cneo): Json -> Flatbuffers test once some language can generate code
// with nullable scalars.
// with optional scalars.
{
char json[] = "{\"opt_field\": 123 }";
flatbuffers::Parser parser;
@@ -3593,7 +3593,7 @@ int FlatBufferTests() {
TestMonsterExtraFloats();
FixedLengthArrayTest();
NativeTypeTest();
NullableScalarsTest();
OptionalScalarsTest();
ParseFlexbuffersFromJsonWithNullTest();
return 0;
}