Skip to content

Commit 591bbec

Browse files
perado42perado42
committed
git-svn-id: file:///dta/svn/old/PyPES/trunk@547 91a45504-6d28-49e1-87dd-05d800df9125
1 parent dbe5723 commit 591bbec

File tree

9 files changed

+33
-28
lines changed

9 files changed

+33
-28
lines changed

‎doc/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ Contents:
1010
.. toctree::
1111
:maxdepth: 2
1212

13+
tutorial.rst
1314
guidelines.rst
14-
test.rst
1515

1616
Indices and tables
1717
==================

‎doc/tutorial.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
********
2+
Tutorial
3+
********
4+
5+
test

‎src/pypestest/proto/form/connection.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def check_conn_1( self, inst, msg=None ):
5151
self.assert_( isinstance( inst.lscope, ProtoForm ), msg );
5252
self.assert_( isinstance( inst.rscope, Handle ), msg );
5353
self.assertEquals( inst.rscope.hid, 1, msg );
54-
self.assertEquals( inst.holes, [ inst.rscope ] );
54+
self.assertSequenceEqual( inst.holes, [ inst.rscope ] );
5555

5656
def test_1( self ):
5757

@@ -74,10 +74,10 @@ def check_conn_2( self, inst, msg=None ):
7474

7575
self.assert_( isinstance( inst.connective, Functor ), msg );
7676
self.assert_( isinstance( inst.connective.referent, Word ), msg );
77-
self.assertEquals( inst.connective.referent.lemma, ["and"], msg );
77+
self.assertSequenceEqual( inst.connective.referent.lemma, ["and"], msg );
7878
self.assert_( isinstance( inst.lscope, Handle ), msg );
7979
self.assert_( isinstance( inst.rscope, ProtoForm ), msg );
80-
self.assertEquals( inst.holes, [ inst.lscope ] );
80+
self.assertSequenceEqual( inst.holes, [ inst.lscope ] );
8181

8282
def test_2( self ):
8383

@@ -106,7 +106,7 @@ def check_conn_3( self, inst, msg=None ):
106106
self.assert_( isinstance( inst.lscope, ProtoForm ), msg );
107107
self.assert_( isinstance( inst.rscope, Handle ), msg );
108108
self.assertEquals( inst.rscope.hid, 1, msg );
109-
self.assertEquals( inst.holes, [] );
109+
self.assertSequenceEqual( inst.holes, [] );
110110

111111
def test_3( self ):
112112

‎src/pypestest/proto/form/modification.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def check_modification_1( self, inst, msg=None ):
5151
self.assert_( isinstance( inst.modality, Functor ), msg );
5252
self.assertEquals( inst.modality.fid, 5, msg );
5353
self.assert_( isinstance( inst.modality.referent, Word ), msg );
54-
self.assertEquals( inst.modality.referent.lemma, ["told"], msg );
54+
self.assertSequenceEqual( inst.modality.referent.lemma, ["told"], msg );
5555

5656
labels = set();
5757
vars = set();
@@ -66,12 +66,12 @@ def check_modification_1( self, inst, msg=None ):
6666
self.assert_( isinstance( inst.args[ arg ].sort, Sort ), msg );
6767
self.assertEquals( inst.args[ arg ].sort.sid, "x", msg );
6868

69-
self.assertEquals( labels, { "arg1", "arg2" } );
69+
self.assertSetEqual( labels, { "arg1", "arg2" } );
7070
self.assertEquals( len( vars ), 2 );
7171

7272
self.assert_( isinstance( inst.scope, Handle ), msg );
7373
self.assertEquals( inst.scope.hid, 1, msg );
74-
self.assertEquals( inst.holes, [inst.scope] );
74+
self.assertSequenceEqual( inst.holes, [inst.scope] );
7575

7676
def test_1( self ):
7777

@@ -118,7 +118,7 @@ def check_modification_3( self, inst, msg=None ):
118118
self.assert_( isinstance( inst.modality.referent, Operator ), msg );
119119
self.assertEquals( inst.modality.referent.otype, Operator.OP_M_NULL, msg );
120120
self.assert_( isinstance( inst.scope, Handle ), msg );
121-
self.assertEquals( inst.holes, [inst.scope] );
121+
self.assertSequenceEqual( inst.holes, [inst.scope] );
122122

123123

124124
def test_3( self ):

