diff --git a/evesde/eveapi/__init__.py b/evesde/eveapi/__init__.py index 6b89d0d..8db3773 100644 --- a/evesde/eveapi/__init__.py +++ b/evesde/eveapi/__init__.py @@ -8,7 +8,7 @@ from eveapi import EVEAPIConnection from evesde.models.cache import EVEAPICache -class EVEAPICache(object): +class EVEAPICacheHandler(object): def hash(self, data): from hashlib import sha1 @@ -40,6 +40,6 @@ class EVEAPICache(object): def get_api_connection(): - cache_handler = getattr(settings, 'EVE_SDE_CACHE_HANDLER', 'evesde.eveapi.EVEAPICache') + cache_handler = getattr(settings, 'EVE_SDE_CACHE_HANDLER', 'evesde.eveapi.EVEAPICacheHandler') cache_obj = import_by_path(cache_handler) - return EVEAPIConnection(cacheHandler=cache_obj) \ No newline at end of file + return EVEAPIConnection(cacheHandler=cache_obj()) \ No newline at end of file diff --git a/evesde/eveapi/eve.py b/evesde/eveapi/eve.py index 4fcc825..0b89a14 100644 --- a/evesde/eveapi/eve.py +++ b/evesde/eveapi/eve.py @@ -18,6 +18,9 @@ def import_conquerable_stations(): obj = Station(pk=station.stationID) obj.name = station.stationName obj.system_id = station.solarSystemID + obj.x = 0 + obj.y = 0 + obj.z = 0 objs.append(obj) with transaction.atomic(): diff --git a/evesde/tests.py b/evesde/tests.py index 501deb7..51d006b 100644 --- a/evesde/tests.py +++ b/evesde/tests.py @@ -1,16 +1,15 @@ -""" -This file demonstrates writing tests using the unittest module. These will pass -when you run "manage.py test". - -Replace this with more appropriate tests for your application. -""" - from django.test import TestCase +from evesde.models.locations import Station +from evesde.eveapi.eve import import_conquerable_stations -class SimpleTest(TestCase): - def test_basic_addition(self): - """ - Tests that 1 + 1 always equals 2. - """ - self.assertEqual(1 + 1, 2) +class TestConquerableStationsImport(TestCase): + """Tests the import_conquerable_stations function""" + + def setUp(self): + Station.objects.all().delete() + + def test_import_stations(self): + import_conquerable_stations() + self.assertGreater(Station.objects.count(), 0) +