Merge pull request #2638 from pythonnet/no-stashing-embedding-tests · pythonnet/pythonnet@bd15f2d
@@ -20,7 +20,7 @@ public void GetEncodersByType()
2020};
21212222var got = group.GetEncoders(typeof(Uri)).ToArray();
23-CollectionAssert.AreEqual(new[]{encoder1, encoder2}, got);
23+Assert.That(got, Is.EqualTo(new[] { encoder1, encoder2 }).AsCollection);
2424}
25252626[Test]
@@ -31,9 +31,13 @@ public void CanEncode()
3131new ObjectToEncoderInstanceEncoder<Uri>(),
3232};
333334-Assert.IsTrue(group.CanEncode(typeof(Tuple<int>)));
35-Assert.IsTrue(group.CanEncode(typeof(Uri)));
36-Assert.IsFalse(group.CanEncode(typeof(string)));
34+Assert.Multiple(() =>
35+{
36+Assert.That(group.CanEncode(typeof(Tuple<int>)), Is.True);
37+Assert.That(group.CanEncode(typeof(Uri)), Is.True);
38+Assert.That(group.CanEncode(typeof(string)), Is.False);
39+});
40+3741}
38423943[Test]
@@ -50,12 +54,12 @@ public void Encodes()
50545155var uri = group.TryEncode(new Uri("data:"));
5256var clrObject = (CLRObject)ManagedType.GetManagedObject(uri);
53-Assert.AreSame(encoder1, clrObject.inst);
54-Assert.AreNotSame(encoder2, clrObject.inst);
57+Assert.That(clrObject.inst, Is.SameAs(encoder1));
58+Assert.That(clrObject.inst, Is.Not.SameAs(encoder2));
55595660var tuple = group.TryEncode(Tuple.Create(1));
5761clrObject = (CLRObject)ManagedType.GetManagedObject(tuple);
58-Assert.AreSame(encoder0, clrObject.inst);
62+Assert.That(clrObject.inst, Is.SameAs(encoder0));
5963}
60646165[Test]
@@ -72,11 +76,11 @@ public void GetDecodersByTypes()
7276};
73777478var decoder = group.GetDecoder(pyfloat, typeof(string));
75-Assert.AreSame(decoder2, decoder);
79+Assert.That(decoder, Is.SameAs(decoder2));
7680decoder = group.GetDecoder(pystr, typeof(string));
77-Assert.IsNull(decoder);
81+Assert.That(decoder, Is.Null);
7882decoder = group.GetDecoder(pyint, typeof(long));
79-Assert.AreSame(decoder1, decoder);
83+Assert.That(decoder, Is.SameAs(decoder1));
8084}
8185[Test]
8286public void CanDecode()
@@ -91,10 +95,14 @@ public void CanDecode()
9195decoder2,
9296};
939794-Assert.IsTrue(group.CanDecode(pyint, typeof(long)));
95-Assert.IsFalse(group.CanDecode(pyint, typeof(int)));
96-Assert.IsTrue(group.CanDecode(pyfloat, typeof(string)));
97-Assert.IsFalse(group.CanDecode(pystr, typeof(string)));
98+Assert.Multiple(() =>
99+{
100+Assert.That(group.CanDecode(pyint, typeof(long)));
101+Assert.That(group.CanDecode(pyint, typeof(int)), Is.False);
102+Assert.That(group.CanDecode(pyfloat, typeof(string)));
103+Assert.That(group.CanDecode(pystr, typeof(string)), Is.False);
104+});
105+98106}
99107100108[Test]
@@ -109,24 +117,14 @@ public void Decodes()
109117decoder2,
110118};
111119112-Assert.IsTrue(group.TryDecode(new PyInt(10), out long longResult));
113-Assert.AreEqual(42, longResult);
114-Assert.IsTrue(group.TryDecode(new PyFloat(10), out string strResult));
115-Assert.AreSame("atad:", strResult);
116-117-Assert.IsFalse(group.TryDecode(new PyInt(10), out int _));
118-}
119-120-[SetUp]
121-public void SetUp()
122-{
123-PythonEngine.Initialize();
124-}
125-126-[TearDown]
127-public void Dispose()
128-{
129-PythonEngine.Shutdown();
120+Assert.Multiple(() =>
121+{
122+Assert.That(group.TryDecode(new PyInt(10), out long longResult));
123+Assert.That(longResult, Is.EqualTo(42));
124+Assert.That(group.TryDecode(new PyFloat(10), out string strResult));
125+Assert.That(strResult, Is.SameAs("atad:"));
126+Assert.That(group.TryDecode(new PyInt(10), out int _), Is.False);
127+});
130128}
131129}
132130}