‎src/pypestest/proto/form/predication.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def check_pred_1( self, inst, msg=None ):
4747
self.assert_( isinstance( inst.predicate, Functor ), msg );
4848
self.assertEquals( inst.predicate.fid, 5, msg );
4949
self.assert_( isinstance( inst.predicate.referent, Word ), msg );
50-
self.assertEquals( inst.predicate.referent.lemma, ["cat"], msg );
50+
self.assertSequenceEqual( inst.predicate.referent.lemma, ["cat"], msg );
5151
labels = set();
5252
vars = set();
5353
for arg in inst.args:
@@ -59,9 +59,9 @@ def check_pred_1( self, inst, msg=None ):
5959
self.assertEquals( inst.args[ arg ].vid, 1, msg );
6060
self.assert_( isinstance( inst.args[ arg ].sort, Sort ), msg );
6161
self.assertEquals( inst.args[ arg ].sort.sid, "x", msg );
62-
self.assertEquals( labels, { "arg1" }, msg );
62+
self.assertSetEqual( labels, { "arg1" }, msg );
6363
self.assertEquals( len( vars ), 1, msg );
64-
self.assertEquals( inst.holes, [] );
64+
self.assertSequenceEqual( inst.holes, [] );
6565

6666
def test_1( self ):
6767

@@ -103,9 +103,9 @@ def check_pred_2( self, inst, msg=None ):
103103
self.assert_( isinstance( inst.args[ arg ], Constant ), msg );
104104
self.assertEquals( inst.args[ arg ].ident, "Jones", msg );
105105

106-
self.assertEquals( labels, { "ARG0", "ARG1" }, msg );
106+
self.assertSetEqual( labels, { "ARG0", "ARG1" }, msg );
107107
self.assertEquals( len( vars ), 2, msg );
108-
self.assertEquals( inst.holes, [] );
108+
self.assertSequenceEqual( inst.holes, [] );
109109

110110
def test_2( self ):
111111

‎src/pypestest/proto/form/protoform.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def check_pf_2( self, inst, msg=None ):
102102
self.assert_( isinstance( sf1.quantifier, Functor ), msg );
103103
self.assertEquals( sf1.quantifier.fid, 0, msg );
104104
self.assert_( isinstance( sf1.quantifier.referent, Word ), msg );
105-
self.assertEquals( sf1.quantifier.referent.lemma, ["Every"], msg );
105+
self.assertSequenceEqual( sf1.quantifier.referent.lemma, ["Every"], msg );
106106

107107
x1 = sf1.var;
108108

@@ -123,7 +123,7 @@ def check_pf_2( self, inst, msg=None ):
123123
self.assert_( isinstance( sf_.predicate, Functor ), msg );
124124
self.assertEquals( sf_.predicate.fid, 6, msg );
125125
self.assert_( isinstance( sf_.predicate.referent, Word ), msg );
126-
self.assertEquals( sf_.predicate.referent.lemma, ["man"], msg );
126+
self.assertSequenceEqual( sf_.predicate.referent.lemma, ["man"], msg );
127127

128128
sf_args = {};
129129
for arg in sf_.args:
@@ -141,7 +141,7 @@ def check_pf_2( self, inst, msg=None ):
141141
self.assert_( isinstance( sf3.quantifier, Functor ), msg );
142142
self.assertEquals( sf3.quantifier.fid, 16, msg );
143143
self.assert_( isinstance( sf3.quantifier.referent, Word ), msg );
144-
self.assertEquals( sf3.quantifier.referent.lemma, ["a"], msg );
144+
self.assertSequenceEqual( sf3.quantifier.referent.lemma, ["a"], msg );
145145

146146
x2 = sf3.var;
147147

@@ -162,7 +162,7 @@ def check_pf_2( self, inst, msg=None ):
162162
self.assert_( isinstance( sf__.predicate, Functor ), msg );
163163
self.assertEquals( sf__.predicate.fid, 18, msg );
164164
self.assert_( isinstance( sf__.predicate.referent, Word ), msg );
165-
self.assertEquals( sf__.predicate.referent.lemma, ["woman"], msg );
165+
self.assertSequenceEqual( sf__.predicate.referent.lemma, ["woman"], msg );
166166

167167
sf__args = {};
168168
for arg in sf__.args:
@@ -180,7 +180,7 @@ def check_pf_2( self, inst, msg=None ):
180180
self.assert_( isinstance( sf5.predicate, Functor ), msg );
181181
self.assertEquals( sf5.predicate.fid, 10, msg );
182182
self.assert_( isinstance( sf5.predicate.referent, Word ), msg );
183-
self.assertEquals( sf5.predicate.referent.lemma, ["loves"], msg );
183+
self.assertSequenceEqual( sf5.predicate.referent.lemma, ["loves"], msg );
184184

