Skip to content

Commit cef47eb

Browse files
raydacraydac
committed
improved testing
1 parent 8ef9f1a commit cef47eb

File tree

3 files changed

+114
-109
lines changed

3 files changed

+114
-109
lines changed

‎jcp-tests/jcp-test-gradle/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ repositories {
2222
}
2323

2424
dependencies {
25-
testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.4.0'
25+
testCompile 'junit:junit:4.12'
2626
}
2727

2828
jar {

‎jcp-tests/jcp-test-gradle/pom.xml‎

Lines changed: 110 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,120 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
4+
<modelVersion>4.0.0</modelVersion>
55

6-
<parent>
7-
<groupId>com.igormaznitsa</groupId>
8-
<artifactId>jcp-tests</artifactId>
9-
<version>0-SNAPSHOT</version>
10-
</parent>
6+
<parent>
7+
<groupId>com.igormaznitsa</groupId>
8+
<artifactId>jcp-tests</artifactId>
9+
<version>0-SNAPSHOT</version>
10+
</parent>
1111

12-
<artifactId>jcp-test-gradle</artifactId>
13-
<packaging>pom</packaging>
12+
<artifactId>jcp-test-gradle</artifactId>
13+
<packaging>pom</packaging>
1414

15-
<dependencies>
16-
<dependency>
17-
<groupId>${project.groupId}</groupId>
18-
<artifactId>jcp-gradle-plugin</artifactId>
19-
<version>${jcp.test.version}</version>
20-
<scope>provided</scope>
21-
</dependency>
22-
</dependencies>
15+
<dependencies>
16+
<dependency>
17+
<groupId>${project.groupId}</groupId>
18+
<artifactId>jcp-gradle-plugin</artifactId>
19+
<version>${jcp.test.version}</version>
20+
<scope>provided</scope>
21+
</dependency>
22+
<dependency>
23+
<groupId>junit</groupId>
24+
<artifactId>junit</artifactId>
25+
<version>4.12</version>
26+
<scope>provided</scope>
27+
</dependency>
28+
</dependencies>
2329

24-
<build>
25-
<plugins>
26-
<plugin>
27-
<artifactId>maven-clean-plugin</artifactId>
28-
<version>3.1.0</version>
29-
<configuration>
30-
<filesets>
31-
<fileset>
32-
<directory>${project.basedir}/gradle</directory>
33-
<followSymlinks>false</followSymlinks>
34-
</fileset>
35-
<fileset>
36-
<directory>${project.basedir}</directory>
37-
<includes>
38-
<include>gradlew</include>
39-
<include>gradlew.bat</include>
40-
</includes>
41-
<followSymlinks>false</followSymlinks>
42-
</fileset>
43-
<fileset>
44-
<directory>${project.basedir}/downloaded</directory>
45-
<followSymlinks>false</followSymlinks>
46-
</fileset>
47-
<fileset>
48-
<directory>${project.basedir}/build</directory>
49-
<followSymlinks>false</followSymlinks>
50-
</fileset>
51-
<fileset>
52-
<directory>${project.basedir}/out</directory>
53-
<followSymlinks>false</followSymlinks>
54-
</fileset>
55-
</filesets>
56-
</configuration>
57-
</plugin>
58-
<plugin>
59-
<groupId>org.codehaus.mojo</groupId>
60-
<artifactId>properties-maven-plugin</artifactId>
61-
<version>1.0.0</version>
62-
<executions>
63-
<execution>
64-
<goals>
65-
<goal>set-system-properties</goal>
66-
</goals>
67-
<configuration>
68-
<properties>
69-
<property>
70-
<name>gradle.prop.jcp_plugin_path</name>
71-
<value>${project.basedir}${file.separator}..${file.separator}..${file.separator}jcp-gradle-plugin${file.separator}build${file.separator}libs${file.separator}jcp-gradle-plugin-${jcp.test.version}.jar</value>
72-
</property>
73-
</properties>
74-
</configuration>
75-
</execution>
76-
</executions>
77-
</plugin>
78-
<plugin>
79-
<groupId>org.fortasoft</groupId>
80-
<artifactId>gradle-maven-plugin</artifactId>
81-
<version>1.0.8</version>
82-
<dependencies>
83-
<dependency>
84-
<groupId>org.gradle</groupId>
85-
<artifactId>gradle-tooling-api</artifactId>
86-
<version>5.0</version>
87-
</dependency>
88-
</dependencies>
30+
<build>
31+
<plugins>
32+
<plugin>
33+
<artifactId>maven-clean-plugin</artifactId>
34+
<version>3.1.0</version>
35+
<configuration>
36+
<filesets>
37+
<fileset>
38+
<directory>${project.basedir}/gradle</directory>
39+
<followSymlinks>false</followSymlinks>
40+
</fileset>
41+
<fileset>
42+
<directory>${project.basedir}</directory>
43+
<includes>
44+
<include>gradlew</include>
45+
<include>gradlew.bat</include>
46+
</includes>
47+
<followSymlinks>false</followSymlinks>
48+
</fileset>
49+
<fileset>
50+
<directory>${project.basedir}/downloaded</directory>
51+
<followSymlinks>false</followSymlinks>
52+
</fileset>
53+
<fileset>
54+
<directory>${project.basedir}/build</directory>
55+
<followSymlinks>false</followSymlinks>
56+
</fileset>
57+
<fileset>
58+
<directory>${project.basedir}/out</directory>
59+
<followSymlinks>false</followSymlinks>
60+
</fileset>
61+
</filesets>
62+
</configuration>
63+
</plugin>
64+
<plugin>
65+
<groupId>org.codehaus.mojo</groupId>
66+
<artifactId>properties-maven-plugin</artifactId>
67+
<version>1.0.0</version>
68+
<executions>
69+
<execution>
70+
<goals>
71+
<goal>set-system-properties</goal>
72+
</goals>
73+
<configuration>
74+
<properties>
75+
<property>
76+
<name>gradle.prop.jcp_plugin_path</name>
77+
<value>${project.basedir}${file.separator}..${file.separator}..${file.separator}jcp-gradle-plugin${file.separator}build${file.separator}libs${file.separator}jcp-gradle-plugin-${jcp.test.version}.jar</value>
78+
</property>
79+
</properties>
80+
</configuration>
81+
</execution>
82+
</executions>
83+
</plugin>
84+
<plugin>
85+
<groupId>org.fortasoft</groupId>
86+
<artifactId>gradle-maven-plugin</artifactId>
87+
<version>1.0.8</version>
88+
<dependencies>
89+
<dependency>
90+
<groupId>org.gradle</groupId>
91+
<artifactId>gradle-tooling-api</artifactId>
92+
<version>5.0</version>
93+
</dependency>
94+
</dependencies>
8995

90-
<configuration>
91-
<gradleVersion>5.0</gradleVersion>
92-
<args>
93-
<arg>--stacktrace</arg>
94-
<arg>--info</arg>
95-
</args>
96-
<tasks>
97-
<task>clean</task>
98-
<task>test</task>
99-
<task>jar</task>
100-
</tasks>
101-
</configuration>
102-
<executions>
103-
<execution>
104-
<phase>compile</phase>
105-
<goals>
106-
<goal>invoke</goal>
107-
</goals>
108-
</execution>
109-
</executions>
110-
</plugin>
111-
</plugins>
112-
</build>
96+
<configuration>
97+
<gradleVersion>5.0</gradleVersion>
98+
<args>
99+
<arg>--stacktrace</arg>
100+
<arg>--info</arg>
101+
</args>
102+
<tasks>
103+
<task>clean</task>
104+
<task>test</task>
105+
<task>jar</task>
106+
</tasks>
107+
</configuration>
108+
<executions>
109+
<execution>
110+
<phase>compile</phase>
111+
<goals>
112+
<goal>invoke</goal>
113+
</goals>
114+
</execution>
115+
</executions>
116+
</plugin>
117+
</plugins>
118+
</build>
113119

114120
</project>

‎jcp-tests/jcp-test-gradle/src/test/java/com/igormaznitsa/jcp/it/gradle/TestMain.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package com.igormaznitsa.jcp.it.gradle;
22

3-
import org.junit.jupiter.api.Test;
4-
5-
import static org.junit.jupiter.api.Assertions.*;
3+
import org.junit.Test;
4+
import org.junit.Assert;
65

76
public class TestMain {
87

98
@Test
109
public void testMain(){
11-
assertEquals("Some Test", new MainTwo().getValue());
10+
Assert.assertEquals("Some Test Global Value", new MainTwo().getValue());
1211
}
1312

1413
}

0 commit comments

Comments
 (0)