-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
153 additions
and
156 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,75 +1,75 @@ | ||
| # import unittest | ||
| # from ..dialamoon import Moon | ||
| # from ..terminal_ui import TerminalUi | ||
| # from datetime import datetime | ||
| # from time import sleep | ||
| # import numpy | ||
| # import copy | ||
| import unittest | ||
| from ..dialamoon import Moon | ||
| from ..terminal_ui import TerminalUi | ||
| from datetime import datetime | ||
| from time import sleep | ||
| import numpy | ||
| import copy | ||
|
|
||
| # class TestMoonCache(unittest.TestCase): | ||
| # def test_caches_json_year_data(self): | ||
| # m = Moon() | ||
| # m.set_moon_datetime(date="2019-01-01") | ||
| # m.make_json_year_mooninfo_url() | ||
| # time1 = datetime.now() | ||
| # m.set_mooninfo_requested_year() | ||
| # time2 = datetime.now() | ||
| # sleep(5) | ||
| # time3 = datetime.now() | ||
| # m.set_mooninfo_requested_year() | ||
| # time4 = datetime.now() | ||
| # assert (time4 - time3).seconds == 0 | ||
| class TestMoonCache(unittest.TestCase): | ||
| def test_caches_json_year_data(self): | ||
| m = Moon() | ||
| m.set_moon_datetime(date="2019-01-01") | ||
| m.make_json_year_mooninfo_url() | ||
| time1 = datetime.now() | ||
| m.set_mooninfo_requested_year() | ||
| time2 = datetime.now() | ||
| sleep(5) | ||
| time3 = datetime.now() | ||
| m.set_mooninfo_requested_year() | ||
| time4 = datetime.now() | ||
| assert (time4 - time3).seconds == 0 | ||
|
|
||
|
|
||
| # def test_changes_moon_image_on_second_request(self): | ||
| # m = Moon() | ||
| # m.set_moon_datetime("2019-01-01") | ||
| # m.request_moon_image() | ||
| # url1 = m.url | ||
| # im1 = copy.deepcopy(m.image) | ||
| # m.set_moon_datetime("2020-01-01") | ||
| # url2 = m.url | ||
| # m.request_moon_image() | ||
| # im2 = m.image | ||
| # assert url1 != url2 and not numpy.array_equal(im1,im2) | ||
| def test_changes_moon_image_on_second_request(self): | ||
| m = Moon() | ||
| m.set_moon_datetime("2019-01-01") | ||
| m.request_moon_image() | ||
| url1 = m.url | ||
| im1 = copy.deepcopy(m.image) | ||
| m.set_moon_datetime("2020-01-01") | ||
| url2 = m.url | ||
| m.request_moon_image() | ||
| im2 = m.image | ||
| assert url1 != url2 and not numpy.array_equal(im1,im2) | ||
|
|
||
| # def test_caches_moon_image_from_first_request(self): | ||
| # m = TerminalUi() | ||
| # m.set_moon_datetime("2020-01-06") | ||
| # m.request_moon_image() | ||
| # url1 = m.url | ||
| # im1 = copy.deepcopy(m.image) | ||
| # m.set_moon_datetime("2020-01-01") | ||
| # url2 = m.url | ||
| # m.request_moon_image() | ||
| # im2 = copy.deepcopy( m.image) | ||
| # m.set_moon_datetime("2020-01-06") | ||
| # url3 = m.url | ||
| # time2 = datetime.now() | ||
| # m.request_moon_image() | ||
| # time3 = datetime.now() | ||
| # im3 = copy.deepcopy(m.image) | ||
| # assert url1 == url3 and numpy.array_equal(im1,im3) and (time3 - time2).seconds == 0 | ||
| # assert numpy.array_equal(im1,im3) | ||
| def test_caches_moon_image_from_first_request(self): | ||
| m = TerminalUi() | ||
| m.set_moon_datetime("2020-01-06") | ||
| m.request_moon_image() | ||
| url1 = m.url | ||
| im1 = copy.deepcopy(m.image) | ||
| m.set_moon_datetime("2020-01-01") | ||
| url2 = m.url | ||
| m.request_moon_image() | ||
| im2 = copy.deepcopy( m.image) | ||
| m.set_moon_datetime("2020-01-06") | ||
| url3 = m.url | ||
| time2 = datetime.now() | ||
| m.request_moon_image() | ||
| time3 = datetime.now() | ||
| im3 = copy.deepcopy(m.image) | ||
| assert url1 == url3 and numpy.array_equal(im1,im3) and (time3 - time2).seconds == 0 | ||
| assert numpy.array_equal(im1,im3) | ||
|
|
||
| # def test_gets_json_year_data(self): | ||
| # m = Moon() | ||
| # m.set_moon_datetime("2019-01-01") | ||
| # m.make_json_year_mooninfo_url() | ||
| # m.set_mooninfo_requested_year() | ||
| # assert m.moon_year_info[0]["time"] == '01 Jan 2019 00:00 UT' | ||
| def test_gets_json_year_data(self): | ||
| m = Moon() | ||
| m.set_moon_datetime("2019-01-01") | ||
| m.make_json_year_mooninfo_url() | ||
| m.set_mooninfo_requested_year() | ||
| assert m.moon_year_info[0]["time"] == '01 Jan 2019 00:00 UT' | ||
|
|
||
|
|
||
| # def test_saves_time_getting_same_moon_image(self): | ||
| # m = Moon() | ||
| # m.set_moon_datetime("2019-01-01") | ||
| # m.request_moon_image() | ||
| # m.set_moon_datetime("2019-01-02") | ||
| # m.request_moon_image() | ||
| # time1 = datetime.now() | ||
| # m.request_moon_image() | ||
| # time2 = datetime.now() | ||
| # assert (time2 - time1).seconds == 0 | ||
| def test_saves_time_getting_same_moon_image(self): | ||
| m = Moon() | ||
| m.set_moon_datetime("2019-01-01") | ||
| m.request_moon_image() | ||
| m.set_moon_datetime("2019-01-02") | ||
| m.request_moon_image() | ||
| time1 = datetime.now() | ||
| m.request_moon_image() | ||
| time2 = datetime.now() | ||
| assert (time2 - time1).seconds == 0 | ||
|
|
||
| # if __name__ == '__main__': | ||
| # unittest.main() | ||
| if __name__ == '__main__': | ||
| unittest.main() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,15 +8,15 @@ | |
| setup( | ||
| name = 'moon', | ||
| packages = find_packages(), | ||
| version = '1.1.7', | ||
| version = '1.1.8', | ||
| license='MIT', | ||
| description = 'Gets moon visualizations courtesy of SVS, NASA, Ernie Wright', | ||
| long_description_content_type="text/markdown", | ||
| long_description = long_description, | ||
| author = 'Sadie Parker', | ||
| author_email = '[email protected]', | ||
| url = 'https://github.com/spacerest/moon', | ||
| download_url = 'https://github.com/spacerest/moon/archive/v_1_1_7.tar.gz', | ||
| download_url = 'https://github.com/spacerest/moon/archive/v_1_1_8.tar.gz', | ||
| keywords = ['MOON', 'ART'], | ||
| install_requires=[ | ||
| 'numpy~=1.16', | ||
|
|
||