added a few tests to isolate CI failure; use HasSingle for DisableContextualSerializer

Author: mgravell

src/protobuf-net.Grpc/Configuration/ProtoBufMarshallerFactory.cs

@@ -74,26 +74,24 @@ internal ProtoBufMarshallerFactory(TypeModel model, Options options, object? use
                 _ => new SerializationContext { Context = userState }
             };
 
-            if (UseContextualSerializer)
+            if (!HasSingle(Options.DisableContextualSerializer))
             {
                 // test these once rather than every time
                 _measuredWriterModel = model as IMeasuredProtoOutput<IBufferWriter<byte>>;
                 _squenceReaderModel = model as IProtoInput<ReadOnlySequence<byte>>;
             }
         }
 
-        private bool UseContextualSerializer => (_options & Options.DisableContextualSerializer) == 0;
-
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private bool Has(Options option) => (_options & option) == option;
+        private bool HasSingle(Options option) => (_options & option) != 0;
 
         /// <summary>
         /// Deserializes an object from a payload
         /// </summary>
         protected internal override global::Grpc.Core.Marshaller<T> CreateMarshaller<T>()
-            => UseContextualSerializer
-            ? new global::Grpc.Core.Marshaller<T>(ContextualSerialize<T>, ContextualDeserialize<T>)
-            : base.CreateMarshaller<T>();
+            => HasSingle(Options.DisableContextualSerializer)
+            ? base.CreateMarshaller<T>()
+            : new global::Grpc.Core.Marshaller<T>(ContextualSerialize<T>, ContextualDeserialize<T>);
 
 #if DEBUG
         private int _uplevelBufferReadCount, _uplevelBufferWriteCount;
@@ -179,7 +177,7 @@ private T ContextualDeserialize<T>(global::Grpc.Core.DeserializationContext cont
         /// Indicates whether a type should be considered as a serializable data type
         /// </summary>
         protected internal override bool CanSerialize(Type type)
-            => Has(Options.ContractTypesOnly)
+            => HasSingle(Options.ContractTypesOnly)
                 ? _model.CanSerializeContractType(type)
                 : _model.CanSerialize(type);
 

tests/protobuf-net.Grpc.Test.Integration/StreamTests.cs

@@ -4,6 +4,7 @@
 using ProtoBuf.Grpc.Client;
 using ProtoBuf.Grpc.Configuration;
 using ProtoBuf.Grpc.Server;
+using ProtoBuf.Meta;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -358,6 +359,16 @@ public StreamTests(int port, StreamTestsFixture fixture, ITestOutputHelper log)
         protected abstract IAsyncDisposable CreateClient(out IStreamAPI client);
 
         const int DEFAULT_SIZE = 20;
+
+        [Fact]
+        public void FooIsContractType()
+            => Assert.True(RuntimeTypeModel.Default.IsDefined(typeof(Foo)));
+
+
+        [Fact]
+        public void FooHasMarshaller()
+            => Assert.NotNull(BinderConfiguration.Default.GetMarshaller<Foo>());
+
         [Theory]
         [InlineData(Scenario.RunToCompletion, DEFAULT_SIZE, CallContextFlags.None)]
         [InlineData(Scenario.RunToCompletion, DEFAULT_SIZE, CallContextFlags.CaptureMetadata)]