diff options
| -rw-r--r-- | android/test/android/src/main/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/android/test/android/src/main/AndroidManifest.xml b/android/test/android/src/main/AndroidManifest.xml index 0809dd4a3f4..08fec54656d 100644 --- a/android/test/android/src/main/AndroidManifest.xml +++ b/android/test/android/src/main/AndroidManifest.xml @@ -8,7 +8,6 @@ <!-- http://developer.android.com/guide/topics/manifest/uses-sdk-element.html --> - <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="17"/> <application android:icon="@raw/icon" android:label="@string/app_name" android:name="TestApp" android:allowBackup="false"> <activity android:name=".TestSuite" @@ -20,4 +19,4 @@ </activity> <activity android:name="TestContainer"></activity> </application> -</manifest>
\ No newline at end of file +</manifest> diff --git a/android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java b/android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java index 3c878151d74..209f1dbe1c9 100644 --- a/android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java +++ b/android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java @@ -26,6 +26,8 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManagerFactory; import dalvik.system.DexClassLoader; + +import android.annotation.SuppressLint; import android.content.Context; import android.util.Log; import android.app.Application; @@ -70,6 +72,7 @@ public class TestApp extends Application static private class TestSuiteBundle { + @SuppressWarnings("unchecked") TestSuiteBundle(String name, ClassLoader loader) { _name = name; @@ -292,7 +295,7 @@ public class TestApp extends Application private final String _prefix; private String _formattedPrefix = ""; private final java.text.DateFormat _date = java.text.DateFormat.getDateInstance(java.text.DateFormat.SHORT); - private final java.text.SimpleDateFormat _time = new java.text.SimpleDateFormat(" HH:mm:ss:SSS"); + private final java.text.SimpleDateFormat _time = new java.text.SimpleDateFormat(" HH:mm:ss:SSS", Locale.US); AndroidLogger(String prefix) { @@ -854,6 +857,7 @@ public class TestApp extends Application } } + @SuppressLint("Assert") public void startNextTest() { assert _complete; |