fix(assets): adding leanplum branding assets

Author: milos1290

AndroidSDKTests/build.gradle

@@ -38,4 +38,4 @@ dependencies {
     testCompile 'org.powermock:powermock-api-mockito:1.6.6'
     testCompile 'org.powermock:powermock-classloading-xstream:1.6.6'
     testCompile 'org.bouncycastle:bcmail-jdk15on:1.54'
-}
+}

AndroidSDKTests/src/main/assets/Mario.png

@@ -751,7 +751,7 @@ public void testActions() throws Exception {
     args.with(integerArgumentName, 5);
     args.with(stringArgumentName, "test_string");
     args.with(boolArgumentName, true);
-    args.withAsset(fileArgumentName, "Mario.png");
+    args.withAsset(fileArgumentName, "leanplum_watermark.jpg");
     args.with(dictionaryArgumentName, CollectionUtil.newHashMap(
         "test_value", "test"
     ));
@@ -797,7 +797,7 @@ public void onRequest(String httpMethod, String apiMethod, Map<String, Object> p
         assertNotNull(values.get(arrayArgumentName));
         assertEquals("action_test", values.get(actionArgumentName));
         assertEquals(Color.BLUE, values.get(colorArgumentName));
-        assertEquals("Mario.png", values.get(fileArgumentName));
+        assertEquals("leanplum_watermark.jpg", values.get(fileArgumentName));
       }
     });
     // Define action.

AndroidSDKTests/src/main/assets/leanplum_watermark.jpg

@@ -50,12 +50,11 @@ protected AndroidManifest getAppManifest(Config config) {
     }
 
     final String type = getType(config);
-    final String flavor = "sources";
     final String packageName = "com.leanplum.tests";
 
-    final FileFsFile res = FileFsFile.from(BUILD_OUTPUT, "res", "merged", flavor, type);
+    final FileFsFile res = FileFsFile.from(BUILD_OUTPUT, "res", "merged", type);
     final FileFsFile assets = FileFsFile.from("src", "test", "assets");
-    final FileFsFile manifest = FileFsFile.from(BUILD_OUTPUT, "manifests", "full", flavor, type,
+    final FileFsFile manifest = FileFsFile.from(BUILD_OUTPUT, "manifests", "full", type,
         "AndroidManifest.xml");
 
     Logger.debug("Robolectric assets directory: " + assets.getPath());

AndroidSDKTests/src/main/res/drawable-xhdpi/jinja.png

@@ -133,10 +133,10 @@ public void testResourceNameGeneration() throws Exception {
     String invalidName = Util.generateResourceNameFromId(invalidResourceId);
     assertNull(invalidName);
 
-    int validResourceId = com.leanplum.tests.R.drawable.jinja;
+    int validResourceId = R.drawable.leanplum_watermark;
     String validName = Util.generateResourceNameFromId(validResourceId);
     assertNotNull(validName);
-    assertEquals("drawable/jinja.png", validName);
+    assertEquals("drawable/leanplum_watermark.jpg", validName);
   }
 
   @Test
@@ -145,13 +145,13 @@ public void testResourceIdGeneration() throws Exception {
     int invalidResourceId = Util.generateIdFromResourceName(invalidName);
     assertEquals(0, invalidResourceId);
 
-    String validName = "drawable/jinja.png";
+    String validName = "drawable/leanplum_watermark.jpg";
     int validResourceId = Util.generateIdFromResourceName(validName);
-    assertEquals(R.drawable.jinja, validResourceId);
+    assertEquals(R.drawable.leanplum_watermark, validResourceId);
 
     // Generated name can be without extension.
-    String validNameWithoutExtension = "drawable/jinja";
+    String validNameWithoutExtension = "drawable/leanplum_watermark";
     validResourceId = Util.generateIdFromResourceName(validNameWithoutExtension);
-    assertEquals(R.drawable.jinja, validResourceId);
+    assertEquals(R.drawable.leanplum_watermark, validResourceId);
   }
 }