#818 added multimodules #857

piotradamczyk5 · 2020-06-17T16:30:23Z

configuration similiar to client in #818

Test Plan

How do we know the code works?

Run generateTestApkAndCopyToFixtures.sh <path_name> and check that many modules apk is added to test_runner/src/test/kotlin/ftl/fixtures/tmp/apks/<path_name>

Checklist

Documented
release_notes.md updated

jan-goral

We need also script for building and coping apks to fixtures/tmp/apk.

jan-goral · 2020-06-17T17:13:45Z

...IgnoredModule/src/androidTest/java/com/example/fullyIgnoredModule/ExampleInstrumentedTest.kt

+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {


The module name is fullyIgnoredModule but this test is not ignored

jan-goral · 2020-06-17T17:30:03Z

test_runner/src/test/kotlin/ftl/fixtures/test_app_cases/flank-multiple-mixed.yml

+  app: apk/818/app-multiple-error-debug.apk
+  test: apk/818/app-multiple-error-debug-androidTest.apk
  num-flaky-test-attempts: 2
+  async: false
  environment-variables:
-    coverage: true
-    coverageFilePath: /sdcard/
    clearPackageData: true
+  performance-metrics: false
+  record-video: false
+  test-targets:
+    - notAnnotation org.junit.Ignore
+  use-orchestrator: true
 flank:
-  disable-sharding: false
-  max-test-shards: 2
-  num-test-runs: 1
+  run-timeout: 20m
+  max-test-shards: 5
+  legacy-junit-result: 'false'
  additional-app-test-apks:
-    - test: ./src/test/kotlin/ftl/fixtures/tmp/apk/app-single-success-debug-androidTest.apk
-    - test: ./src/test/kotlin/ftl/fixtures/tmp/apk/app-multiple-flaky-debug-androidTest.apk
-    - test: ../test_app/apks/invalid.apk
+    - test: apk/818/app-multiple-error-debug-androidTest.apk
+    - test: apk/818/app-multiple-success-debug-androidTest.apk
+    - test: apk/818/fullyIgnoredModule-debug-androidTest.apk
+    - test: apk/818/testModule-debug-androidTest.apk
+    - test: apk/818/testModule1-debug-androidTest.apk
+    - test: apk/818/testModule10-debug-androidTest.apk
+    - test: apk/818/testModule11-debug-androidTest.apk
+    - test: apk/818/testModule12-debug-androidTest.apk
+    - test: apk/818/testModule13-debug-androidTest.apk
+    - test: apk/818/testModule14-debug-androidTest.apk
+    - test: apk/818/testModule15-debug-androidTest.apk
+    - test: apk/818/testModule16-debug-androidTest.apk
+    - test: apk/818/testModule17-debug-androidTest.apk
+    - test: apk/818/testModule18-debug-androidTest.apk
+    - test: apk/818/testModule19-debug-androidTest.apk
+    - test: apk/818/testModule2-debug-androidTest.apk
+    - test: apk/818/testModule3-debug-androidTest.apk
+    - test: apk/818/testModule4-debug-androidTest.apk


Will be better to add new config instead of modifying current.

piotradamczyk5 · 2020-06-17T17:48:36Z

We need also script for building and coping apks to fixtures/tmp/apk.

generateTestApkAndCopyToFixtures.sh

test_app/settings.gradle

…-added-multimodules

yaneq6 · 2020-06-19T12:53:14Z

test_app/bash/generateMutliModuleTestApkAndCopyToFixtures.sh

+fi
+
+mkdir -p ../test_runner/src/test/kotlin/ftl/fixtures/tmp/apks$path
+find multi-modules -type f -name "*.apk" -exec cp {} ../test_runner/src/test/kotlin/ftl/fixtures/tmp/apks$path \;


yaneq6 · 2020-06-19T12:53:36Z

test_app/multi-modules/multiapp/.gitignore

@@ -0,0 +1 @@
+/build


yaneq6 · 2020-06-19T12:53:47Z

test_app/multi-modules/multiapp/proguard-rules.pro

+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile


yaneq6 · 2020-06-19T12:53:59Z

.../multi-modules/multiapp/src/androidTest/java/com/example/multiapp/ExampleInstrumentedTest.kt

+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.example.multiapp", appContext.packageName)
+    }
+}


yaneq6 · 2020-06-19T12:54:09Z

test_app/multi-modules/multiapp/src/main/AndroidManifest.xml

+        </activity>
+    </application>
+
+</manifest>


yaneq6 · 2020-06-19T12:54:28Z

test_app/multi-modules/multiapp/src/main/res/layout/activity_main.xml

+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/textview_first" />
+</androidx.constraintlayout.widget.ConstraintLayout>


yaneq6 · 2020-06-19T12:54:43Z

test_app/multi-modules/multiapp/src/main/res/values/colors.xml

