Skip to content

Commit

Permalink
Replace some android.support references with androidx (#468)
Browse files Browse the repository at this point in the history 
* replace android.support references with androidx

* clarify in documentation that package for android.support is in flux

* make it a todo

partially addresses #470
  • Loading branch information
@dthkao
dthkao authored Jul 18, 2018
1 parent 6f084fc commit 9c5b19e
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 40 deletions.
4 changes: 4 additions & 0 deletions mobly/base_instrumentation_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ class _InstrumentationKnownStatusKeys(object):
android.app.Instrumentation
android.support.test.internal.runner.listener.InstrumentationResultPrinter
TODO: Convert android.support.* to androidx.*,
(https://android-developers.googleblog.com/2018/05/hello-world-androidx.html).
"""

CLASS = 'class'
Expand Down Expand Up @@ -119,6 +121,8 @@ class _InstrumentationStatusCodes(object):
android.support.test.internal.runner.listener.InstrumentationResultPrinter
TODO: Convert android.support.* to androidx.*,
(https://android-developers.googleblog.com/2018/05/hello-world-androidx.html).
"""

UNKNOWN = None
Expand Down
80 changes: 40 additions & 40 deletions tests/mobly/base_instrumentation_test_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,9 +418,9 @@ def test_run_instrumentation_test_with_failing_test(self):
at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:59)
at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
at android.support.test.internal.runner.junit4.statement.RunBefores.evaluate(RunBefores.java:80)
at android.support.test.internal.runner.junit4.statement.RunAfters.evaluate(RunAfters.java:61)
at android.support.test.rule.ActivityTestRule$ActivityStatement.evaluate(ActivityTestRule.java:433)
at androidx.test.internal.runner.junit4.statement.RunBefores.evaluate(RunBefores.java:80)
at androidx.test.internal.runner.junit4.statement.RunAfters.evaluate(RunAfters.java:61)
at androidx.test.rule.ActivityTestRule$ActivityStatement.evaluate(ActivityTestRule.java:433)
at com.my.package.test.BaseTest$3.evaluate(BaseTest.java:96)
at com.my.package.test.BaseTest$4.evaluate(BaseTest.java:109)
at com.my.package.test.BaseTest$2.evaluate(BaseTest.java:77)
Expand All @@ -437,7 +437,7 @@ def test_run_instrumentation_test_with_failing_test(self):
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:60)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:270)
at org.junit.runners.ParentRunner.run(ParentRunner.java:370)
at android.support.test.runner.AndroidJUnit4.run(AndroidJUnit4.java:99)
at androidx.test.runner.AndroidJUnit4.run(AndroidJUnit4.java:99)
at org.junit.runners.Suite.runChild(Suite.java:128)
at org.junit.runners.Suite.runChild(Suite.java:27)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:292)
Expand All @@ -456,7 +456,7 @@ def test_run_instrumentation_test_with_failing_test(self):
at org.junit.runners.ParentRunner.run(ParentRunner.java:370)
at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
at android.support.test.internal.runner.TestExecutor.execute(TestExecutor.java:56)
at androidx.test.internal.runner.TestExecutor.execute(TestExecutor.java:56)
at com.my.package.test.BaseRunner.runTests(BaseRunner.java:344)
at com.my.package.test.BaseRunner.onStart(BaseRunner.java:330)
at com.my.package.test.runner.MyRunner.onStart(MyRunner.java:253)
Expand All @@ -471,9 +471,9 @@ def test_run_instrumentation_test_with_failing_test(self):
at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:59)
at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
at android.support.test.internal.runner.junit4.statement.RunBefores.evaluate(RunBefores.java:80)
at android.support.test.internal.runner.junit4.statement.RunAfters.evaluate(RunAfters.java:61)
at android.support.test.rule.ActivityTestRule$ActivityStatement.evaluate(ActivityTestRule.java:433)
at androidx.test.internal.runner.junit4.statement.RunBefores.evaluate(RunBefores.java:80)
at androidx.test.internal.runner.junit4.statement.RunAfters.evaluate(RunAfters.java:61)
at androidx.test.rule.ActivityTestRule$ActivityStatement.evaluate(ActivityTestRule.java:433)
at com.my.package.test.BaseTest$3.evaluate(BaseTest.java:96)
at com.my.package.test.BaseTest$4.evaluate(BaseTest.java:109)
at com.my.package.test.BaseTest$2.evaluate(BaseTest.java:77)
Expand All @@ -490,7 +490,7 @@ def test_run_instrumentation_test_with_failing_test(self):
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:60)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:270)
at org.junit.runners.ParentRunner.run(ParentRunner.java:370)
at android.support.test.runner.AndroidJUnit4.run(AndroidJUnit4.java:99)
at androidx.test.runner.AndroidJUnit4.run(AndroidJUnit4.java:99)
at org.junit.runners.Suite.runChild(Suite.java:128)
at org.junit.runners.Suite.runChild(Suite.java:27)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:292)
Expand All @@ -509,7 +509,7 @@ def test_run_instrumentation_test_with_failing_test(self):
at org.junit.runners.ParentRunner.run(ParentRunner.java:370)
at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
at android.support.test.internal.runner.TestExecutor.execute(TestExecutor.java:56)
at androidx.test.internal.runner.TestExecutor.execute(TestExecutor.java:56)
at com.my.package.test.BaseRunner.runTests(BaseRunner.java:344)
at com.my.package.test.BaseRunner.onStart(BaseRunner.java:330)
at com.my.package.test.runner.MyRunner.onStart(MyRunner.java:253)
Expand All @@ -529,9 +529,9 @@ def test_run_instrumentation_test_with_failing_test(self):
at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:59)
at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
at android.support.test.internal.runner.junit4.statement.RunBefores.evaluate(RunBefores.java:80)
at android.support.test.internal.runner.junit4.statement.RunAfters.evaluate(RunAfters.java:61)
at android.support.test.rule.ActivityTestRule$ActivityStatement.evaluate(ActivityTestRule.java:433)
at androidx.test.internal.runner.junit4.statement.RunBefores.evaluate(RunBefores.java:80)
at androidx.test.internal.runner.junit4.statement.RunAfters.evaluate(RunAfters.java:61)
at androidx.test.rule.ActivityTestRule$ActivityStatement.evaluate(ActivityTestRule.java:433)
at com.my.package.test.BaseTest$3.evaluate(BaseTest.java:96)
at com.my.package.test.BaseTest$4.evaluate(BaseTest.java:109)
at com.my.package.test.BaseTest$2.evaluate(BaseTest.java:77)
Expand All @@ -548,7 +548,7 @@ def test_run_instrumentation_test_with_failing_test(self):
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:60)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:270)
at org.junit.runners.ParentRunner.run(ParentRunner.java:370)
at android.support.test.runner.AndroidJUnit4.run(AndroidJUnit4.java:99)
at androidx.test.runner.AndroidJUnit4.run(AndroidJUnit4.java:99)
at org.junit.runners.Suite.runChild(Suite.java:128)
at org.junit.runners.Suite.runChild(Suite.java:27)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:292)
Expand All @@ -567,7 +567,7 @@ def test_run_instrumentation_test_with_failing_test(self):
at org.junit.runners.ParentRunner.run(ParentRunner.java:370)
at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
at android.support.test.internal.runner.TestExecutor.execute(TestExecutor.java:56)
at androidx.test.internal.runner.TestExecutor.execute(TestExecutor.java:56)
at com.my.package.test.BaseRunner.runTests(BaseRunner.java:344)
at com.my.package.test.BaseRunner.onStart(BaseRunner.java:330)
at com.my.package.test.runner.MyRunner.onStart(MyRunner.java:253)
Expand Down Expand Up @@ -607,9 +607,9 @@ def test_run_instrumentation_test_with_assumption_failure_test(self):
at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:59)
at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
at android.support.test.internal.runner.junit4.statement.RunBefores.evaluate(RunBefores.java:80)
at android.support.test.internal.runner.junit4.statement.RunAfters.evaluate(RunAfters.java:61)
at android.support.test.rule.ActivityTestRule$ActivityStatement.evaluate(ActivityTestRule.java:433)
at androidx.test.internal.runner.junit4.statement.RunBefores.evaluate(RunBefores.java:80)
at androidx.test.internal.runner.junit4.statement.RunAfters.evaluate(RunAfters.java:61)
at androidx.test.rule.ActivityTestRule$ActivityStatement.evaluate(ActivityTestRule.java:433)
at com.my.package.test.MyBaseTest$3.evaluate(MyBaseTest.java:96)
at com.my.package.test.MyBaseTest$4.evaluate(MyBaseTest.java:109)
at com.my.package.test.MyBaseTest$2.evaluate(MyBaseTest.java:77)
Expand All @@ -626,7 +626,7 @@ def test_run_instrumentation_test_with_assumption_failure_test(self):
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:60)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:270)
at org.junit.runners.ParentRunner.run(ParentRunner.java:370)
at android.support.test.runner.AndroidJUnit4.run(AndroidJUnit4.java:99)
at androidx.test.runner.AndroidJUnit4.run(AndroidJUnit4.java:99)
at org.junit.runners.Suite.runChild(Suite.java:128)
at org.junit.runners.Suite.runChild(Suite.java:27)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:292)
Expand All @@ -645,7 +645,7 @@ def test_run_instrumentation_test_with_assumption_failure_test(self):
at org.junit.runners.ParentRunner.run(ParentRunner.java:370)
at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
at android.support.test.internal.runner.TestExecutor.execute(TestExecutor.java:56)
at androidx.test.internal.runner.TestExecutor.execute(TestExecutor.java:56)
at com.my.package.test.runner.BaseRunner.runTests(BaseRunner.java:344)
at com.my.package.test.runner.BaseRunner.onStart(BaseRunner.java:330)
at com.my.package.test.runner.BaseRunner.onStart(BaseRunner.java:253)
Expand Down Expand Up @@ -827,9 +827,9 @@ def test_run_instrumentation_test_with_multiple_tests(self, mock_get_time):
at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:59)
at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
at android.support.test.internal.runner.junit4.statement.RunBefores.evaluate(RunBefores.java:80)
at android.support.test.internal.runner.junit4.statement.RunAfters.evaluate(RunAfters.java:61)
at android.support.test.rule.ActivityTestRule$ActivityStatement.evaluate(ActivityTestRule.java:433)
at androidx.test.internal.runner.junit4.statement.RunBefores.evaluate(RunBefores.java:80)
at androidx.test.internal.runner.junit4.statement.RunAfters.evaluate(RunAfters.java:61)
at androidx.test.rule.ActivityTestRule$ActivityStatement.evaluate(ActivityTestRule.java:433)
at com.my.package.test.BaseTest$3.evaluate(BaseTest.java:96)
at com.my.package.test.BaseTest$4.evaluate(BaseTest.java:109)
at com.my.package.test.BaseTest$2.evaluate(BaseTest.java:77)
Expand All @@ -846,7 +846,7 @@ def test_run_instrumentation_test_with_multiple_tests(self, mock_get_time):
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:60)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:270)
at org.junit.runners.ParentRunner.run(ParentRunner.java:370)
at android.support.test.runner.AndroidJUnit4.run(AndroidJUnit4.java:99)
at androidx.test.runner.AndroidJUnit4.run(AndroidJUnit4.java:99)
at org.junit.runners.Suite.runChild(Suite.java:128)
at org.junit.runners.Suite.runChild(Suite.java:27)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:292)
Expand All @@ -865,7 +865,7 @@ def test_run_instrumentation_test_with_multiple_tests(self, mock_get_time):
at org.junit.runners.ParentRunner.run(ParentRunner.java:370)
at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
at android.support.test.internal.runner.TestExecutor.execute(TestExecutor.java:56)
at androidx.test.internal.runner.TestExecutor.execute(TestExecutor.java:56)
at com.my.package.test.BaseRunner.runTests(BaseRunner.java:344)
at com.my.package.test.BaseRunner.onStart(BaseRunner.java:330)
at com.my.package.test.runner.MyRunner.onStart(MyRunner.java:253)
Expand All @@ -880,9 +880,9 @@ def test_run_instrumentation_test_with_multiple_tests(self, mock_get_time):
at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:59)
at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
at android.support.test.internal.runner.junit4.statement.RunBefores.evaluate(RunBefores.java:80)
at android.support.test.internal.runner.junit4.statement.RunAfters.evaluate(RunAfters.java:61)
at android.support.test.rule.ActivityTestRule$ActivityStatement.evaluate(ActivityTestRule.java:433)
at androidx.test.internal.runner.junit4.statement.RunBefores.evaluate(RunBefores.java:80)
at androidx.test.internal.runner.junit4.statement.RunAfters.evaluate(RunAfters.java:61)
at androidx.test.rule.ActivityTestRule$ActivityStatement.evaluate(ActivityTestRule.java:433)
at com.my.package.test.BaseTest$3.evaluate(BaseTest.java:96)
at com.my.package.test.BaseTest$4.evaluate(BaseTest.java:109)
at com.my.package.test.BaseTest$2.evaluate(BaseTest.java:77)
Expand All @@ -899,7 +899,7 @@ def test_run_instrumentation_test_with_multiple_tests(self, mock_get_time):
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:60)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:270)
at org.junit.runners.ParentRunner.run(ParentRunner.java:370)
at android.support.test.runner.AndroidJUnit4.run(AndroidJUnit4.java:99)
at androidx.test.runner.AndroidJUnit4.run(AndroidJUnit4.java:99)
at org.junit.runners.Suite.runChild(Suite.java:128)
at org.junit.runners.Suite.runChild(Suite.java:27)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:292)
Expand All @@ -918,7 +918,7 @@ def test_run_instrumentation_test_with_multiple_tests(self, mock_get_time):
at org.junit.runners.ParentRunner.run(ParentRunner.java:370)
at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
at android.support.test.internal.runner.TestExecutor.execute(TestExecutor.java:56)
at androidx.test.internal.runner.TestExecutor.execute(TestExecutor.java:56)
at com.my.package.test.BaseRunner.runTests(BaseRunner.java:344)
at com.my.package.test.BaseRunner.onStart(BaseRunner.java:330)
at com.my.package.test.runner.MyRunner.onStart(MyRunner.java:253)
Expand All @@ -945,9 +945,9 @@ def test_run_instrumentation_test_with_multiple_tests(self, mock_get_time):
at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:59)
at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
at android.support.test.internal.runner.junit4.statement.RunBefores.evaluate(RunBefores.java:80)
at android.support.test.internal.runner.junit4.statement.RunAfters.evaluate(RunAfters.java:61)
at android.support.test.rule.ActivityTestRule$ActivityStatement.evaluate(ActivityTestRule.java:433)
at androidx.test.internal.runner.junit4.statement.RunBefores.evaluate(RunBefores.java:80)
at androidx.test.internal.runner.junit4.statement.RunAfters.evaluate(RunAfters.java:61)
at androidx.test.rule.ActivityTestRule$ActivityStatement.evaluate(ActivityTestRule.java:433)
at com.my.package.test.BaseTest$3.evaluate(BaseTest.java:96)
at com.my.package.test.BaseTest$4.evaluate(BaseTest.java:109)
at com.my.package.test.BaseTest$2.evaluate(BaseTest.java:77)
Expand All @@ -964,7 +964,7 @@ def test_run_instrumentation_test_with_multiple_tests(self, mock_get_time):
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:60)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:270)
at org.junit.runners.ParentRunner.run(ParentRunner.java:370)
at android.support.test.runner.AndroidJUnit4.run(AndroidJUnit4.java:99)
at androidx.test.runner.AndroidJUnit4.run(AndroidJUnit4.java:99)
at org.junit.runners.Suite.runChild(Suite.java:128)
at org.junit.runners.Suite.runChild(Suite.java:27)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:292)
Expand All @@ -983,7 +983,7 @@ def test_run_instrumentation_test_with_multiple_tests(self, mock_get_time):
at org.junit.runners.ParentRunner.run(ParentRunner.java:370)
at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
at android.support.test.internal.runner.TestExecutor.execute(TestExecutor.java:56)
at androidx.test.internal.runner.TestExecutor.execute(TestExecutor.java:56)
at com.my.package.test.BaseRunner.runTests(BaseRunner.java:344)
at com.my.package.test.BaseRunner.onStart(BaseRunner.java:330)
at com.my.package.test.runner.MyRunner.onStart(MyRunner.java:253)
Expand Down Expand Up @@ -1032,9 +1032,9 @@ def test_run_instrumentation_test_with_multiple_tests(self, mock_get_time):
at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:59)
at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
at android.support.test.internal.runner.junit4.statement.RunBefores.evaluate(RunBefores.java:80)
at android.support.test.internal.runner.junit4.statement.RunAfters.evaluate(RunAfters.java:61)
at android.support.test.rule.ActivityTestRule$ActivityStatement.evaluate(ActivityTestRule.java:433)
at androidx.test.internal.runner.junit4.statement.RunBefores.evaluate(RunBefores.java:80)
at androidx.test.internal.runner.junit4.statement.RunAfters.evaluate(RunAfters.java:61)
at androidx.test.rule.ActivityTestRule$ActivityStatement.evaluate(ActivityTestRule.java:433)
at com.my.package.test.BaseTest$3.evaluate(BaseTest.java:96)
at com.my.package.test.BaseTest$4.evaluate(BaseTest.java:109)
at com.my.package.test.BaseTest$2.evaluate(BaseTest.java:77)
Expand All @@ -1051,7 +1051,7 @@ def test_run_instrumentation_test_with_multiple_tests(self, mock_get_time):
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:60)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:270)
at org.junit.runners.ParentRunner.run(ParentRunner.java:370)
at android.support.test.runner.AndroidJUnit4.run(AndroidJUnit4.java:99)
at androidx.test.runner.AndroidJUnit4.run(AndroidJUnit4.java:99)
at org.junit.runners.Suite.runChild(Suite.java:128)
at org.junit.runners.Suite.runChild(Suite.java:27)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:292)
Expand All @@ -1070,7 +1070,7 @@ def test_run_instrumentation_test_with_multiple_tests(self, mock_get_time):
at org.junit.runners.ParentRunner.run(ParentRunner.java:370)
at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
at android.support.test.internal.runner.TestExecutor.execute(TestExecutor.java:56)
at androidx.test.internal.runner.TestExecutor.execute(TestExecutor.java:56)
at com.my.package.test.BaseRunner.runTests(BaseRunner.java:344)
at com.my.package.test.BaseRunner.onStart(BaseRunner.java:330)
at com.my.package.test.runner.MyRunner.onStart(MyRunner.java:253)
Expand Down

0 comments on commit 9c5b19e

Please sign in to comment.