modify java sdk testcases (#404)

Signed-off-by: yongpengli-z <yongpeng.li@zilliz.com>

Signed-off-by: yongpengli-z <yongpeng.li@zilliz.com>

tests/milvustest/src/main/java/com/zilliz/milvustest/common/CommonFunction.java

@@ -424,6 +424,8 @@ public class CommonFunction {
       case RHNSW_SQ:
         extraParm = "{\"M\":16,\"efConstruction\":64}";
         break;
+      case BIN_IVF_FLAT:
+        extraParm = "";
       default:
         extraParm = "{\"nlist\":128}";
         break;

tests/milvustest/src/test/java/com/zilliz/milvustest/index/DropIndexTest.java

@@ -64,15 +64,6 @@ public class DropIndexTest extends BaseTest {
                 .build());
     Assert.assertEquals(rpcStatusR.getStatus().intValue(), 0);
     Assert.assertEquals(rpcStatusR.getData().getMsg(), "Success");
-
-    R<RpcStatus> rpcStatusR2 =
-            milvusClient.dropIndex(
-                    DropIndexParam.newBuilder()
-                            .withCollectionName(collection)
-                            .withIndexName(CommonData.defaultIndex)
-                            .build());
-    Assert.assertEquals(rpcStatusR2.getStatus().intValue(), 0);
-    Assert.assertEquals(rpcStatusR2.getData().getMsg(), "Success");
   }
 
   @Severity(SeverityLevel.MINOR)

tests/milvustest/src/test/java/com/zilliz/milvustest/index/IndexLoadTest.java

@@ -162,10 +162,15 @@ public class IndexLoadTest extends BaseTest {
     @Severity(SeverityLevel.NORMAL)
     @Test(description = "Test create/drop index when collection is loaded for binary vector", dataProvider = "BinaryIndex",groups = {"Smoke"})
     public void createIndexAfterLoadBinaryCollection(IndexType indexType, MetricType metricType) {
+        if (indexType.equals(IndexType.BIN_IVF_FLAT)
+                && (metricType.equals(MetricType.SUBSTRUCTURE)
+                || metricType.equals(MetricType.SUPERSTRUCTURE))) {
+            return;
+        }
         // 1. create index params
         CreateIndexParam createIndexParams = CreateIndexParam.newBuilder()
                 .withCollectionName(binaryCollection)
-                .withFieldName(CommonData.defaultVectorField)
+                .withFieldName(CommonData.defaultBinaryVectorField)
                 .withMetricType(metricType)
                 .withIndexType(indexType)
                 .withExtraParam(CommonFunction.provideExtraParam(indexType))
@@ -207,7 +212,7 @@ public class IndexLoadTest extends BaseTest {
         // 6. release collection
         R<RpcStatus> rpcStatusR5 = milvusClient.releaseCollection(
                 ReleaseCollectionParam.newBuilder()
-                        .withCollectionName(collection)
+                        .withCollectionName(binaryCollection)
                         .build());
         System.out.println("Release collection " + rpcStatusR);
         Assert.assertEquals(rpcStatusR5.getStatus().intValue(), 0);
@@ -223,7 +228,7 @@ public class IndexLoadTest extends BaseTest {
         // 8. drop index
         R<RpcStatus> rpcStatusR7 = milvusClient.dropIndex(
                 DropIndexParam.newBuilder()
-                        .withCollectionName(collection)
+                        .withCollectionName(binaryCollection)
                         .build());
         System.out.println("Drop index " + rpcStatusR);
         Assert.assertEquals(rpcStatusR7.getStatus().intValue(), 0);

tests/milvustest/src/test/java/com/zilliz/milvustest/rbac/AddUserToRoleTest.java

@@ -23,14 +23,14 @@ import org.testng.annotations.Test;
 @Epic("Role")
 @Feature("AddUserToRole")
 public class AddUserToRoleTest extends BaseTest {
-  @BeforeClass
+  @BeforeClass(alwaysRun=true)
   public void initCreateRole() {
     R<RpcStatus> role = milvusClient.createRole(
             CreateRoleParam.newBuilder().withRoleName(CommonData.defaultRoleName).build());
-    logger.info("role:"+role);
+    System.out.println("role:"+role);
   }
 
-  @AfterClass
+  @AfterClass(alwaysRun=true)
   public void removeRole() {
     milvusClient.removeUserFromRole(RemoveUserFromRoleParam.newBuilder()
             .withRoleName(CommonData.defaultRoleName)

tests/milvustest/src/test/java/com/zilliz/milvustest/rbac/CreateRoleTest.java

@@ -21,7 +21,7 @@ import org.testng.annotations.Test;
 @Feature("CreateRole")
 
 public class CreateRoleTest extends BaseTest {
-  @AfterClass
+  @AfterClass(alwaysRun=true)
   public void removeTestData() {
     milvusClient.dropRole(
         DropRoleParam.newBuilder().withRoleName("newRole").build());

tests/milvustest/src/test/java/com/zilliz/milvustest/rbac/DropRoleTest.java

@@ -21,7 +21,7 @@ import org.testng.annotations.Test;
 @Feature("DropRole")
 public class DropRoleTest extends BaseTest {
 
-  @BeforeClass
+  @BeforeClass(alwaysRun=true)
   public void initCreateRole() {
     milvusClient.createRole(CreateRoleParam.newBuilder().withRoleName("newRoleName").build());
   }

tests/milvustest/src/test/java/com/zilliz/milvustest/rbac/GrantRolePrivilegeTest.java

@@ -50,7 +50,7 @@ public class GrantRolePrivilegeTest extends BaseTest {
     return objects;
   }
 
-  @BeforeClass
+  @BeforeClass(alwaysRun=true)
   public void initTestData() {
     milvusClient.createRole(
         CreateRoleParam.newBuilder().withRoleName(CommonData.defaultRoleName).build());
@@ -59,7 +59,7 @@ public class GrantRolePrivilegeTest extends BaseTest {
             .withUserName(CommonData.defaultUserName).build());
   }
 
-  @AfterMethod
+  @AfterMethod(alwaysRun=true)
   public void revokeRolePrivilege() {
     System.out.println("after:" + privilege);
     milvusClient.revokeRolePrivilege(
@@ -71,7 +71,7 @@ public class GrantRolePrivilegeTest extends BaseTest {
             .build());
   }
 
-  @AfterClass
+  @AfterClass(alwaysRun=true)
   public void removeTestData() {
     milvusClient.removeUserFromRole(
             RemoveUserFromRoleParam.newBuilder()

tests/milvustest/src/test/java/com/zilliz/milvustest/rbac/RemoveUserFromRoleTest.java

@@ -23,7 +23,7 @@ import org.testng.annotations.Test;
 @Epic("Role")
 @Feature("RemoveUserFromRole")
 public class RemoveUserFromRoleTest extends BaseTest {
-  @BeforeClass
+  @BeforeClass(alwaysRun=true)
   public void initTestData() {
     milvusClient.createRole(
         CreateRoleParam.newBuilder().withRoleName(CommonData.defaultRoleName).build());
@@ -34,7 +34,7 @@ public class RemoveUserFromRoleTest extends BaseTest {
             .build());
   }
 
-  @AfterClass
+  @AfterClass(alwaysRun=true)
   public void removeRole() {
     milvusClient.dropRole(
         DropRoleParam.newBuilder().withRoleName(CommonData.defaultRoleName).build());

tests/milvustest/src/test/java/com/zilliz/milvustest/rbac/RevokeRolePrivilegeTest.java

@@ -23,7 +23,7 @@ import org.testng.annotations.Test;
 @Epic("Role")
 @Feature("RevokeRolePrivilege")
 public class RevokeRolePrivilegeTest extends BaseTest {
-  @BeforeClass
+  @BeforeClass(alwaysRun=true)
   public void initTestData() {
        milvusClient.createRole(
               CreateRoleParam.newBuilder().withRoleName(CommonData.defaultRoleName).build());
@@ -35,7 +35,7 @@ public class RevokeRolePrivilegeTest extends BaseTest {
             .withPrivilege("DescribeCollection")
             .build());
   }
-    @AfterClass
+    @AfterClass(alwaysRun=true)
     public void removeTestData(){
         milvusClient.dropRole(DropRoleParam.newBuilder().withRoleName(CommonData.defaultRoleName).build());
 

tests/milvustest/src/test/java/com/zilliz/milvustest/rbac/SelectGrantForRoleAndObject.java

@@ -21,7 +21,7 @@ import org.testng.annotations.Test;
 @Epic("Role")
 @Feature("SelectGrantForRoleAndObject")
 public class SelectGrantForRoleAndObject extends BaseTest {
-  @BeforeClass
+  @BeforeClass(alwaysRun=true)
   public void initTestData() {
       R<RpcStatus> newRole = milvusClient.createRole(
               CreateRoleParam.newBuilder().withRoleName("newRole").build());
@@ -36,7 +36,7 @@ public class SelectGrantForRoleAndObject extends BaseTest {
       logger.info("rpcStatusR:"+rpcStatusR);
   }
 
-  @AfterClass
+  @AfterClass(alwaysRun=true)
   public void removeTestData() {
     milvusClient.revokeRolePrivilege(
         RevokeRolePrivilegeParam.newBuilder()

tests/milvustest/src/test/java/com/zilliz/milvustest/rbac/SelectGrantForRoleTest.java

@@ -20,7 +20,7 @@ import org.testng.annotations.Test;
 @Epic("Role")
 @Feature("SelectGrantForRole")
 public class SelectGrantForRoleTest extends BaseTest {
-  @BeforeClass
+  @BeforeClass(alwaysRun=true)
   public void initTestData() {
     milvusClient.createRole(
         CreateRoleParam.newBuilder().withRoleName(CommonData.defaultRoleName).build());
@@ -33,7 +33,7 @@ public class SelectGrantForRoleTest extends BaseTest {
             .build());
   }
 
-  @AfterClass
+  @AfterClass(alwaysRun=true)
   public void removeTestData() {
     milvusClient.revokeRolePrivilege(
         RevokeRolePrivilegeParam.newBuilder()
@@ -60,6 +60,6 @@ public class SelectGrantForRoleTest extends BaseTest {
         selectGrantResponseR.getData().getEntities(0).getRole().getName(),
         CommonData.defaultRoleName);
     Assert.assertTrue(
-        selectGrantResponseR.getData().getEntitiesCount()>1);
+        selectGrantResponseR.getData().getEntitiesCount()>=1);
   }
 }

tests/milvustest/src/test/java/com/zilliz/milvustest/rbac/SelectRoleTest.java

@@ -20,7 +20,7 @@ import org.testng.annotations.Test;
 @Epic("Role")
 @Feature("SelectRole")
 public class SelectRoleTest extends BaseTest {
-  @BeforeClass
+  @BeforeClass(alwaysRun=true)
   public void initTestData() {
     milvusClient.createRole(
         CreateRoleParam.newBuilder().withRoleName(CommonData.defaultRoleName).build());
@@ -31,7 +31,7 @@ public class SelectRoleTest extends BaseTest {
             .build());
   }
 
-  @AfterClass
+  @AfterClass(alwaysRun=true)
   public void removeRole() {
     milvusClient.removeUserFromRole(RemoveUserFromRoleParam.newBuilder()
             .withRoleName(CommonData.defaultRoleName)

tests/milvustest/src/test/java/com/zilliz/milvustest/rbac/SelectUserTest.java

@@ -20,7 +20,7 @@ import org.testng.annotations.Test;
 @Epic("Role")
 @Feature("SelectUser")
 public class SelectUserTest extends BaseTest {
-  @BeforeClass
+  @BeforeClass(alwaysRun=true)
   public void initTestData() {
     milvusClient.createRole(
         CreateRoleParam.newBuilder().withRoleName(CommonData.defaultRoleName).build());
@@ -31,7 +31,7 @@ public class SelectUserTest extends BaseTest {
                     .build());
   }
 
-  @AfterClass
+  @AfterClass(alwaysRun=true)
   public void removeRole() {
     milvusClient.removeUserFromRole(RemoveUserFromRoleParam.newBuilder()
             .withRoleName(CommonData.defaultRoleName)