Skip to content

Commit

Permalink
format & lint
Browse files Browse the repository at this point in the history
  • Loading branch information
Jintin committed Oct 4, 2017
1 parent d7d8a46 commit 14e3935
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 50 deletions.
2 changes: 1 addition & 1 deletion andle/android.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def update(path, data, dryrun=False, remote=False, gradle=False, interact=False)

def filter(path, name):
result = []
for root, dir, files in os.walk(path):
for root, _, files in os.walk(path):
for file in fnmatch.filter(files, name):
result.append(root + "/" + file)
return result
Expand Down
2 changes: 1 addition & 1 deletion andle/sdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def load(path=""):

# find dependencies
data["dependency"] = {}

return data


Expand Down
98 changes: 50 additions & 48 deletions andle/tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,59 +14,61 @@


class TestAndle(TestCase):
CURRENT_PATH = os.path.dirname(os.path.abspath(__file__))
SDK_PATH = CURRENT_PATH + "/sdk"
CURRENT_PATH = os.path.dirname(os.path.abspath(__file__))
SDK_PATH = CURRENT_PATH + "/sdk"

def test_sdk(self):
"""
sdk load data test
"""
data = andle.sdk.load(self.SDK_PATH)
print(data)
def test_sdk(self):
"""
sdk load data test
"""
data = andle.sdk.load(self.SDK_PATH)
print(data)

self.assertEqual(data['build-tools'], '23.0.1', "build-tools not correct")
self.assertEqual(data['platforms'], '23', "platforms not correct")

def test_android(self):
"""
update project test
"""
data = andle.sdk.load(self.SDK_PATH)
old = self.CURRENT_PATH + "/src/old.gradle"
dest = self.CURRENT_PATH + "/dest/build.gradle"
new = self.CURRENT_PATH + "/src/new.gradle"
self.assertEqual(data['build-tools'], '23.0.1',
"build-tools not correct")
self.assertEqual(data['platforms'], '23', "platforms not correct")

shutil.copyfile(old, dest)
andle.android.update(self.CURRENT_PATH + "/dest", data)
def test_android(self):
"""
update project test
"""
data = andle.sdk.load(self.SDK_PATH)
old = self.CURRENT_PATH + "/src/old.gradle"
dest = self.CURRENT_PATH + "/dest/build.gradle"
new = self.CURRENT_PATH + "/src/new.gradle"

print(dest)
shutil.copyfile(old, dest)
andle.android.update(self.CURRENT_PATH + "/dest", data)

self.assertTrue(filecmp.cmp(dest, new), "not change")
print(dest)

def test_remote(self):
"""
remote maven test
"""
value = andle.remote.load("com.facebook.android:facebook-android-sdk",
"file:https://" + self.CURRENT_PATH + "/remote/")
self.assertEqual(value, "4.7.0", "version not match")
self.assertTrue(filecmp.cmp(dest, new), "not change")

def test_gradle(self):
"""
gradle version test
"""
value = andle.gradle.load("file:https://" + self.CURRENT_PATH + "/gradle/version")
self.assertEqual(value, "2.8", "version not match")
def test_remote(self):
"""
remote maven test
"""
value = andle.remote.load("com.facebook.android:facebook-android-sdk",
"file:https://" + self.CURRENT_PATH + "/remote/")
self.assertEqual(value, "4.7.0", "version not match")

def test_version(self):
"""
version number test
"""
self.assertEqual(andle.version.newer('1', '2'), 1)
self.assertEqual(andle.version.newer('2', '1'), -1)
self.assertEqual(andle.version.newer('1', '1'), 0)
self.assertEqual(andle.version.newer('13.0.1', '13.00.02'), 1)
self.assertEqual(andle.version.newer('1.1.1.1', '1.1.1.1'), 0)
self.assertEqual(andle.version.newer('1.1.1.2', '1.1.1.1'), -1)
self.assertEqual(andle.version.newer('3.1.1.0', '3.1.2.10'), 1)
self.assertEqual(andle.version.newer('1.1', '1.10'), 1)
def test_gradle(self):
"""
gradle version test
"""
value = andle.gradle.load(
"file:https://" + self.CURRENT_PATH + "/gradle/version")
self.assertEqual(value, "2.8", "version not match")

def test_version(self):
"""
version number test
"""
self.assertEqual(andle.version.newer('1', '2'), 1)
self.assertEqual(andle.version.newer('2', '1'), -1)
self.assertEqual(andle.version.newer('1', '1'), 0)
self.assertEqual(andle.version.newer('13.0.1', '13.00.02'), 1)
self.assertEqual(andle.version.newer('1.1.1.1', '1.1.1.1'), 0)
self.assertEqual(andle.version.newer('1.1.1.2', '1.1.1.1'), -1)
self.assertEqual(andle.version.newer('3.1.1.0', '3.1.2.10'), 1)
self.assertEqual(andle.version.newer('1.1', '1.10'), 1)

0 comments on commit 14e3935

Please sign in to comment.