+    <color name="colorPrimary">#6200EE</color>
+    <color name="colorPrimaryDark">#3700B3</color>
+    <color name="colorAccent">#03DAC5</color>
+</resources>


yaneq6 · 2020-06-19T12:55:13Z

test_app/multi-modules/multiapp/src/main/res/values/strings.xml

+
+    <string name="hello_first_fragment">Hello first fragment</string>
+    <string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
+</resources>


yaneq6 · 2020-06-19T12:55:24Z

test_app/multi-modules/multiapp/src/main/res/values/styles.xml

+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
+</resources>


yaneq6 · 2020-06-19T12:55:35Z

test_app/multi-modules/multiapp/src/test/java/com/example/multiapp/ExampleUnitTest.kt

+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}


…-added-multimodules

bootstraponline · 2020-06-22T04:42:10Z

Merge branch 'master' into #818 -added-multimodules

let's not have merge requests in pull requests 🙂 Instead you can setup rebase

git config --global pull.rebase true

piotradamczyk5 · 2020-06-22T07:24:54Z

Merge branch 'master' into #818 -added-multimodules

let's not have merge requests in pull requests 🙂 Instead you can setup rebase

git config --global pull.rebase true

Next time I will avoid it

* #818 added multi modules with tests Co-authored-by: Janek Góral <[email protected]>

Piotr Adamczyk added 6 commits June 17, 2020 15:27

MULTI MODULE APP

4506394

#818 added multi modules with tests

5838de8

#818 added multi modules with tests

65827fe

#818 detekt settings

37d91fc

#818 detekt settings

1dd5c7e

#818 added multi modules with tests

3880f11

jan-goral reviewed Jun 17, 2020

View reviewed changes

#818 added multi modules with tests

8201319

piotradamczyk5 marked this pull request as ready for review June 18, 2020 07:04

jan-goral assigned piotradamczyk5 Jun 18, 2020

piotradamczyk5 added 2 commits June 18, 2020 11:43

Merge branch 'master' into #818-added-multimodules

82dac71

Update release_notes.md

9cebbc4

adamfilipow92 reviewed Jun 18, 2020

View reviewed changes

test_app/settings.gradle Outdated Show resolved Hide resolved

Piotr Adamczyk and others added 6 commits June 18, 2020 14:51

#818 fixed script

0d30105

Merge remote-tracking branch 'origin/#818-added-multimodules' into #818…

b4ab8bf

…-added-multimodules

merge fix

f704cf0

clean up multi modules, changes scripts

8494fc5

test apk changes

490c2dd

Merge branch 'master' into #818-added-multimodules

076ceaf

yaneq6 reviewed Jun 19, 2020

View reviewed changes

Piotr Adamczyk and others added 3 commits June 19, 2020 15:16

#818 detekt settings

3181d92

Merge remote-tracking branch 'origin/#818-added-multimodules' into #818…

97c2fe3

…-added-multimodules

Merge branch 'master' into #818-added-multimodules

f0aa418

Fix script

20f0465

jan-goral approved these changes Jun 22, 2020

View reviewed changes

jan-goral self-assigned this Jun 22, 2020

jan-goral merged commit c6cd725 into master Jun 22, 2020

jan-goral deleted the #818-added-multimodules branch June 22, 2020 19:12

piotradamczyk5 added a commit that referenced this pull request Jun 23, 2020

#818 added multimodules (#857)

9577be7

* #818 added multi modules with tests Co-authored-by: Janek Góral <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#818 added multimodules #857

#818 added multimodules #857

piotradamczyk5 commented Jun 17, 2020 •

edited

Loading

jan-goral left a comment

jan-goral Jun 17, 2020

piotradamczyk5 Jun 17, 2020

jan-goral Jun 17, 2020

piotradamczyk5 Jun 17, 2020

piotradamczyk5 commented Jun 17, 2020

yaneq6 Jun 19, 2020

yaneq6 Jun 19, 2020

yaneq6 Jun 19, 2020

yaneq6 Jun 19, 2020

yaneq6 Jun 19, 2020

yaneq6 Jun 19, 2020

yaneq6 Jun 19, 2020

yaneq6 Jun 19, 2020

yaneq6 Jun 19, 2020

yaneq6 Jun 19, 2020

bootstraponline commented Jun 22, 2020

piotradamczyk5 commented Jun 22, 2020


		<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />

		</resources>

		@@ -0,0 +1 @@
		/build

#818 added multimodules #857

#818 added multimodules #857

Conversation

piotradamczyk5 commented Jun 17, 2020 • edited Loading

Test Plan

Checklist

jan-goral left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

piotradamczyk5 commented Jun 17, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bootstraponline commented Jun 22, 2020

piotradamczyk5 commented Jun 22, 2020

piotradamczyk5 commented Jun 17, 2020 •

edited

Loading