hackathon - test v2

Alfresco · Nov 3, 2023 · ca59f6b · ca59f6b
1 parent 5314c79
commit ca59f6b
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 15 deletions.
diff --git a/.../tas-elasticsearch/src/test/java/org/alfresco/elasticsearch/parallel/PathUpdateTests.java b/.../tas-elasticsearch/src/test/java/org/alfresco/elasticsearch/parallel/PathUpdateTests.java
@@ -29,6 +29,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -246,7 +247,7 @@ private String categoryPath(String... nodeNames)
         return "/cm:categoryRoot/cm:generalclassifiable/cm:" + Arrays.stream(nodeNames).collect(joining("/cm:"));
     }
 
-    @AfterTest
+    @AfterClass
     public void reset()
     {
         resetRetryNumber();

diff --git a/...sticsearch/src/test/java/org/alfresco/elasticsearch/reindexing/CategoryIndexingTests.java b/...sticsearch/src/test/java/org/alfresco/elasticsearch/reindexing/CategoryIndexingTests.java
@@ -28,6 +28,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -166,7 +167,7 @@ public void testQueryByPathOnDeletedCategory() throws InterruptedException {
         searchQueryService.expectResultsFromQuery(otherCategoryQuery, testUser, testFile.getName());
     }
 
-    @AfterTest
+    @AfterClass
     public void reset()
     {
         resetRetryNumber();

diff --git a/...icsearch/src/test/java/org/alfresco/elasticsearch/reindexing/CategoryReindexingTests.java b/...icsearch/src/test/java/org/alfresco/elasticsearch/reindexing/CategoryReindexingTests.java
@@ -26,6 +26,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -136,7 +137,7 @@ public void testQueryByPartialCategoryPathB() {
         searchQueryService.expectResultsFromQuery(query, testUser, testFile.getName(), testFolder.getName());
     }
 
-    @AfterTest
+    @AfterClass
     public void reset()
     {
         resetRetryNumber();

diff --git a/...earch/src/test/java/org/alfresco/elasticsearch/reindexing/ElasticsearchCMISPathTests.java b/...earch/src/test/java/org/alfresco/elasticsearch/reindexing/ElasticsearchCMISPathTests.java
@@ -23,6 +23,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -127,7 +128,7 @@ private FileModel createContent(String filename, String content, FolderModel fol
         return dataContent.usingUser(user).usingResource(folderModel).createContent(fileModel);
     }
 
-    @AfterTest
+    @AfterClass
     public void reset()
     {
         resetRetryNumber();

diff --git a/...search/src/test/java/org/alfresco/elasticsearch/reindexing/ElasticsearchGetTagsTests.java b/...search/src/test/java/org/alfresco/elasticsearch/reindexing/ElasticsearchGetTagsTests.java
@@ -219,7 +219,7 @@ public void testGetTags_queryAndOperatorNotSupported()
             .assertLastError().containsSummary("An invalid WHERE query was received. Unsupported Predicate");
     }
 
-    @AfterTest
+    @AfterClass
     public void reset()
     {
         resetRetryNumber();

diff --git a/...h/src/test/java/org/alfresco/elasticsearch/reindexing/ElasticsearchPathIndexingTests.java b/...h/src/test/java/org/alfresco/elasticsearch/reindexing/ElasticsearchPathIndexingTests.java
@@ -22,6 +22,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -275,7 +276,7 @@ private String createDocument(FolderModel folderModel, String filename)
         return filename;
     }
 
-    @AfterTest
+    @AfterClass
     public void reset()
     {
         resetRetryNumber();

diff --git a/...rch/src/test/java/org/alfresco/elasticsearch/reindexing/ElasticsearchReindexingTests.java b/...rch/src/test/java/org/alfresco/elasticsearch/reindexing/ElasticsearchReindexingTests.java
@@ -33,6 +33,7 @@
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.startupcheck.IndefiniteWaitOneShotStartupCheckStrategy;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -373,7 +374,7 @@ private void cleanUpIndex()
         }
     }
 
-    @AfterTest
+    @AfterClass
     public void reset()
     {
         resetRetryNumber();

diff --git a/...h/src/test/java/org/alfresco/elasticsearch/reindexing/ElasticsearchSiteIndexingTests.java b/...h/src/test/java/org/alfresco/elasticsearch/reindexing/ElasticsearchSiteIndexingTests.java
@@ -41,6 +41,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -498,7 +499,7 @@ private static String unique(String prefix)
         return prefix + "-" + UUID.randomUUID();
     }
 
-    @AfterTest
+    @AfterClass
     public void reset()
     {
         resetRetryNumber();

diff --git a/...ch/src/test/java/org/alfresco/elasticsearch/reindexing/ElasticsearchTagIndexingTests.java b/...ch/src/test/java/org/alfresco/elasticsearch/reindexing/ElasticsearchTagIndexingTests.java
@@ -35,6 +35,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -270,7 +271,7 @@ private static String unique(String prefix)
         return prefix + "-" + UUID.randomUUID();
     }
 
-    @AfterTest
+    @AfterClass
     public void reset()
     {
         resetRetryNumber();

diff --git a/...ch/src/test/java/org/alfresco/elasticsearch/reindexing/NodeWithCategoryIndexingTests.java b/...ch/src/test/java/org/alfresco/elasticsearch/reindexing/NodeWithCategoryIndexingTests.java
@@ -8,6 +8,7 @@
 import org.alfresco.rest.search.SearchRequest;
 import org.alfresco.utility.model.TestGroup;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -115,7 +116,7 @@ public void testParentQueryAgainstFolderAfterParentCategoryDeletion()
         searchQueryService.expectResultsFromQuery(query, testUser);
     }
 
-    @AfterTest
+    @AfterClass
     public void reset()
     {
         resetRetryNumber();

diff --git a/.../test/java/org/alfresco/elasticsearch/reindexing/NodesSecondaryAncestorIndexingTests.java b/.../test/java/org/alfresco/elasticsearch/reindexing/NodesSecondaryAncestorIndexingTests.java
@@ -7,6 +7,7 @@
 import org.alfresco.rest.search.SearchRequest;
 import org.alfresco.utility.model.FileModel;
 import org.alfresco.utility.model.TestGroup;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -337,7 +338,7 @@ public void testSecondaryAncestorWithCopiedSecondaryParentNode()
         folders().delete(folderT);
     }
 
-    @AfterTest
+    @AfterClass
     public void reset()
     {
         resetRetryNumber();

diff --git a/...c/test/java/org/alfresco/elasticsearch/reindexing/NodesSecondaryChildrenRelatedTests.java b/...c/test/java/org/alfresco/elasticsearch/reindexing/NodesSecondaryChildrenRelatedTests.java
@@ -294,7 +294,7 @@ public interface Folders extends Map<String, Folder>
         void delete(Folder folder);
     }
 
-    @AfterTest
+    @AfterClass
     public void reset()
     {
         resetRetryNumber();

diff --git a/...rc/test/java/org/alfresco/elasticsearch/reindexing/NodesSecondaryParentIndexingTests.java b/...rc/test/java/org/alfresco/elasticsearch/reindexing/NodesSecondaryParentIndexingTests.java
@@ -7,6 +7,7 @@
 import org.alfresco.rest.search.SearchRequest;
 import org.alfresco.utility.model.FileModel;
 import org.alfresco.utility.model.TestGroup;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -330,7 +331,7 @@ public void testSecondaryParentWithCopiedSecondaryParentNode()
         folders().delete(folderT);
     }
 
-    @AfterTest
+    @AfterClass
     public void reset()
     {
         resetRetryNumber();

diff --git a/.../src/test/java/org/alfresco/elasticsearch/reindexing/NodesSecondaryPathIndexingTests.java b/.../src/test/java/org/alfresco/elasticsearch/reindexing/NodesSecondaryPathIndexingTests.java
@@ -7,6 +7,7 @@
 import org.alfresco.rest.search.SearchRequest;
 import org.alfresco.utility.model.FileModel;
 import org.alfresco.utility.model.TestGroup;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -363,7 +364,7 @@ public void testSecondaryParentWithCopiedSecondaryParentNode()
         folders().delete(folderT);
     }
 
-    @AfterTest
+    @AfterClass
     public void reset()
     {
         resetRetryNumber();

diff --git a/...search/src/test/java/org/alfresco/elasticsearch/reindexing/PathFieldsReindexingTests.java b/...search/src/test/java/org/alfresco/elasticsearch/reindexing/PathFieldsReindexingTests.java
@@ -7,6 +7,7 @@
 import org.alfresco.rest.search.SearchRequest;
 import org.alfresco.tas.AlfrescoStackInitializer;
 import org.alfresco.utility.model.TestGroup;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -138,7 +139,7 @@ public void testSecondaryPathWithNodeHavingComplexSecondaryRelationship()
                 folders(M).getName());
     }
 
-    @AfterTest
+    @AfterClass
     public void reset()
     {
         resetRetryNumber();