185185
sf5args = {};
186186
for arg in sf5.args:
@@ -278,7 +278,7 @@ def check_pf_3( self, inst, msg=None ):
278278

279279
sf2 = inst.subforms[ inst.roots[1] ];
280280
sf7 = sf2.subforms[ sf2.roots[2] ];
281-
self.assertEquals( sf2.holes, [ sf7.scope ] );
281+
self.assertSequenceEqual( sf2.holes, [ sf7.scope ] );
282282

283283
def test_3( self ):
284284

‎src/pypestest/proto/form/quantification.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def check_quant_1( self, inst, msg=None ):
6363
self.assert_( isinstance( inst.rstr, ProtoForm ), msg );
6464
self.assert_( isinstance( inst.body, Handle ), msg );
6565
self.assertEquals( inst.body.hid, 1, msg );
66-
self.assertEquals( inst.holes, [ inst.body ] );
66+
self.assertSequenceEqual( inst.holes, [ inst.body ] );
6767

6868
def test_1( self ):
6969

@@ -87,15 +87,15 @@ def check_quant_2( self, inst, msg=None ):
8787

8888
self.assert_( isinstance( inst.quantifier, Functor ), msg );
8989
self.assert_( isinstance( inst.quantifier.referent, Word ), msg );
90-
self.assertEquals( inst.quantifier.referent.lemma, ["every"], msg );
90+
self.assertSequenceEqual( inst.quantifier.referent.lemma, ["every"], msg );
9191
self.assert_( isinstance( inst.var, Variable ), msg );
9292
self.assertEquals( inst.var.vid, 1, msg );
9393
self.assert_( isinstance( inst.var.sort, Sort ), msg );
9494
self.assertEquals( inst.var.sort.sid, "x", msg );
9595
self.assert_( isinstance( inst.rstr, Handle ), msg );
9696
self.assertEquals( inst.rstr.hid, None, msg );
9797
self.assert_( isinstance( inst.body, ProtoForm ), msg );
98-
self.assertEquals( inst.holes, [] );
98+
self.assertSequenceEqual( inst.holes, [] );
9999

100100

101101
def test_2( self ):

‎src/pypestest/proto/lex/basic.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def init_word_1( self ):
3737
def check_word_1( self, inst, msg=None ):
3838

3939
self.assert_( isinstance( inst, Word ), msg );
40-
self.assertEquals( inst.lemma, ["lemma"], msg );
40+
self.assertSequenceEqual( inst.lemma, ["lemma"], msg );
4141
self.assertEquals( inst.pos, None, msg );
4242
self.assertEquals( inst.sense, None, msg );
4343

@@ -54,7 +54,7 @@ def init_word_2( self ):
5454
def check_word_2( self, inst, msg=None ):
5555

5656
self.assert_( isinstance( inst, Word ), msg );
57-
self.assertEquals( inst.lemma, ["lemma1","lemma2"], msg );
57+
self.assertSequenceEqual( inst.lemma, ["lemma1","lemma2"], msg );
5858
self.assertEquals( inst.pos, None, msg );
5959
self.assertEquals( inst.sense, None, msg );
6060

@@ -109,7 +109,7 @@ def init_word_8( self ):
109109
def check_word_8( self, inst, msg=None ):
110110

111111
self.assert_( isinstance( inst, Word ), msg );
112-
self.assertEquals( inst.lemma, ["lemma"], msg );
112+
self.assertSequenceEqual( inst.lemma, ["lemma"], msg );
113113
self.assertEquals( inst.pos, "p", msg );
114114
self.assertEquals( inst.sense, "1", msg );
115115

‎src/pypestest/proto/sig/functor.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def check_funct_1( self, inst, msg=None ):
3838

3939
self.assert_( isinstance( inst.referent, Word ), msg );
4040
self.assertEquals( inst.fid, 5, msg );
41-
self.assertEquals( inst.referent.lemma, ["man"], msg );
41+
self.assertSequenceEqual( inst.referent.lemma, ["man"], msg );
4242

4343
def test_1( self ):
4444

@@ -76,7 +76,7 @@ def check_funct_3( self, inst, msg=None ):
7676

7777
self.assert_( isinstance( inst.referent, Word ), msg );
7878
self.assertEquals( inst.fid, 5, msg );
79-
self.assertEquals( inst.referent.lemma, ["man"], msg );
79+
self.assertSequenceEqual( inst.referent.lemma, ["man"], msg );
8080
self.assertEquals( len( inst.feats ), 2, msg );
8181
self.assert_( "pers" in inst.feats, msg );
8282
self.assert_( "num" in inst.feats, msg );

0 commit comments

Comments
 (0)