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.

Sign up for GitHub

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

Jump to bottom

IGNITE-5338 .NET: TestMultipleAssembliesIndirectDependencyMultiLevel fails on TC #2033

Closed
wants to merge 4 commits into from
Closed

IGNITE-5338 .NET: TestMultipleAssembliesIndirectDependencyMultiLevel fails on TC #2033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36ee69b
IGNITE-5338 .NET: TestMultipleAssembliesIndirectDependencyMultiLevel …
ptupitsyn May 30, 2017
500765f
Merge branch 'master' into ignite-5338
ptupitsyn May 30, 2017
d04b579
revert test changes
ptupitsyn May 30, 2017
4c1a24f
Fix test
ptupitsyn May 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions modules/platforms/dotnet/Apache.Ignite.Core.Tests/Deployment/PeerAssemblyLoadingTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace Apache.Ignite.Core.Tests.Deployment
using Apache.Ignite.Core.Impl;
using Apache.Ignite.Core.Impl.Common;
using Apache.Ignite.Core.Tests.Process;
using Apache.Ignite.Log4Net;
using Apache.Ignite.NLog;
using NUnit.Framework;
using Address = ExamplesDll::Apache.Ignite.ExamplesDll.Binary.Address;

Expand Down Expand Up @@ -111,9 +111,9 @@ public void TestMultipleAssembliesIndirectDependencyMultiLevel()
{
TestDeployment(remoteCompute =>
{
// Arg is object, value is from Apache.Ignite.Log4Net, and it further depends on log4net.
Assert.AreEqual("Apache.IgniteApache.Ignite.Log4Net.IgniteLog4NetLogger", remoteCompute.Call(
new ProcessNameFunc {Arg = new IgniteLog4NetLogger()}));
// Arg is object, value is from Apache.Ignite.Log4Net, and it further depends on NLog.
Assert.AreEqual("Apache.IgniteApache.Ignite.NLog.IgniteNLogLogger", remoteCompute.Call(
new ProcessNameFunc {Arg = new IgniteNLogLogger()}));
});
}

Expand Down
4 changes: 2 additions & 2 deletions modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1139,7 +1139,7 @@ public void Write<T>(T obj)
return;
}

// We use GetType() of a real object instead of typeof(T) to take advantage of
// We use GetType() of a real object instead of typeof(T) to take advantage of
// automatic Nullable'1 unwrapping.
Type type = obj.GetType();

Expand Down Expand Up @@ -1224,7 +1224,7 @@ public void Write<T>(T obj)
var schemaOffset = dataEnd - pos;

int schemaId;

var flags = desc.UserType
? BinaryObjectHeader.Flag.UserType
: BinaryObjectHeader.Flag.None;
Expand Down