Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Jul 22, 2023. It is now read-only.
/pythonnetPublic archive
forked frompythonnet/pythonnet

Commit657d674

Browse files
committed
Clean-up Embedded tests
1 parent6e4cf9d commit657d674

11 files changed

+140
-149
lines changed

‎src/embed_tests/TestCustomMarshal.cs

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,30 @@ namespace Python.EmbeddingTest
66
{
77
publicclassTestCustomMarshal
88
{
9+
[OneTimeSetUp]
10+
publicvoidSetUp()
11+
{
12+
PythonEngine.Initialize();
13+
}
14+
15+
[OneTimeTearDown]
16+
publicvoidDispose()
17+
{
18+
PythonEngine.Shutdown();
19+
}
20+
921
[Test]
1022
publicstaticvoidGetManagedStringTwice()
1123
{
1224
conststringexpected="FooBar";
13-
using(Py.GIL())
14-
{
15-
IntPtrop=Runtime.Runtime.PyUnicode_FromString(expected);
16-
strings1=Runtime.Runtime.GetManagedString(op);
17-
strings2=Runtime.Runtime.GetManagedString(op);
1825

19-
Assert.AreEqual(1,Runtime.Runtime.Refcount(op));
20-
Assert.AreEqual(expected,s1);
21-
Assert.AreEqual(expected,s2);
22-
}
26+
IntPtrop=Runtime.Runtime.PyUnicode_FromString(expected);
27+
strings1=Runtime.Runtime.GetManagedString(op);
28+
strings2=Runtime.Runtime.GetManagedString(op);
29+
30+
Assert.AreEqual(1,Runtime.Runtime.Refcount(op));
31+
Assert.AreEqual(expected,s1);
32+
Assert.AreEqual(expected,s2);
2333
}
2434
}
2535
}

‎src/embed_tests/TestPyInt.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,14 @@ public void TestCtorBadString()
134134
publicvoidTestIsIntTypeTrue()
135135
{
136136
vari=newPyInt(5);
137-
Assert.IsTrue(PyInt.IsIntType(i));
137+
Assert.True(PyInt.IsIntType(i));
138138
}
139139

140140
[Test]
141141
publicvoidTestIsIntTypeFalse()
142142
{
143143
vars=newPyString("Foo");
144-
Assert.IsFalse(PyInt.IsIntType(s));
144+
Assert.False(PyInt.IsIntType(s));
145145
}
146146

147147
[Test]

‎src/embed_tests/TestPyList.cs

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,36 @@ namespace Python.EmbeddingTest
77
{
88
publicclassTestPyList
99
{
10+
[OneTimeSetUp]
11+
publicvoidSetUp()
12+
{
13+
PythonEngine.Initialize();
14+
}
15+
16+
[OneTimeTearDown]
17+
publicvoidDispose()
18+
{
19+
PythonEngine.Shutdown();
20+
}
21+
1022
[Test]
1123
publicvoidTestOnPyList()
1224
{
13-
using(Py.GIL())
25+
varlist=newPyList();
26+
27+
list.Append(newPyString("foo"));
28+
list.Append(newPyString("bar"));
29+
list.Append(newPyString("baz"));
30+
varresult=newList<string>();
31+
foreach(PyObjectiteminlist)
1432
{
15-
varlist=newPyList();
16-
list.Append(newPyString("foo"));
17-
list.Append(newPyString("bar"));
18-
list.Append(newPyString("baz"));
19-
varresult=newList<string>();
20-
foreach(PyObjectiteminlist)
21-
{
22-
result.Add(item.ToString());
23-
}
24-
Assert.AreEqual(3,result.Count);
25-
Assert.AreEqual("foo",result[0]);
26-
Assert.AreEqual("bar",result[1]);
27-
Assert.AreEqual("baz",result[2]);
33+
result.Add(item.ToString());
2834
}
35+
36+
Assert.AreEqual(3,result.Count);
37+
Assert.AreEqual("foo",result[0]);
38+
Assert.AreEqual("bar",result[1]);
39+
Assert.AreEqual("baz",result[2]);
2940
}
3041
}
3142
}

‎src/embed_tests/TestPyLong.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,14 @@ public void TestCtorBadString()
150150
publicvoidTestIsIntTypeTrue()
151151
{
152152
vari=newPyLong(5);
153-
Assert.IsTrue(PyLong.IsLongType(i));
153+
Assert.True(PyLong.IsLongType(i));
154154
}
155155

156156
[Test]
157157
publicvoidTestIsLongTypeFalse()
158158
{
159159
vars=newPyString("Foo");
160-
Assert.IsFalse(PyLong.IsLongType(s));
160+
Assert.False(PyLong.IsLongType(s));
161161
}
162162

