Skip to content

Commit 199bca2

Browse files
jamesnroktjamesnrokt
committed
Fix lint and tests, add run configs
1 parent 2265408 commit 199bca2

5 files changed

Lines changed: 107 additions & 7 deletions

File tree

‎.run/Full Test and Lint.run.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Full Test and Lint" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="executionName" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
6+
<option name="externalSystemIdString" value="GRADLE" />
7+
<option name="scriptParameters" value="-PisRelease=true" />
8+
<option name="taskDescriptions">
9+
<list />
10+
</option>
11+
<option name="taskNames">
12+
<list>
13+
<option value="test" />
14+
<option value="lint" />
15+
<option value="ktlintCheck" />
16+
<option value=":android-kit-base:testRelease" />
17+
</list>
18+
</option>
19+
<option name="vmOptions" />
20+
</ExternalSystemSettings>
21+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
22+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
23+
<DebugAllEnabled>false</DebugAllEnabled>
24+
<RunAsTest>true</RunAsTest>
25+
<method v="2" />
26+
</configuration>
27+
</component>

‎.run/Lint.run.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Lint" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="executionName" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
6+
<option name="externalSystemIdString" value="GRADLE" />
7+
<option name="scriptParameters" value="" />
8+
<option name="taskDescriptions">
9+
<list />
10+
</option>
11+
<option name="taskNames">
12+
<list>
13+
<option value="lint" />
14+
<option value="ktlintCheck" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<RunAsTest>false</RunAsTest>
23+
<method v="2" />
24+
</configuration>
25+
</component>

‎.run/Test.run.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Test" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="executionName" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
6+
<option name="externalSystemIdString" value="GRADLE" />
7+
<option name="scriptParameters" value="" />
8+
<option name="taskDescriptions">
9+
<list />
10+
</option>
11+
<option name="taskNames">
12+
<list>
13+
<option value="test" />
14+
</list>
15+
</option>
16+
<option name="vmOptions" />
17+
</ExternalSystemSettings>
18+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
19+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
20+
<DebugAllEnabled>false</DebugAllEnabled>
21+
<RunAsTest>true</RunAsTest>
22+
<method v="2" />
23+
</configuration>
24+
</component>

‎.run/Verify kits.run.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Verify kits" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="executionName" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
6+
<option name="externalSystemIdString" value="GRADLE" />
7+
<option name="scriptParameters" value="-PisRelease=true" />
8+
<option name="taskDescriptions">
9+
<list />
10+
</option>
11+
<option name="taskNames">
12+
<list>
13+
<option value=":android-kit-base:testRelease" />
14+
</list>
15+
</option>
16+
<option name="vmOptions" />
17+
</ExternalSystemSettings>
18+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
19+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
20+
<DebugAllEnabled>false</DebugAllEnabled>
21+
<RunAsTest>true</RunAsTest>
22+
<method v="2" />
23+
</configuration>
24+
</component>

‎android-kit-base/src/test/kotlin/com/mparticle/kits/KitManagerImplTest.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,15 +1434,15 @@ class KitManagerImplTest {
14341434
val manager: KitManagerImpl = MockKitManagerImpl()
14351435

14361436
val enabledRoktListener = mock(
1437-
KitIntegration::class.java,
1438-
withSettings().extraInterfaces(KitIntegration.RoktListener::class.java)
1439-
)
1437+
KitIntegration::class.java,
1438+
withSettings().extraInterfaces(KitIntegration.RoktListener::class.java)
1439+
)
14401440
`when`(enabledRoktListener.isDisabled).thenReturn(false)
14411441

14421442
val disabledRoktListener = mock(
1443-
KitIntegration::class.java,
1444-
withSettings().extraInterfaces(KitIntegration.RoktListener::class.java)
1445-
)
1443+
KitIntegration::class.java,
1444+
withSettings().extraInterfaces(KitIntegration.RoktListener::class.java)
1445+
)
14461446
`when`(disabledRoktListener.isDisabled).thenReturn(true)
14471447

14481448
val nonRoktListener = mock(KitIntegration::class.java)
@@ -1485,7 +1485,7 @@ class KitManagerImplTest {
14851485
placeHolders: MutableMap<String, WeakReference<RoktEmbeddedView>>?,
14861486
fontTypefaces: MutableMap<String, WeakReference<Typeface>>?,
14871487
user: FilteredMParticleUser?,
1488-
config: RoktConfig
1488+
config: RoktConfig?
14891489
) {
14901490
println("Executed with $attributes")
14911491
}

0 commit comments

Comments
 (0)