Release 2.3.0

Author: Unity Ads Travis

app/build.gradle

@@ -8,8 +8,8 @@ android {
     applicationId "com.unity3d.ads.example"
     minSdkVersion 9
     targetSdkVersion 23
-    versionCode = 2201
-    versionName = "2.2.1"
+    versionCode = 2300
+    versionName = "2.3.0"
   }
   buildTypes {
     release {

app/src/main/AndroidManifest.xml

@@ -5,12 +5,12 @@
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="UnityAds 2.2"
+        android:label="UnityAds 2.3"
         android:theme="@style/AppTheme" >
         <activity
             android:name="com.unity3d.ads.example.UnityAdsExample"
             android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen"
-            android:label="UnityAds 2.2" >
+            android:label="UnityAds 2.3" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

lib/build.gradle

@@ -11,8 +11,8 @@ android {
   defaultConfig {
     minSdkVersion 9
     targetSdkVersion 23
-    versionCode = 2201
-    versionName = "2.2.1"
+    versionCode = 2300
+    versionName = "2.3.0"
 
     setProperty("archivesBaseName", "unity-ads")
 

lib/src/androidTest/java/com/unity3d/ads/test/UnitTestSuite.java

@@ -30,7 +30,6 @@
   StorageGeneralTest.class,
   StorageMemoryTest.class,
   VideoViewTest.class,
-  WebRequestTest.class,
   WebViewAppTest.class,
   WebViewBridgeInterfaceTest.class,
   WebViewBridgeTest.class,
@@ -39,7 +38,8 @@
   VolumeChangeTest.class,
   UtilitiesTest.class,
   WebPlayerTest.class,
-  PreferencesTest.class
+  PreferencesTest.class,
+  WebRequestThreadPoolTest.class
 })
 
 public class UnitTestSuite {}

lib/src/androidTest/java/com/unity3d/ads/test/unit/DeviceTest.java

@@ -227,9 +227,6 @@ public void testGetProcessInfo () throws Exception {
 
 		assertNotNull("Stats should not be null", data.get("stat"));
 		assertNotEquals("Stats should not be empty", data.get("stat"), "");
-
-		assertNotNull("Uptime should not be null", data.get("uptime"));
-		assertNotEquals("Uptime should not be empty", data.get("uptime"), "");
 	}
 
 	@Test

lib/src/androidTest/java/com/unity3d/ads/test/unit/RequestTest.java

@@ -7,7 +7,6 @@
 
 import com.unity3d.ads.api.Request;
 import com.unity3d.ads.properties.ClientProperties;
-import com.unity3d.ads.request.WebRequest;
 import com.unity3d.ads.request.WebRequestError;
 import com.unity3d.ads.request.WebRequestEvent;
 import com.unity3d.ads.test.TestUtilities;

lib/src/androidTest/java/com/unity3d/ads/test/unit/UtilitiesTest.java

@@ -1,17 +1,55 @@
 package com.unity3d.ads.test.unit;
 
+import android.support.test.InstrumentationRegistry;
 import android.util.Log;
 
 import com.unity3d.ads.misc.Utilities;
+import com.unity3d.ads.properties.ClientProperties;
+import com.unity3d.ads.properties.SdkProperties;
 
 import org.json.JSONObject;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 
 public class UtilitiesTest {
+	@Before
+	public void setup() throws IOException {
+		ClientProperties.setApplicationContext(InstrumentationRegistry.getTargetContext());
+		assertNotEquals("Cache directory has not been properly initialized", null, SdkProperties.getCacheDirectory());
+
+		File tesfile_large = new File(SdkProperties.getCacheDirectory() + "/" + SdkProperties.getCacheFilePrefix() + "testfile_large.dat");
+		tesfile_large.delete();
+
+		File tesfile_small = new File(SdkProperties.getCacheDirectory() + "/" + SdkProperties.getCacheFilePrefix() + "testfile_small.dat");
+		tesfile_small.delete();
+
+		// Write large test file to cache directory
+		File largef = new File(SdkProperties.getCacheDirectory() + "/" + SdkProperties.getCacheFilePrefix() + "testfile_large.dat");
+		FileOutputStream lfos = new FileOutputStream(largef, true);
+		for (int i = 0; i < 56789; i++) {
+			lfos.write((int)(Math.random() * 128) + 1);
+		}
+		lfos.flush();
+		lfos.close();
+
+		File smallf = new File(SdkProperties.getCacheDirectory() + "/" + SdkProperties.getCacheFilePrefix() + "testfile_small.dat");
+		FileOutputStream sfos = new FileOutputStream(smallf, true);
+		for (int i = 0; i < 1024; i++) {
+			sfos.write((int)(Math.random() * 128) + 1);
+		}
+		sfos.flush();
+		sfos.close();
+	}
+
+
     @Test
     public void testSha256() throws Exception {
         assertEquals("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", Utilities.Sha256(""));
@@ -74,6 +112,15 @@ public void testSha256Stream() throws Exception {
 		assertHash(0, "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855");
 	}
 
+	@Test
+	public void testReadFileBytes() throws Exception {
+		byte[] large_data = Utilities.readFileBytes(new File(SdkProperties.getCacheDirectory() + "/" + SdkProperties.getCacheFilePrefix() + "testfile_large.dat"));
+		byte[] small_data = Utilities.readFileBytes(new File(SdkProperties.getCacheDirectory() + "/" + SdkProperties.getCacheFilePrefix() + "testfile_small.dat"));
+
+		assertEquals("Incorrect read large file data size", 56789, large_data.length);
+		assertEquals("Incorrect read small file data size", 1024, small_data.length);
+	}
+
 	public void assertHash(int size, String sha256) throws Exception {
 		byte[] buffer = new byte[size];
 

lib/src/androidTest/java/com/unity3d/ads/test/unit/VideoViewTest.java

@@ -222,7 +222,7 @@ public void run() {
 
 		assertTrue("Condition Variable was not opened: VIDEOPLAYER GENERIC ERROR or PREPARE ERROR was not received", success);
 		assertEquals("Event category should be videoplayer category", WebViewEventCategory.VIDEOPLAYER, mockWebViewApp.EVENT_CATEGORIES.get(0));
-		assertEquals("Event ID should be generic error", VideoPlayerEvent.GENERIC_ERROR, mockWebViewApp.EVENTS.get(0));
+		assertTrue("Events should contain GENERIC_ERROR", mockWebViewApp.EVENTS.contains(VideoPlayerEvent.GENERIC_ERROR));
 		assertEquals("The video url and the url received from the completed event should be the same", invalidUrl, mockWebViewApp.EVENT_PARAMS[0]);
 		assertTrue("Didn't get activity finish", waitForActivityFinish(activity));
 	}
@@ -808,4 +808,4 @@ public void run() {
 			DeviceLog.debug("Skipping test \"testInfoListenerTooLowApiLevel\", API level too high: " + Build.VERSION.SDK_INT);
 		}
 	}
-}
+}

lib/src/androidTest/java/com/unity3d/ads/test/unit/VolumeChangeTest.java

@@ -38,6 +38,9 @@ public void testVolumeChange() throws Exception {
 
 		ClientProperties.setApplicationContext(getInstrumentation().getTargetContext());
 
+		AudioManager am = (AudioManager)ClientProperties.getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
+		am.setStreamVolume(AudioManager.STREAM_MUSIC, 0, 0);
+
 		WebViewApp.setCurrentApp(new MockWebViewApp() {
 			private boolean allowEvents = true;
 			@Override
@@ -114,7 +117,6 @@ public int getStreamType() {
 
 		VolumeChange.registerListener(vcl);
 
-		AudioManager am = (AudioManager)ClientProperties.getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
 		am.setStreamVolume(AudioManager.STREAM_MUSIC, 1, 0);
 
 		cv = new ConditionVariable();