Skip to content

Add test coverage for ee_types.py and make Object a string #617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −2
Open

Add test coverage for ee_types.py and make Object a string #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion python/ee/ee_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def isSubtype(firstType: str, secondType: str) -> bool:
'Collection', 'ImageCollection', 'FeatureCollection')
elif firstType in ('FeatureCollection', 'Collection'):
return secondType in ('Collection', 'ImageCollection', 'FeatureCollection')
elif firstType == object:
elif firstType == 'Object':
return True
else:
return False
Expand Down
19 changes: 18 additions & 1 deletion python/ee/tests/ee_types_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
import datetime

import unittest
from ee import apitestcase
from ee import ee_list
from ee import ee_number
from ee import ee_types


class EeTypesTest(unittest.TestCase):
class EeTypesTest(apitestcase.ApiTestCase):

def test_class_to_name(self):
self.assertEqual('List', ee_types.classToName(ee_list.List))
Expand All @@ -27,6 +28,22 @@ class Foo:

self.assertEqual('Object', ee_types.classToName(Foo))

def test_is_subtype(self):
self.assertTrue(ee_types.isSubtype('Image', 'Image'))
self.assertTrue(ee_types.isSubtype('Element', 'Image'))
self.assertTrue(ee_types.isSubtype('Collection', 'ImageCollection'))
self.assertTrue(ee_types.isSubtype('FeatureCollection', 'ImageCollection'))
self.assertTrue(ee_types.isSubtype('Object', 'Image'))
self.assertFalse(ee_types.isSubtype('Image', 'Element'))

def test_is_array(self):
self.assertTrue(ee_types.isArray([]))
self.assertTrue(ee_types.isArray(()))
self.assertTrue(ee_types.isArray(ee_list.List([1, 2])))
self.assertFalse(ee_types.isArray(1))
self.assertFalse(ee_types.isArray('string'))
self.assertFalse(ee_types.isArray(ee_number.Number(1)))


if __name__ == '__main__':
unittest.main()
Loading