Fixed tests to reflect changes in Align and _scale().

Author: pnuu

.travis.yml

@@ -5,11 +5,11 @@ python:
   - '3.2'
   - '3.3'
   - '3.4'
-virtualenv:
-  system_site_packages: true
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq python-numpy python-matplotlib python-pythonmagick
+virtualenv:
+  system_site_packages: true
 install:
   - pip install .
 script: nosetests

tests/unittests/test_align.py

@@ -14,7 +14,9 @@ def setUp(self):
         # area to search (whole image)
         srch_area = [0, 0, 31, 31]
 
-        self.align = Align(img, ref_loc=ref_loc, srch_area=srch_area)
+        self.align = Align(img)
+        self.align.set_reference(ref_loc)
+        self.align.set_search_area(srch_area)
 
     def test_simple_match(self):
         # image to be matched

tests/unittests/test_image.py

@@ -1,6 +1,6 @@
 import unittest
 import os
-from halostack.image import Image
+from halostack.image import Image, _scale
 import numpy as np
 
 class TestImage(unittest.TestCase):
@@ -138,27 +138,27 @@ def test_rgb_subtract(self):
         self.assertItemsEqual(correct_result, img.img)
 
     def test_scale_values(self):
-        self.img_rand8._scale(8)
+        self.img_rand8.img = _scale(self.img_rand8.img, 8)
         self.assertTrue(self.img_rand8.img.dtype == 'uint8')
         self.assertTrue(self.img_rand8.min() == 0)
         self.assertTrue(self.img_rand8.max() == 255)
 
-        self.img_rand16._scale(16)
+        self.img_rand16.img = _scale(self.img_rand16.img, 16)
         self.assertTrue(self.img_rand16.img.dtype == 'uint16')
         self.assertTrue(self.img_rand16.min() == 0)
         self.assertTrue(self.img_rand16.max() == 2**16-1)
 
-        self.img_rand_big1._scale(8)
+        self.img_rand_big1.img = _scale(self.img_rand_big1.img, 8)
         self.assertTrue(self.img_rand_big1.img.dtype == 'uint8')
         self.assertTrue(self.img_rand_big1.min() == 0)
         self.assertTrue(self.img_rand_big1.max() == 255)
 
-        self.img_rand_big2._scale(16)
+        self.img_rand_big2.img = _scale(self.img_rand_big2.img, 16)
         self.assertTrue(self.img_rand_big2.img.dtype == 'uint16')
         self.assertTrue(self.img_rand_big2.min() == 0)
         self.assertTrue(self.img_rand_big2.max() == 2**16-1)
 
-        self.img_rand_neg._scale(8)
+        self.img_rand_neg.img = _scale(self.img_rand_neg.img, 8)
         self.assertTrue(self.img_rand_neg.min() >= 0)
 
     def assertItemsEqual(self, a, b):

tests/unittests/test_stack.py

@@ -1,6 +1,6 @@
 import unittest
 import os
-from halostack.image import Image
+from halostack.image import Image, _scale
 from halostack.stack import Stack
 import numpy as np
 
@@ -55,7 +55,7 @@ def test_mean_stack(self):
                                                          dtype=np.float))
         stack.stack.img[1, 1, 1] = 13
         stack.stack.img[2, 2, 1] = 23
-        stack.stack._scale(16)
+        stack.stack.img = _scale(stack.stack.img, 16)
         result = stack.stack.img
         self.assertTrue(result.min() == 0)
         self.assertTrue(result[1, 1, 1] == 32767)