163163
[Test]

‎src/embed_tests/TestPyNumber.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ public void Dispose()
2222
publicvoidIsNumberTypeTrue()
2323
{
2424
vari=newPyInt(1);
25-
Assert.IsTrue(PyNumber.IsNumberType(i));
25+
Assert.True(PyNumber.IsNumberType(i));
2626
}
2727

2828
[Test]
2929
publicvoidIsNumberTypeFalse()
3030
{
3131
vars=newPyString("Foo");
32-
Assert.IsFalse(PyNumber.IsNumberType(s));
32+
Assert.False(PyNumber.IsNumberType(s));
3333
}
3434
}
3535
}

‎src/embed_tests/TestPyTuple.cs

Lines changed: 67 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,27 @@ namespace Python.EmbeddingTest
66
{
77
publicclassTestPyTuple
88
{
9+
[OneTimeSetUp]
10+
publicvoidSetUp()
11+
{
12+
PythonEngine.Initialize();
13+
}
14+
15+
[OneTimeTearDown]
16+
publicvoidDispose()
17+
{
18+
PythonEngine.Shutdown();
19+
}
20+
921
/// <summary>
1022
/// Test IsTupleType without having to Initialize a tuple.
1123
/// PyTuple constructor use IsTupleType. This decouples the tests.
1224
/// </summary>
1325
[Test]
1426
publicvoidTestStringIsTupleType()
1527
{
16-
using(Py.GIL())
17-
{
18-
vars=newPyString("foo");
19-
Assert.IsFalse(PyTuple.IsTupleType(s));
20-
}
28+
vars=newPyString("foo");
29+
Assert.False(PyTuple.IsTupleType(s));
2130
}
2231

2332
/// <summary>
@@ -26,72 +35,54 @@ public void TestStringIsTupleType()
2635
[Test]
2736
publicvoidTestPyTupleIsTupleType()
2837
{
29-
using(Py.GIL())
30-
{
31-
vart=newPyTuple();
32-
Assert.IsTrue(PyTuple.IsTupleType(t));
33-
}
38+
vart=newPyTuple();
39+
Assert.True(PyTuple.IsTupleType(t));
3440
}
3541

3642
[Test]
3743
publicvoidTestPyTupleEmpty()
3844
{
39-
using(Py.GIL())
40-
{
41-
vart=newPyTuple();
42-
Assert.AreEqual(0,t.Length());
43-
}
45+
vart=newPyTuple();
46+
Assert.AreEqual(0,t.Length());
4447
}
4548

4649
[Test]
4750
publicvoidTestPyTupleBadCtor()
4851
{
49-
using(Py.GIL())
50-
{
51-
vari=newPyInt(5);
52-
PyTuplet=null;
52+
vari=newPyInt(5);
53+
PyTuplet=null;
5354

54-
varex=Assert.Throws<ArgumentException>(()=>t=newPyTuple(i));
55+
varex=Assert.Throws<ArgumentException>(()=>t=newPyTuple(i));
5556

56-
Assert.AreEqual("object is not a tuple",ex.Message);
57-
Assert.IsNull(t);
58-
}
57+
Assert.AreEqual("object is not a tuple",ex.Message);
58+
Assert.IsNull(t);
5959
}
6060

6161
[Test]
6262
publicvoidTestPyTupleCtorEmptyArray()
6363
{
64-
using(Py.GIL())
65-
{
66-
vara=newPyObject[]{};
67-
vart=newPyTuple(a);
64+
vara=newPyObject[]{};
65+
vart=newPyTuple(a);
6866

69-
Assert.AreEqual(0,t.Length());
70-
}
67+
Assert.AreEqual(0,t.Length());
7168
}
7269

7370
[Test]
7471
publicvoidTestPyTupleCtorArrayPyIntEmpty()
7572
{
76-
using(Py.GIL())
77-
{
78-
vara=newPyInt[]{};
79-
vart=newPyTuple(a);
73+
vara=newPyInt[]{};
74+
vart=newPyTuple(a);
8075

81-
Assert.AreEqual(0,t.Length());
82-
}
76+
Assert.AreEqual(0,t.Length());
8377
}
8478

8579
[Test]
8680
publicvoidTestPyTupleCtorArray()
8781
{
88-
using(Py.GIL())
89-
{
90-
vara=newPyObject[]{newPyInt(1),newPyString("Foo")};
91-
vart=newPyTuple(a);
82+
vara=newPyObject[]{newPyInt(1),newPyString("Foo")};
83+
vart=newPyTuple(a);
9284

93-
Assert.AreEqual(2,t.Length());
94-
}
85+
Assert.AreEqual(2,t.Length());
9586
}
9687

9788
/// <summary>
@@ -108,69 +99,58 @@ public void TestPyTupleCtorArray()
10899
[Test]
109100
publicvoidTestPyTupleInvalidAppend()
110101
{
111-
using(Py.GIL())
112-
{
113-
PyObjects=newPyString("foo");
114-
vart=newPyTuple();
102+
PyObjects=newPyString("foo");
103+
vart=newPyTuple();
115104

116-
varex=Assert.Throws<PythonException>(()=>t.Concat(s));
105+
varex=Assert.Throws<PythonException>(()=>t.Concat(s));
117106

118-
StringAssert.StartsWith("TypeError : can only concatenate tuple",ex.Message);
119-
Assert.AreEqual(0,t.Length());
120-
Assert.IsEmpty(t);
121-
}
107+
StringAssert.StartsWith("TypeError : can only concatenate tuple",ex.Message);
108+
Assert.AreEqual(0,t.Length());
109+
Assert.IsEmpty(t);
122110
}
123111

124112
[Test]
125113
publicvoidTestPyTupleValidAppend()
126114
{
127-
using(Py.GIL())
128-
{
129-
vart0=newPyTuple();
130-
vart=newPyTuple();
131-
t.Concat(t0);
132-
Assert.IsNotNull(t);
133-
Assert.IsInstanceOf(typeof(PyTuple),t);
134-
}
115+
vart0=newPyTuple();
116+
vart=newPyTuple();
117+
t.Concat(t0);
118+
119+
Assert.IsNotNull(t);
120+
Assert.IsInstanceOf(typeof(PyTuple),t);
135121
}
136122

137123
[Test]
138124
publicvoidTestPyTupleStringConvert()
139125
{
140-
using(Py.GIL())
141-
{
142-
PyObjects=newPyString("foo");
143-
PyTuplet=PyTuple.AsTuple(s);
144-
Assert.IsNotNull(t);
145-
Assert.IsInstanceOf(typeof(PyTuple),t);
146-
Assert.AreEqual("f",t[0].ToString());
147-
Assert.AreEqual("o",t[1].ToString());
148-
Assert.AreEqual("o",t[2].ToString());
149-
}
126+
PyObjects=newPyString("foo");
127+
PyTuplet=PyTuple.AsTuple(s);
128+
129+
Assert.IsNotNull(t);
130+
Assert.IsInstanceOf(typeof(PyTuple),t);
131+
Assert.AreEqual("f",t[0].ToString());
132+
Assert.AreEqual("o",t[1].ToString());
133+
Assert.AreEqual("o",t[2].ToString());
150134
}
151135

152136
[Test]
153137
publicvoidTestPyTupleValidConvert()
154138
{
155-
using(Py.GIL())
156-
{
157-
varl=newPyList();
158-
PyTuplet=PyTuple.AsTuple(l);
159-
Assert.IsNotNull(t);
160-
Assert.IsInstanceOf(typeof(PyTuple),t);
161-
}
139+
varl=newPyList();
140+
PyTuplet=PyTuple.AsTuple(l);
141+
142+
Assert.IsNotNull(t);
143+
Assert.IsInstanceOf(typeof(PyTuple),t);
162144
}
163145

164146
[Test]
165147
publicvoidTestNewPyTupleFromPyTuple()
166148
{
167-
using(Py.GIL())
168-
{
169-
vart0=newPyTuple();
170-
vart=newPyTuple(t0);
171-
Assert.IsNotNull(t);
172-
Assert.IsInstanceOf(typeof(PyTuple),t);
173-
}
149+
vart0=newPyTuple();
150+
vart=newPyTuple(t0);
151+
152+
Assert.IsNotNull(t);
153+
Assert.IsInstanceOf(typeof(PyTuple),t);
174154
}
175155

176156
/// <remarks>
@@ -179,16 +159,13 @@ public void TestNewPyTupleFromPyTuple()
179159
[Test]
180160
publicvoidTestInvalidAsTuple()
181161
{
182-
using(Py.GIL())
183-
{
184-
vari=newPyInt(5);
185-
PyTuplet=null;
162+
vari=newPyInt(5);
163+
PyTuplet=null;
186164

187-
varex=Assert.Throws<PythonException>(()=>t=PyTuple.AsTuple(i));
165+
varex=Assert.Throws<PythonException>(()=>t=PyTuple.AsTuple(i));
188166

189-
Assert.AreEqual("TypeError : 'int' object is not iterable",ex.Message);
190-
Assert.IsNull(t);
191-
}
167+
Assert.AreEqual("TypeError : 'int' object is not iterable",ex.Message);
168+
Assert.IsNull(t);
192169
}
193170
}
194171
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp