Skip to content

Commit

Permalink
georgberky#9 initial integration test runs
Browse files Browse the repository at this point in the history
 Co-Authored-By: Sandra Parsick <[email protected]>
 Co-Authored-By: Karl Heinz Marbaise <[email protected]>
  • Loading branch information
georgberky authored and sparsick committed May 18, 2021
1 parent 1921d47 commit bae42ed
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 23 deletions.
15 changes: 12 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@
<maven.version>3.6.3</maven.version>
<kotlin.version>1.3.71</kotlin.version>
<maven-plugin.version>3.6.0</maven-plugin.version>
<itf.version>0.7.0</itf.version>
<itf.version>0.9.0</itf.version>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
</properties>

<dependencies>
Expand Down Expand Up @@ -147,7 +149,6 @@
</testResources>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>src/test/kotlin</testSourceDirectory>

<pluginManagement>
<plugins>
<plugin>
Expand All @@ -157,7 +158,6 @@
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
Expand Down Expand Up @@ -201,6 +201,15 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M5</version>
<configuration>
<!--
! currently needed to run integration tests.
-->
<systemProperties>
<maven.version>${maven.version}</maven.version>
<maven.home>${maven.home}</maven.home>
</systemProperties>
</configuration>
<executions>
<execution>
<goals>
Expand Down
10 changes: 3 additions & 7 deletions src/main/kotlin/com/github/helpermethod/UpdateMojo.kt
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,13 @@ class UpdateMojo : AbstractMojo() {
lateinit var localRepository: ArtifactRepository
@Parameter(defaultValue = "\${settings}", required = true)
lateinit var settings: Settings
@Parameter(property = "connectionUrl", defaultValue = "\${project.scm.connection}", required = true)
@Parameter(property = "connectionUrl", defaultValue = "\${project.scm.connection}")
lateinit var connectionUrl: String
@Parameter(
property = "developerConnectionUrl",
defaultValue = "\${project.scm.developerConnection}",
required = true
)
@Parameter(property = "developerConnectionUrl", defaultValue = "\${project.scm.developerConnection}")
lateinit var developerConnectionUrl: String
@Parameter(property = "connectionType", defaultValue = "connection", required = true)
lateinit var connectionType: String
@Parameter(property = "dependencyUpdate.git.provider", defaultValue="native", required = false)
@Parameter(property = "dependencyUpdate.git.provider", defaultValue="NATIVE", required = false)
lateinit var gitProvider : GitProviderChoice

@Component
Expand Down
13 changes: 0 additions & 13 deletions src/test/java/com/github/helpermethod/UpdateMojoNativeGitIT.java

This file was deleted.

18 changes: 18 additions & 0 deletions src/test/kotlin/com/github/helpermethod/UpdateMojoNativeGitIT.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.github.helpermethod

import com.soebes.itf.extension.assertj.MavenExecutionResultAssert.assertThat
import com.soebes.itf.jupiter.extension.MavenGoal
import com.soebes.itf.jupiter.extension.MavenGoals
import com.soebes.itf.jupiter.extension.MavenJupiterExtension
import com.soebes.itf.jupiter.extension.MavenTest
import com.soebes.itf.jupiter.maven.MavenExecutionResult

@MavenJupiterExtension
internal class UpdateMojoNativeGitIT {
//TODO: add test for making connectionUrl or developerConnection mandatory only if provider == JGIT
@MavenTest
@MavenGoal("\${project.groupId}:\${project.artifactId}:\${project.version}:update")
fun nativeProviderIsSet(result: MavenExecutionResult) {
assertThat(result).isSuccessful()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
<artifactId>native-git-provider-test</artifactId>
<version>0.6.0</version>

<scm>
<connection>someConnection</connection>
<developerConnection>someDeveloperConnection</developerConnection>
</scm>

<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down

0 comments on commit bae42ed

Please sign in to comment.