Skip to content

Commit

Permalink
Bael 1704 (eugenp#4973)
Browse files Browse the repository at this point in the history 
* BAEL-1704: Non-Trivial Work in Kotlin vs Java

* BAEL-1704: Non-Trivial Work in Kotlin vs Java

Renaming one test class

* BAEL-1704: Kotlin vs Java

* BAEL-1704: Kotlin vs Java

The files moved to the guest branch.
  • Loading branch information
@patryk-kucharz @KevinGilmore
patryk-kucharz authored and KevinGilmore committed Aug 17, 2018
1 parent 86aaf6f commit 061d119
Show file tree
Hide file tree
Showing 13 changed files with 214 additions and 1 deletion.
14 changes: 14 additions & 0 deletions guest/core-kotlin/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/bin/

#ignore gradle
.gradle/


#ignore build and generated files
build/
node/
out/

#ignore installed node modules and package lock file
node_modules/
package-lock.json
199 changes: 199 additions & 0 deletions guest/core-kotlin/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,199 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>core-kotlin</artifactId>
<version>1.0-SNAPSHOT</version>
<groupId>com.stackify</groupId>
<packaging>jar</packaging>

<repositories>
<repository>
<id>jcenter</id>
<url>http://jcenter.bintray.com</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-runner</artifactId>
<version>${junit.platform.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${kotlin-stdlib.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin-stdlib.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit</artifactId>
<version>${kotlin-test-junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
<version>${kotlin-reflect.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.spek</groupId>
<artifactId>spek-api</artifactId>
<version>1.1.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.spek</groupId>
<artifactId>spek-subject-extension</artifactId>
<version>1.1.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.spek</groupId>
<artifactId>spek-junit-platform-engine</artifactId>
<version>1.1.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.nhaarman</groupId>
<artifactId>mockito-kotlin</artifactId>
<version>${mockito-kotlin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven-failsafe-plugin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin-maven-plugin.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin-maven-plugin.version}</version>
<executions>
<execution>
<id>compile</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<sourceDirs>
<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
</sourceDirs>
</configuration>
</execution>
<execution>
<id>test-compile</id>
<goals>
<goal>test-compile</goal>
</goals>
<configuration>
<sourceDirs>
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
</sourceDirs>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
<executions>
<!-- Replacing default-compile as it is treated specially
by maven -->
<execution>
<id>default-compile</id>
<phase>none</phase>
</execution>
<!-- Replacing default-testCompile as it is treated specially
by maven -->
<execution>
<id>default-testCompile</id>
<phase>none</phase>
</execution>
<execution>
<id>java-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven-failsafe-plugin.version}</version>
<dependencies>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId>
<version>${junit.platform.version}</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>junit5</id>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<includes>
<include>**/*Test5.java</include>
</includes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<properties>
<maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<kotlin-maven-plugin.version>1.2.60</kotlin-maven-plugin.version>
<kotlin-test-junit.version>1.2.51</kotlin-test-junit.version>
<kotlin-stdlib.version>1.2.51</kotlin-stdlib.version>
<kotlin-reflect.version>1.2.51</kotlin-reflect.version>
<kotlinx.version>0.22.5</kotlinx.version>
<mockito-kotlin.version>1.5.0</mockito-kotlin.version>
<commons-math3.version>3.6.1</commons-math3.version>
<junit.platform.version>1.0.0</junit.platform.version>
<junit.vintage.version>5.2.0</junit.vintage.version>
<assertj.version>3.10.0</assertj.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
</properties>

</project>
0 ...ldung/kotlinvsjava/CompanionObjectTest.kt → ...ldung/kotlinvsjava/CompanionObjectTest.kt
View file
File renamed without changes.
0 .../baeldung/kotlinvsjava/ConstructorTest.kt → .../baeldung/kotlinvsjava/ConstructorTest.kt
View file
File renamed without changes.
0 ...om/baeldung/kotlinvsjava/DataClassTest.kt → ...om/baeldung/kotlinvsjava/DataClassTest.kt
View file
File renamed without changes.
0 ...m/baeldung/kotlinvsjava/DelegationTest.kt → ...m/baeldung/kotlinvsjava/DelegationTest.kt
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...m/baeldung/kotlinvsjava/ExceptionsTest.kt → ...m/baeldung/kotlinvsjava/ExceptionsTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class ExceptionsTest {
fun givenANullString_whenUsingElvisOperator_thenExceptionIsThrown() {
val sampleString: String? = null

val length: Int = sampleString?.length ?: throw IllegalArgumentException("String must not be null")
sampleString?.length ?: throw IllegalArgumentException("String must not be null")
}

private fun funThrowingException(): Nothing {
Expand Down
0 ...ng/kotlinvsjava/ExtensionFunctionsTest.kt → ...ng/kotlinvsjava/ExtensionFunctionsTest.kt
View file
File renamed without changes.
0 ...om/baeldung/kotlinvsjava/FunctionsTest.kt → ...om/baeldung/kotlinvsjava/FunctionsTest.kt
View file
File renamed without changes.
0 ...m/baeldung/kotlinvsjava/IsOperatorTest.kt → ...m/baeldung/kotlinvsjava/IsOperatorTest.kt
View file
File renamed without changes.
0 ...m/baeldung/kotlinvsjava/NullSafetyTest.kt → ...m/baeldung/kotlinvsjava/NullSafetyTest.kt
View file
File renamed without changes.
0 .../kotlinvsjava/OperatorsOverloadingTest.kt → .../kotlinvsjava/OperatorsOverloadingTest.kt
View file
File renamed without changes.
0 ...m/baeldung/kotlinvsjava/PropertiesTest.kt → ...m/baeldung/kotlinvsjava/PropertiesTest.kt
View file
File renamed without changes.

0 comments on commit 061d119

Please sign in to comment.