From 39fea5fa2cd6b8410953675a21babbda9b2bead5 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Sat, 14 Mar 2015 08:20:18 -0500
Subject: [PATCH] [tests] add test for shared library rebuild

---
 .../java/brut/androlib/SharedLibraryTest.java | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/SharedLibraryTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/SharedLibraryTest.java
index 7e30486d..2006a2d3 100644
--- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/SharedLibraryTest.java
+++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/SharedLibraryTest.java
@@ -70,29 +70,42 @@ public class SharedLibraryTest {
     }
 
     @Test
-    public void isSharedResourceDecodingWorking() throws IOException, BrutException {
-        String framework = "library.apk";
+    public void isSharedResourceDecodingAndRebuildingWorking() throws IOException, BrutException {
+        String library = "library.apk";
         String client = "client.apk";
 
-
+        // setup apkOptions
         ApkOptions apkOptions = new ApkOptions();
         apkOptions.frameworkFolderLocation = sTmpDir.getAbsolutePath();
         apkOptions.frameworkTag = "shared";
 
-        new Androlib(apkOptions).installFramework(new File(sTmpDir + File.separator + framework));
-
+        // install library/framework
+        new Androlib(apkOptions).installFramework(new File(sTmpDir + File.separator + library));
         assertTrue(fileExists("2-shared.apk"));
 
+        // decode client.apk
         ApkDecoder apkDecoder = new ApkDecoder(new File(sTmpDir + File.separator + client));
         apkDecoder.setOutDir(new File(sTmpDir + File.separator + client + ".out"));
         apkDecoder.setFrameworkDir(apkOptions.frameworkFolderLocation);
         apkDecoder.setFrameworkTag(apkOptions.frameworkTag);
         apkDecoder.decode();
 
-        ExtFile testApk = new ExtFile(sTmpDir, client + ".out");
-        new Androlib(apkOptions).build(testApk, null);
+        // decode library.apk
+        ApkDecoder libraryDecoder = new ApkDecoder(new File(sTmpDir + File.separator + library));
+        libraryDecoder.setOutDir(new File(sTmpDir + File.separator + library + ".out"));
+        libraryDecoder.setFrameworkDir(apkOptions.frameworkFolderLocation);
+        libraryDecoder.setFrameworkTag(apkOptions.frameworkTag);
+        libraryDecoder.decode();
 
+        // build client.apk
+        ExtFile clientApk = new ExtFile(sTmpDir, client + ".out");
+        new Androlib(apkOptions).build(clientApk, null);
         assertTrue(fileExists(client + ".out" + File.separator + "dist" + File.separator + client));
+
+        // build library.apk (shared library)
+        ExtFile libraryApk = new ExtFile(sTmpDir, library + ".out");
+        new Androlib(apkOptions).build(libraryApk, null);
+        assertTrue(fileExists(library + ".out" + File.separator + "dist" + File.separator + library));
     }
 
     private boolean fileExists(String filepath) {