Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
12 changes: 8 additions & 4 deletions lang/csharp/src/apache/main/Generic/GenericEnum.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,14 @@ public GenericEnum(EnumSchema schema, string value)
/// <inheritdoc/>
public override bool Equals(object obj)
{
if (obj == this) return true;
return (obj != null && obj is GenericEnum)
? Value.Equals((obj as GenericEnum).Value, System.StringComparison.Ordinal)
: false;
if (obj == this)
{
return true;
}

return obj != null
&& obj.GetType() == typeof(GenericEnum)
&& Value.Equals(((GenericEnum)obj).Value, System.StringComparison.Ordinal);
}

/// <inheritdoc/>
Expand Down
81 changes: 81 additions & 0 deletions lang/csharp/src/apache/test/Generic/GenericEnumTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

using Avro.Generic;
using NUnit.Framework;

namespace Avro.test.Generic
{
[TestFixture]
public class GenericEnumTests
{
private const string baseSchema = "{\"type\": \"enum\", \"name\": \"Test\", \"symbols\": " +
"[\"Unknown\", \"A\", \"B\"], \"default\": \"Unknown\" }";

[Test]
public void TestEquals()
{
GenericEnum genericEnum = GetBaseGenericEnum();
GenericEnum genericEnum2 = GetBaseGenericEnum();

Assert.IsTrue(genericEnum.Equals(genericEnum2));
}

[Test]
public void TestEqualsNotEqual()
{
GenericEnum genericEnum = GetBaseGenericEnum();
GenericEnum genericEnum2 = new GenericEnum(Schema.Parse(baseSchema) as EnumSchema, "B");

Assert.IsFalse(genericEnum.Equals(genericEnum2));
}

[Test]
public void TestEqualsObject()
{
GenericEnum genericEnum = GetBaseGenericEnum();
object genericEnum2 = genericEnum;

Assert.IsTrue(genericEnum.Equals(genericEnum2));
}

[Test]
public void TestEqualsObjectNotEqual()
{
GenericEnum genericEnum = GetBaseGenericEnum();
GenericEnum genericEnum2 = new GenericEnum(Schema.Parse(baseSchema) as EnumSchema, "B");

Assert.IsFalse(genericEnum.Equals((object)genericEnum2));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can the casting be removed and fix the CodeQL warnings?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

}

[Test]
public void TestEqualsObjectNullObject()
{
GenericEnum genericEnum = GetBaseGenericEnum();

Assert.IsFalse(genericEnum.Equals((object)null));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am surprised that this passes

Copy link
Contributor

@zcsizmadia zcsizmadia Apr 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ohh. I see it fails. So the null check is definetely needed up in the Equals code

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

}

private GenericEnum GetBaseGenericEnum()
{
GenericEnum genericEnum = new GenericEnum(Schema.Parse(baseSchema) as EnumSchema, "A");

return genericEnum;
}
}
}