OAP-222 oap-teamcity

oaplatform · Feb 2, 2024 · b32beb5 · b32beb5
1 parent 60771b0
commit b32beb5
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 195 deletions.
diff --git a/oap-formats/oap-tsv/oap-tsv-test/src/test/java/oap/tsv/TsvArrayTest.java b/oap-formats/oap-tsv/oap-tsv-test/src/test/java/oap/tsv/TsvArrayTest.java
@@ -24,14 +24,13 @@
 
 package oap.tsv;
 
-import junit.framework.TestCase;
 import org.testng.annotations.Test;
 
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TsvArrayTest extends TestCase {
+public class TsvArrayTest {
     @Test
     public void testPrint() {
         assertThat( TsvArray.print( List.of( 1, 2, 3 ), null ) )

diff --git a/oap-stdlib-test/pom.xml b/oap-stdlib-test/pom.xml
@@ -43,6 +43,11 @@
             <artifactId>oap-stdlib</artifactId>
             <version>${parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>oap</groupId>
+            <artifactId>oap-teamcity</artifactId>
+            <version>${oap.deps.oap-teamcity.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.testng</groupId>

diff --git a/oap-stdlib-test/src/main/java/oap/benchmark/AbstractRunner.java b/oap-stdlib-test/src/main/java/oap/benchmark/AbstractRunner.java
@@ -25,7 +25,7 @@
 package oap.benchmark;
 
 import lombok.extern.slf4j.Slf4j;
-import oap.testng.Teamcity;
+import oap.teamcity.Teamcity;
 import oap.util.Lists;
 import oap.util.function.Try;
 

diff --git a/oap-stdlib-test/src/main/java/oap/testng/Suite.java b/oap-stdlib-test/src/main/java/oap/testng/Suite.java
@@ -24,6 +24,8 @@
 
 package oap.testng;
 
+import oap.teamcity.Teamcity;
+
 public class Suite {
     private static final String UNIQUE_EXECUTION_ID = Teamcity.buildPrefix() + "_" + System.currentTimeMillis();
 

diff --git a/oap-stdlib-test/src/main/java/oap/testng/Teamcity.java b/oap-stdlib-test/src/main/java/oap/testng/Teamcity.java
diff --git a/oap-stdlib-test/src/main/java/oap/testng/TeamcityTestNGListener.java b/oap-stdlib-test/src/main/java/oap/testng/TeamcityTestNGListener.java
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>oap</groupId>
         <artifactId>oap.maven</artifactId>
-        <version>21.0.0</version>
+        <version>21.1.4</version>
     </parent>
 
     <packaging>pom</packaging>
@@ -48,9 +48,10 @@
     </repositories>
 
     <properties>
-        <oap.project.version>21.6.1</oap.project.version>
+        <oap.project.version>21.6.2</oap.project.version>
 
         <oap.deps.config.version>21.0.0</oap.deps.config.version>
+        <oap.deps.oap-teamcity.version>21.0.1</oap.deps.oap-teamcity.version>
 
         <oap.deps.testng.version>7.8.0</oap.deps.testng.version>
         <oap.deps.assertj.version>3.24.2</oap.deps.assertj.version>