Skip to content

Commit 772ec8f

Browse files
committed
Remove old tests
1 parent 2166205 commit 772ec8f

16 files changed

+69
-1223
lines changed

.github/workflows/python-lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
- 'test/**.py'
1414

1515
jobs:
16-
build:
16+
lint:
1717
runs-on: ubuntu-latest
1818

1919
steps:

.github/workflows/python-pytest.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
- 'pyproject.toml'
2222

2323
jobs:
24-
build:
24+
pytest:
2525
name: pytest ${{ matrix.python-version }}/${{ matrix.mediawiki-version }}
2626
runs-on: ubuntu-latest
2727

@@ -32,6 +32,9 @@ jobs:
3232

3333
steps:
3434
- uses: actions/checkout@v3.1.0
35+
- uses: KengoTODA/actions-setup-docker-compose@main
36+
with:
37+
version: '1.29.2'
3538
- name: Set up Docker containers with v${{ matrix.mediawiki-version }}
3639
run: |
3740
docker-compose -f ./docker-compose.yml -f ./docker-compose.extra.yml up -d

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ python_requires = >=3.7, <=3.11
4545
[options.extras_require]
4646
dev =
4747
pytest
48+
pytest-order
4849
pylint
4950
pylint-exit
5051
mypy

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
extras_require={
1616
"dev": [
1717
"pytest",
18+
"pytest-order",
1819
"pylint",
1920
"pylint-exit",
2021
"mypy",

test/test_all.py

Lines changed: 0 additions & 196 deletions
This file was deleted.

test/test_entity_item.py

Lines changed: 59 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,82 @@
1-
import unittest
1+
import logging
22

3+
import pytest
34
import requests
45

5-
from wikibaseintegrator import WikibaseIntegrator
6+
from wikibaseintegrator import WikibaseIntegrator, wbi_login
67
from wikibaseintegrator.datatypes import BaseDataType, Item
78
from wikibaseintegrator.wbi_config import config as wbi_config
89
from wikibaseintegrator.wbi_exceptions import NonExistentEntityError
910

1011
wbi_config['USER_AGENT'] = 'WikibaseIntegrator-pytest/1.0 (test_entity_item.py)'
12+
wbi_config['MEDIAWIKI_API_URL'] = 'http://localhost/w/api.php'
13+
wbi_config['SPARQL_ENDPOINT_URL'] = 'http://localhost:8834/proxy/wdqs/bigdata/namespace/wdq/sparql'
14+
wbi_config['WIKIBASE_URL'] = 'http://wikibase.svc'
1115

12-
wbi = WikibaseIntegrator()
16+
wbi = WikibaseIntegrator(login=wbi_login.Login(user='admin', password='change-this-password'))
17+
logging.basicConfig(level=logging.DEBUG)
1318

1419

15-
class TestEntityItem(unittest.TestCase):
20+
@pytest.mark.order('first')
21+
@pytest.fixture
22+
def test_item_creation():
23+
return wbi.item.new().write().id
1624

17-
def test_get(self):
18-
# Test with complete id
19-
assert wbi.item.get('Q582').id == 'Q582'
20-
# Test with numeric id as string
21-
assert wbi.item.get('582').id == 'Q582'
22-
# Test with numeric id as int
23-
assert wbi.item.get(582).id == 'Q582'
2425

25-
# Test with invalid id
26-
with self.assertRaises(ValueError):
27-
wbi.item.get('L5')
26+
def test_get(test_item_creation):
27+
entity_id = test_item_creation
28+
# Test with complete id
29+
assert wbi.item.get(entity_id).id == entity_id
30+
# Test with numeric id as string
31+
assert wbi.item.get(entity_id).id == entity_id
32+
# Test with numeric id as int
33+
assert wbi.item.get(entity_id).id == entity_id
2834

29-
# Test with zero id
30-
with self.assertRaises(ValueError):
31-
wbi.item.get(0)
35+
# Test with invalid id
36+
with self.assertRaises(ValueError):
37+
wbi.item.get('L5')
3238

33-
# Test with negative id
34-
with self.assertRaises(ValueError):
35-
wbi.item.get(-1)
39+
# Test with zero id
40+
with self.assertRaises(ValueError):
41+
wbi.item.get(0)
3642

37-
# Test with negative id
38-
with self.assertRaises(NonExistentEntityError):
39-
wbi.item.get("Q99999999999999")
43+
# Test with negative id
44+
with self.assertRaises(ValueError):
45+
wbi.item.get(-1)
4046

41-
def test_get_json(self):
42-
assert wbi.item.get('Q582').get_json()['labels']['fr']['value'] == 'Villeurbanne'
47+
# Test with negative id
48+
with self.assertRaises(NonExistentEntityError):
49+
wbi.item.get("Q99999999999999")
4350

44-
def test_write(self):
45-
with self.assertRaises(requests.exceptions.JSONDecodeError):
46-
wbi.item.get('Q582').write(allow_anonymous=True, mediawiki_api_url='https://httpstat.us/200')
4751

48-
def test_write_not_required(self):
49-
assert not wbi.item.get('Q582').write_required(base_filter=[BaseDataType(prop_nr='P1791')])
52+
def test_get_json():
53+
assert wbi.item.get('Q582').get_json()['labels']['fr']['value'] == 'Villeurbanne'
5054

51-
def test_write_required(self):
52-
item = wbi.item.get('Q582')
53-
item.claims.add(Item(prop_nr='P1791', value='Q42'))
54-
assert item.write_required([BaseDataType(prop_nr='P1791')])
5555

56-
def test_write_not_required_ref(self):
57-
assert not wbi.item.get('Q582').write_required(base_filter=[BaseDataType(prop_nr='P2581')], use_refs=True)
56+
def test_write():
57+
with self.assertRaises(requests.exceptions.JSONDecodeError):
58+
wbi.item.get('Q582').write(allow_anonymous=True, mediawiki_api_url='https://httpstat.us/200')
5859

59-
def test_write_required_ref(self):
60-
item = wbi.item.get('Q582')
61-
item.claims.get('P2581')[0].references.references.pop()
62-
assert item.write_required(base_filter=[BaseDataType(prop_nr='P2581')], use_refs=True)
6360

64-
def test_long_item_id(self):
65-
assert wbi.item.get('Item:Q582').id == 'Q582'
61+
def test_write_not_required():
62+
assert not wbi.item.get('Q582').write_required(base_filter=[BaseDataType(prop_nr='P1791')])
63+
64+
65+
def test_write_required():
66+
item = wbi.item.get('Q582')
67+
item.claims.add(Item(prop_nr='P1791', value='Q42'))
68+
assert item.write_required([BaseDataType(prop_nr='P1791')])
69+
70+
71+
def test_write_not_required_ref():
72+
assert not wbi.item.get('Q582').write_required(base_filter=[BaseDataType(prop_nr='P2581')], use_refs=True)
73+
74+
75+
def test_write_required_ref():
76+
item = wbi.item.get('Q582')
77+
item.claims.get('P2581')[0].references.references.pop()
78+
assert item.write_required(base_filter=[BaseDataType(prop_nr='P2581')], use_refs=True)
79+
80+
81+
def test_long_item_id():
82+
assert wbi.item.get('Item:Q582').id == 'Q582'

0 commit comments

Comments
 (0)