From d367348217f62f8333c57dd7b3c2a67b5035cb98 Mon Sep 17 00:00:00 2001 From: davigonz Date: Thu, 8 Nov 2018 12:46:14 +0100 Subject: [PATCH] Get rid of old ant tests --- .travis.yml | 15 +- settings.gradle | 3 +- test_client/.classpath | 9 - test_client/.project | 33 -- .../.settings/org.eclipse.jdt.core.prefs | 4 - test_client/AndroidManifest.xml | 60 --- test_client/assets/imageFile.png | Bin 21044 -> 0 bytes test_client/assets/textFile.txt | 3 - test_client/assets/videoFile.MP4 | Bin 7716216 -> 0 bytes test_client/build.gradle | 50 -- test_client/build.xml | 92 ---- test_client/custom_rules.xml | 75 --- test_client/gradle/wrapper/gradle-wrapper.jar | Bin 53636 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 - test_client/gradlew | 164 ------- test_client/gradlew.bat | 90 ---- test_client/ic_launcher-web.png | Bin 51394 -> 0 bytes test_client/libs/android-support-v4.jar | Bin 349252 -> 0 bytes test_client/project.properties | 15 - test_client/res/drawable-hdpi/ic_launcher.png | Bin 7658 -> 0 bytes test_client/res/drawable-mdpi/ic_launcher.png | Bin 3777 -> 0 bytes .../res/drawable-xhdpi/ic_launcher.png | Bin 12516 -> 0 bytes .../res/drawable-xxhdpi/ic_launcher.png | Bin 24777 -> 0 bytes test_client/res/layout/activity_test.xml | 39 -- test_client/res/menu/test.xml | 32 -- test_client/res/values-sw600dp/dimens.xml | 32 -- .../res/values-sw720dp-land/dimens.xml | 33 -- test_client/res/values-v11/styles.xml | 35 -- test_client/res/values-v14/styles.xml | 36 -- test_client/res/values/dimens.xml | 30 -- test_client/res/values/setup.xml | 33 -- test_client/res/values/strings.xml | 33 -- test_client/res/values/styles.xml | 43 -- test_client/settings.gradle | 2 - .../lib/test_project/TestActivity.java | 371 -------------- test_client/tests/.classpath | 10 - test_client/tests/.project | 33 -- .../.settings/org.eclipse.jdt.core.prefs | 4 - test_client/tests/AndroidManifest.xml | 41 -- test_client/tests/ant.properties | 18 - test_client/tests/build.gradle | 34 -- test_client/tests/build.xml | 92 ---- test_client/tests/custom_rules.xml | 20 - test_client/tests/project.properties | 14 - .../tests/res/drawable-hdpi/ic_launcher.png | Bin 9397 -> 0 bytes .../tests/res/drawable-ldpi/ic_launcher.png | Bin 2729 -> 0 bytes .../tests/res/drawable-mdpi/ic_launcher.png | Bin 5237 -> 0 bytes .../tests/res/drawable-xhdpi/ic_launcher.png | Bin 14383 -> 0 bytes test_client/tests/res/values/strings.xml | 30 -- .../lib/test_project/test/CopyFileTest.java | 455 ----------------- .../test_project/test/CreateFolderTest.java | 133 ----- .../test_project/test/CreateShareTest.java | 310 ------------ .../lib/test_project/test/DeleteFileTest.java | 104 ---- .../test_project/test/DownloadFileTest.java | 143 ------ .../test/GetCapabilitiesTest.java | 144 ------ .../lib/test_project/test/GetShareesTest.java | 282 ----------- .../lib/test_project/test/GetSharesTest.java | 93 ---- .../test_project/test/GetUserAvatarTest.java | 107 ---- .../test_project/test/GetUserQuotaTest.java | 73 --- .../lib/test_project/test/MoveFileTest.java | 456 ------------------ .../OwnCloudClientManagerFactoryTest.java | 155 ------ .../test_project/test/OwnCloudClientTest.java | 375 -------------- .../lib/test_project/test/ReadFileTest.java | 85 ---- .../lib/test_project/test/ReadFolderTest.java | 101 ---- .../lib/test_project/test/RemoteTest.java | 69 --- .../test_project/test/RemoveShareTest.java | 91 ---- .../lib/test_project/test/RenameFileTest.java | 232 --------- .../test/SimpleFactoryManagerTest.java | 132 ----- .../test/SingleSessionManagerTest.java | 131 ----- .../test/UpdatePrivateShareTest.java | 257 ---------- .../test/UpdatePublicShareTest.java | 283 ----------- .../lib/test_project/test/UploadFileTest.java | 124 ----- .../android/lib/test_project/test/Utils.java | 55 --- 73 files changed, 3 insertions(+), 6021 deletions(-) delete mode 100644 test_client/.classpath delete mode 100644 test_client/.project delete mode 100644 test_client/.settings/org.eclipse.jdt.core.prefs delete mode 100644 test_client/AndroidManifest.xml delete mode 100644 test_client/assets/imageFile.png delete mode 100644 test_client/assets/textFile.txt delete mode 100644 test_client/assets/videoFile.MP4 delete mode 100644 test_client/build.gradle delete mode 100644 test_client/build.xml delete mode 100644 test_client/custom_rules.xml delete mode 100644 test_client/gradle/wrapper/gradle-wrapper.jar delete mode 100644 test_client/gradle/wrapper/gradle-wrapper.properties delete mode 100755 test_client/gradlew delete mode 100644 test_client/gradlew.bat delete mode 100644 test_client/ic_launcher-web.png delete mode 100644 test_client/libs/android-support-v4.jar delete mode 100644 test_client/project.properties delete mode 100644 test_client/res/drawable-hdpi/ic_launcher.png delete mode 100644 test_client/res/drawable-mdpi/ic_launcher.png delete mode 100644 test_client/res/drawable-xhdpi/ic_launcher.png delete mode 100644 test_client/res/drawable-xxhdpi/ic_launcher.png delete mode 100644 test_client/res/layout/activity_test.xml delete mode 100644 test_client/res/menu/test.xml delete mode 100644 test_client/res/values-sw600dp/dimens.xml delete mode 100644 test_client/res/values-sw720dp-land/dimens.xml delete mode 100644 test_client/res/values-v11/styles.xml delete mode 100644 test_client/res/values-v14/styles.xml delete mode 100644 test_client/res/values/dimens.xml delete mode 100644 test_client/res/values/setup.xml delete mode 100644 test_client/res/values/strings.xml delete mode 100644 test_client/res/values/styles.xml delete mode 100644 test_client/settings.gradle delete mode 100644 test_client/src/com/owncloud/android/lib/test_project/TestActivity.java delete mode 100644 test_client/tests/.classpath delete mode 100644 test_client/tests/.project delete mode 100644 test_client/tests/.settings/org.eclipse.jdt.core.prefs delete mode 100644 test_client/tests/AndroidManifest.xml delete mode 100644 test_client/tests/ant.properties delete mode 100644 test_client/tests/build.gradle delete mode 100644 test_client/tests/build.xml delete mode 100644 test_client/tests/custom_rules.xml delete mode 100644 test_client/tests/project.properties delete mode 100644 test_client/tests/res/drawable-hdpi/ic_launcher.png delete mode 100644 test_client/tests/res/drawable-ldpi/ic_launcher.png delete mode 100644 test_client/tests/res/drawable-mdpi/ic_launcher.png delete mode 100644 test_client/tests/res/drawable-xhdpi/ic_launcher.png delete mode 100644 test_client/tests/res/values/strings.xml delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/CopyFileTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateShareTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/GetCapabilitiesTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/GetShareesTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/GetSharesTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/GetUserAvatarTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/GetUserQuotaTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/MoveFileTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientManagerFactoryTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/RemoteTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/RemoveShareTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/SimpleFactoryManagerTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/SingleSessionManagerTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePublicShareTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java delete mode 100644 test_client/tests/src/com/owncloud/android/lib/test_project/test/Utils.java diff --git a/.travis.yml b/.travis.yml index 4fae7ec7..d0bca7a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,25 +17,14 @@ install: - yes | sdkmanager --list # After Travis updated image with Android base environment, building via ant is not possible anymore. -# Library tests are old-style tests, and trust on legacy Android ant environment. -# Need to disable tests until they are ported to JUnit 4 and gradle build. -#- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -c 20M -#- emulator -avd test -no-window & +# Port library tests to new-style with JUnit 4 and gradle build. - rm pom.xml -#- android update project -p . -#- chmod +x ./wait_for_emulator.sh -#- ./wait_for_emulator.sh -# + # On the other hand, Travis still uses 'android' command behind the 'components' section update. # That command is obsolete and cannot update Android SDK Tools after 25.2.5. # Let's solve it here with the new command 'sdkmanager' - yes | sdkmanager --verbose tools script: -#- ant clean -#- ant debug -#- cd test_client/tests -#- ant acceptance-test -#- cd ../.. - ./gradlew clean build env: global: diff --git a/settings.gradle b/settings.gradle index 3f42d192..7cf73a38 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,2 @@ include ':' -include ':sample_client' -include ':test_client' \ No newline at end of file +include ':sample_client' \ No newline at end of file diff --git a/test_client/.classpath b/test_client/.classpath deleted file mode 100644 index 7bc01d9a..00000000 --- a/test_client/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/test_client/.project b/test_client/.project deleted file mode 100644 index 30c2462f..00000000 --- a/test_client/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - ownCloud Android library test project - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/test_client/.settings/org.eclipse.jdt.core.prefs b/test_client/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b080d2dd..00000000 --- a/test_client/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/test_client/AndroidManifest.xml b/test_client/AndroidManifest.xml deleted file mode 100644 index 14de3eab..00000000 --- a/test_client/AndroidManifest.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test_client/assets/imageFile.png b/test_client/assets/imageFile.png deleted file mode 100644 index 915ec22c7457bb0661ace9cbaefb6b1645a0d5c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21044 zcmce-cT`ht(=NUt0zQghp-9JyQdOi2!2&2qlMYe@DbkT%6ZJ)u>LUo!5v2DTdQh5l z=|~H`haLiH`|R+1=Xbty*7sZMd(R(dt)PMI+-2^WYi6#Q`=geI%9&G~rvLyr^W^cP zX8>>ldP|EuNelfK!Ivxv0NTVSkM8UGjAN%l5W|Z{aLShXHu0pV!>}{9edH9!zrK7b z!B5MCM%9ee