Skip to content

Commit c61428a

Browse files
authored
Merge pull request #3145 from codefromthecrypt/search-for-spock
Migrates e2e tests from spock to plain JUnit
2 parents b36db94 + c2f6f53 commit c61428a

File tree

18 files changed

+533
-649
lines changed

18 files changed

+533
-649
lines changed

e2e/pom.xml

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
<relativePath>../pom.xml</relativePath>
1414
</parent>
1515

16-
<properties>
17-
<spock.version>2.3-groovy-4.0</spock.version>
18-
</properties>
1916
<dependencies>
2017
<dependency>
2118
<groupId>io.kubernetes</groupId>
@@ -28,12 +25,6 @@
2825
<version>${project.version}</version>
2926
</dependency>
3027

31-
<dependency>
32-
<groupId>org.spockframework</groupId>
33-
<artifactId>spock-core</artifactId>
34-
<version>${spock.version}</version>
35-
<scope>test</scope>
36-
</dependency>
3728
<dependency>
3829
<groupId>junit</groupId>
3930
<artifactId>junit</artifactId>
@@ -57,21 +48,6 @@
5748
<version>${slf4j.version}</version>
5849
<scope>test</scope>
5950
</dependency>
60-
61-
<!-- Following two deps exist to make spock2 work with junit4 -->
62-
<!-- Ref: https://github.com/groovy/GMavenPlus/wiki/Examples#spock-2-and-junit -->
63-
<dependency>
64-
<groupId>org.junit.vintage</groupId>
65-
<artifactId>junit-vintage-engine</artifactId>
66-
<version>5.10.2</version>
67-
<scope>test</scope>
68-
</dependency>
69-
<dependency>
70-
<groupId>org.spockframework</groupId>
71-
<artifactId>spock-junit4</artifactId>
72-
<version>${spock.version}</version>
73-
<scope>test</scope>
74-
</dependency>
7551
<dependency>
7652
<groupId>org.awaitility</groupId>
7753
<artifactId>awaitility</artifactId>
@@ -97,24 +73,6 @@
9773
</systemPropertyVariables>
9874
</configuration>
9975
</plugin>
100-
<plugin>
101-
<groupId>org.codehaus.gmavenplus</groupId>
102-
<artifactId>gmavenplus-plugin</artifactId>
103-
<executions>
104-
<execution>
105-
<goals>
106-
<goal>compileTests</goal>
107-
</goals>
108-
</execution>
109-
</executions>
110-
<dependencies>
111-
<dependency>
112-
<groupId>org.codehaus.groovy</groupId>
113-
<artifactId>groovy-all</artifactId>
114-
<version>2.4.21</version>
115-
</dependency>
116-
</dependencies>
117-
</plugin>
11876
<plugin>
11977
<groupId>org.apache.maven.plugins</groupId>
12078
<artifactId>maven-deploy-plugin</artifactId>

e2e/src/test/groovy/io/kubernetes/client/e2e/basic/CoreV1ApiTest.groovy

Lines changed: 0 additions & 42 deletions
This file was deleted.

e2e/src/test/groovy/io/kubernetes/client/e2e/csr/CSRTest.groovy

Lines changed: 0 additions & 66 deletions
This file was deleted.

e2e/src/test/groovy/io/kubernetes/client/e2e/dynamic/DynamicApiTest.groovy

Lines changed: 0 additions & 38 deletions
This file was deleted.

e2e/src/test/groovy/io/kubernetes/client/e2e/informer/NamespaceInformerTest.groovy

Lines changed: 0 additions & 51 deletions
This file was deleted.

e2e/src/test/groovy/io/kubernetes/client/e2e/kubectl/KubectlDrainTest.groovy

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)