From ed95ad2bad6f9984f238d0fa3f4446161dd03668 Mon Sep 17 00:00:00 2001
From: Kyle Kirbatski <kkirbatski@gmrmarketing.com>
Date: Thu, 8 Nov 2018 12:23:29 -0600
Subject: [PATCH 1/2] =?UTF-8?q?Add=20a=20unit=20test=20to=20test=20source-?=
 =?UTF-8?q?file=20target-dir=20/app/src/main/=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spec/fixtures/org.test.plugins.dummyplugin/plugin.xml       | 2 ++
 .../src/android/DummyPlugin2.java                           | 1 +
 spec/unit/pluginHandlers/handlers.spec.js                   | 6 ++++++
 3 files changed, 9 insertions(+)
 create mode 100644 spec/fixtures/org.test.plugins.dummyplugin/src/android/DummyPlugin2.java

diff --git a/spec/fixtures/org.test.plugins.dummyplugin/plugin.xml b/spec/fixtures/org.test.plugins.dummyplugin/plugin.xml
index a40df2b28d..5451ef8daa 100644
--- a/spec/fixtures/org.test.plugins.dummyplugin/plugin.xml
+++ b/spec/fixtures/org.test.plugins.dummyplugin/plugin.xml
@@ -70,6 +70,8 @@
 
         <source-file src="src/android/DummyPlugin.java"
                 target-dir="src/com/phonegap/plugins/dummyplugin" />
+        <source-file src="src/android/DummyPlugin2.java"
+                target-dir="app/src/main/src/com/phonegap/plugins/dummyplugin" />
         <lib-file src="src/android/TestLib.jar" />
     </platform>
 </plugin>
diff --git a/spec/fixtures/org.test.plugins.dummyplugin/src/android/DummyPlugin2.java b/spec/fixtures/org.test.plugins.dummyplugin/src/android/DummyPlugin2.java
new file mode 100644
index 0000000000..c2dd0f7314
--- /dev/null
+++ b/spec/fixtures/org.test.plugins.dummyplugin/src/android/DummyPlugin2.java
@@ -0,0 +1 @@
+./org.test.plugins.dummyplugin/src/android/DummyPlugin2.java
diff --git a/spec/unit/pluginHandlers/handlers.spec.js b/spec/unit/pluginHandlers/handlers.spec.js
index edc8f43bcc..19abab8c98 100644
--- a/spec/unit/pluginHandlers/handlers.spec.js
+++ b/spec/unit/pluginHandlers/handlers.spec.js
@@ -108,6 +108,12 @@ describe('android project handler', function () {
                     android['source-file'].install(valid_source[0], dummyPluginInfo, dummyProject);
                 }).toThrow(new Error('"' + target + '" already exists!'));
             });
+
+            it('Test#007 : should allow installing sources using proper path', function () {
+                android['source-file'].install(valid_source[1], dummyPluginInfo, dummyProject, {android_studio: true});
+                expect(copyFileSpy)
+                    .toHaveBeenCalledWith(dummyplugin, 'src/android/DummyPlugin2.java', temp, path.join('app/src/main/src/com/phonegap/plugins/dummyplugin/DummyPlugin2.java'), false);
+            });
         });
 
         describe('of <framework> elements', function () {

From cb27904ae73a43a967b4a0a7e4b0a7b282cf1605 Mon Sep 17 00:00:00 2001
From: "Christopher J. Brody" <chris.brody@gmail.com>
Date: Fri, 9 Nov 2018 11:24:46 -0500
Subject: [PATCH 2/2] unit test source-file with custom lib target-dir

Reproduces GH-40 on 7.1.2

(These tests pass on 7.1.1)

Co-Authored-By: Kyle Kirbatski <kkirbatski@gmrmarketing.com>
Co-Authored-By: Christopher J. Brody <chris.brody@gmail.com>
Co-Authored-By: @afdev82 (Antonio Facciolo)
---
 spec/fixtures/org.test.plugins.dummyplugin/plugin.xml | 2 ++
 spec/unit/pluginHandlers/handlers.spec.js             | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/spec/fixtures/org.test.plugins.dummyplugin/plugin.xml b/spec/fixtures/org.test.plugins.dummyplugin/plugin.xml
index 5451ef8daa..a6fa887adf 100644
--- a/spec/fixtures/org.test.plugins.dummyplugin/plugin.xml
+++ b/spec/fixtures/org.test.plugins.dummyplugin/plugin.xml
@@ -72,6 +72,8 @@
                 target-dir="src/com/phonegap/plugins/dummyplugin" />
         <source-file src="src/android/DummyPlugin2.java"
                 target-dir="app/src/main/src/com/phonegap/plugins/dummyplugin" />
+        <source-file src="src/android/TestLib.jar"
+                target-dir="app/libs" />
         <lib-file src="src/android/TestLib.jar" />
     </platform>
 </plugin>
diff --git a/spec/unit/pluginHandlers/handlers.spec.js b/spec/unit/pluginHandlers/handlers.spec.js
index 19abab8c98..725d7689a2 100644
--- a/spec/unit/pluginHandlers/handlers.spec.js
+++ b/spec/unit/pluginHandlers/handlers.spec.js
@@ -114,6 +114,12 @@ describe('android project handler', function () {
                 expect(copyFileSpy)
                     .toHaveBeenCalledWith(dummyplugin, 'src/android/DummyPlugin2.java', temp, path.join('app/src/main/src/com/phonegap/plugins/dummyplugin/DummyPlugin2.java'), false);
             });
+
+            it('Test#008 : should allow installing lib file from sources using proper path', function () {
+                android['source-file'].install(valid_source[2], dummyPluginInfo, dummyProject, {android_studio: true});
+                expect(copyFileSpy)
+                    .toHaveBeenCalledWith(dummyplugin, 'src/android/TestLib.jar', temp, path.join('app/libs/TestLib.jar'), false);
+            });
         });
 
         describe('of <framework> elements', function () {