OSDN Git Service

Move some default-methods tests to Java from Smali.
authorAlex Light <allight@google.com>
Tue, 1 Mar 2016 22:33:51 +0000 (14:33 -0800)
committerAlex Light <allight@google.com>
Thu, 3 Mar 2016 19:47:46 +0000 (11:47 -0800)
commitd204ba5ac9c5488880d85dc198e7b6aefea2f0bb
tree1f700bef3ac4b9dc526d6a192841f264193c3f17
parent072cbe0ca5ce75bdb448955aa82257cc05dac610
Move some default-methods tests to Java from Smali.

Move all smali tests for default method behavior in
non-source-incompatible contexts to java. Also move some of the
simpler tests for source and binary incompatibilities into java as
well when possible.

Bug: 27310767

Change-Id: I753196f19849494825953c1bf06f15b7132f459b
108 files changed:
test/048-reflect-v8/build
test/563-checker-invoke-super/build
test/960-default-smali/build
test/960-default-smali/smali/A.smali [deleted file]
test/960-default-smali/smali/Attendant.smali [deleted file]
test/960-default-smali/smali/B.smali [deleted file]
test/960-default-smali/smali/C.smali [deleted file]
test/960-default-smali/smali/D.smali [deleted file]
test/960-default-smali/smali/E.smali [deleted file]
test/960-default-smali/smali/Extension.smali [deleted file]
test/960-default-smali/smali/F.smali [deleted file]
test/960-default-smali/smali/G.smali [deleted file]
test/960-default-smali/smali/Greeter.smali [deleted file]
test/960-default-smali/smali/Greeter2.smali [deleted file]
test/960-default-smali/smali/Greeter3.smali [deleted file]
test/960-default-smali/smali/H.smali [deleted file]
test/960-default-smali/smali/I.smali [deleted file]
test/960-default-smali/smali/J.smali [deleted file]
test/960-default-smali/src/A.java [new file with mode: 0644]
test/960-default-smali/src/Attendant.java [new file with mode: 0644]
test/960-default-smali/src/B.java [new file with mode: 0644]
test/960-default-smali/src/C.java [new file with mode: 0644]
test/960-default-smali/src/D.java [new file with mode: 0644]
test/960-default-smali/src/E.java [new file with mode: 0644]
test/960-default-smali/src/Extension.java [new file with mode: 0644]
test/960-default-smali/src/F.java [new file with mode: 0644]
test/960-default-smali/src/G.java [new file with mode: 0644]
test/960-default-smali/src/Greeter.java [new file with mode: 0644]
test/960-default-smali/src/Greeter2.java [new file with mode: 0644]
test/960-default-smali/src/Greeter3.java [new file with mode: 0644]
test/960-default-smali/src/H.java [new file with mode: 0644]
test/960-default-smali/src/I.java [new file with mode: 0644]
test/960-default-smali/src/J.java [new file with mode: 0644]
test/960-default-smali/src/classes.xml [moved from test/960-default-smali/smali/classes.xml with 100% similarity]
test/961-default-iface-resolution-generated/build
test/961-default-iface-resolution-generated/util-src/generate_java.py [moved from test/961-default-iface-resolution-generated/util-src/generate_smali.py with 71% similarity]
test/962-iface-static/build
test/962-iface-static/smali/Displayer.smali [deleted file]
test/962-iface-static/smali/Main.smali [deleted file]
test/962-iface-static/smali/iface.smali [deleted file]
test/962-iface-static/src/Displayer.java [new file with mode: 0644]
test/962-iface-static/src/Iface.java [new file with mode: 0644]
test/962-iface-static/src/Main.java [new file with mode: 0644]
test/963-default-range-smali/build
test/963-default-range-smali/smali/A.smali [deleted file]
test/963-default-range-smali/smali/Main.smali [deleted file]
test/963-default-range-smali/smali/iface.smali [deleted file]
test/963-default-range-smali/src/A.java [new file with mode: 0644]
test/963-default-range-smali/src/Iface.java [new file with mode: 0644]
test/963-default-range-smali/src/Main.java [new file with mode: 0644]
test/964-default-iface-init-generated/build
test/964-default-iface-init-generated/smali/Displayer.smali [deleted file]
test/964-default-iface-init-generated/src/Displayer.java [new file with mode: 0644]
test/964-default-iface-init-generated/util-src/generate_java.py [moved from test/964-default-iface-init-generated/util-src/generate_smali.py with 68% similarity]
test/965-default-verify/build
test/965-default-verify/smali/Iface.smali [deleted file]
test/965-default-verify/smali/Main.smali [deleted file]
test/965-default-verify/smali/Statics.smali [deleted file]
test/965-default-verify/src/Iface.java [new file with mode: 0644]
test/965-default-verify/src/Main.java [new file with mode: 0644]
test/965-default-verify/src/Statics.java [moved from test/965-default-verify/build-src/Statics.java with 94% similarity]
test/965-default-verify/src2/Statics.java [new file with mode: 0644]
test/966-default-conflict/build
test/966-default-conflict/smali/Iface.smali [deleted file]
test/966-default-conflict/smali/Iface2.smali [deleted file]
test/966-default-conflict/smali/Main.smali [deleted file]
test/966-default-conflict/src/Iface.java [new file with mode: 0644]
test/966-default-conflict/src/Iface2.java [moved from test/966-default-conflict/build-src/Iface2.java with 100% similarity]
test/966-default-conflict/src/Main.java [new file with mode: 0644]
test/966-default-conflict/src2/Iface2.java [new file with mode: 0644]
test/967-default-ame/build
test/967-default-ame/smali/Iface.smali [deleted file]
test/967-default-ame/smali/Iface2.smali [deleted file]
test/967-default-ame/smali/Iface3.smali [deleted file]
test/967-default-ame/smali/Main.smali [deleted file]
test/967-default-ame/src/Iface.java [new file with mode: 0644]
test/967-default-ame/src/Iface2.java [moved from test/967-default-ame/build-src/Iface2.java with 100% similarity]
test/967-default-ame/src/Iface3.java [moved from test/967-default-ame/build-src/Iface3.java with 100% similarity]
test/967-default-ame/src/Main.java [new file with mode: 0644]
test/967-default-ame/src2/Iface.java [new file with mode: 0644]
test/967-default-ame/src2/Iface2.java [new file with mode: 0644]
test/967-default-ame/src2/Iface3.java [new file with mode: 0644]
test/969-iface-super/build
test/969-iface-super/expected.txt
test/969-iface-super/smali/A.smali [deleted file]
test/969-iface-super/smali/B.smali [deleted file]
test/969-iface-super/smali/C.smali [deleted file]
test/969-iface-super/smali/D.smali [deleted file]
test/969-iface-super/smali/E.smali [deleted file]
test/969-iface-super/smali/F.smali [deleted file]
test/969-iface-super/smali/G.smali [deleted file]
test/969-iface-super/smali/H.smali [deleted file]
test/969-iface-super/smali/iface.smali [deleted file]
test/969-iface-super/smali/iface2.smali [deleted file]
test/969-iface-super/smali/iface3.smali [deleted file]
test/969-iface-super/src/A.java [new file with mode: 0644]
test/969-iface-super/src/B.java [new file with mode: 0644]
test/969-iface-super/src/C.java [new file with mode: 0644]
test/969-iface-super/src/D.java [new file with mode: 0644]
test/969-iface-super/src/E.java [new file with mode: 0644]
test/969-iface-super/src/F.java [new file with mode: 0644]
test/969-iface-super/src/G.java [new file with mode: 0644]
test/969-iface-super/src/H.java [new file with mode: 0644]
test/969-iface-super/src/Iface.java [new file with mode: 0644]
test/969-iface-super/src/Iface2.java [new file with mode: 0644]
test/969-iface-super/src/Iface3.java [new file with mode: 0644]
test/969-iface-super/src/classes.xml [moved from test/969-iface-super/smali/classes.xml with 85% similarity]
test/utils/python/generate_java_main.py [moved from test/utils/python/generate_smali_main.py with 67% similarity]