CM-4553: Implemented test cases for CometApi.getExperiments().

Author: yaricom

comet-java-client/src/main/java/ml/comet/experiment/impl/CometApiImpl.java

@@ -172,8 +172,8 @@ public List<ExperimentMetadata> getExperiments(@NonNull String workspaceName, @N
     public List<ExperimentMetadata> getExperiments(@NonNull String workspaceName) {
         return this.getAllProjects(workspaceName)
                 .stream()
-                .collect(ArrayList::new, (metadataList, project) -> this.getAllExperiments(project.getProjectId()),
-                        ArrayList::addAll);
+                .map(project -> this.getAllExperiments(project.getProjectId()))
+                .collect(ArrayList::new, ArrayList::addAll, ArrayList::addAll);
     }
 
     @Override
@@ -191,15 +191,21 @@ public List<ExperimentMetadata> getExperiments(
         }
 
         if (StringUtils.isBlank(experimentNamePattern)) {
-            // no experiment name pattern provided
+            // no experiment name pattern provided - all experiments under project
             return this.getExperiments(workspaceName, projectName);
         }
 
         // return list of experiments with names matching provided regex
+        Pattern p = Pattern.compile(experimentNamePattern);
         return this.getExperiments(workspaceName, projectName)
                 .stream()
-                .filter(experimentMetadata ->
-                        Pattern.matches(experimentNamePattern, experimentMetadata.getExperimentName()))
+                .filter(experimentMetadata -> {
+                            if (StringUtils.isEmpty(experimentMetadata.getExperimentName())) {
+                                return false;
+                            } else {
+                                return p.matcher(experimentMetadata.getExperimentName()).matches();
+                            }
+                        })
                 .collect(Collectors.toList());
     }
 

comet-java-client/src/test/java/ml/comet/experiment/impl/CometApiTest.java

@@ -37,6 +37,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Stream;
 import java.util.zip.ZipInputStream;
@@ -115,9 +116,47 @@ public void testGetsAllExperiments() {
 
         List<ExperimentMetadata> experiments = experimentsOpt.get();
         assertFalse(experiments.isEmpty());
-        boolean experimentExists = experiments.stream()
-                .anyMatch(experiment -> SHARED_EXPERIMENT.getExperimentKey().equals(experiment.getExperimentKey()));
-        assertTrue(experimentExists);
+        assertExperimentInList(SHARED_EXPERIMENT.getExperimentKey(), experiments);
+    }
+
+    @Test
+    public void testGetExperiments_Workspace() {
+        List<ExperimentMetadata> experiments = COMET_API.getExperiments(WORKSPACE_NAME);
+        assertFalse(experiments.isEmpty());
+        assertExperimentInList(SHARED_EXPERIMENT.getExperimentKey(), experiments);
+    }
+
+    @Test
+    public void testGetExperiments_Workspace_Project() {
+        List<ExperimentMetadata> experiments = COMET_API.getExperiments(WORKSPACE_NAME, PROJECT_NAME);
+        assertFalse(experiments.isEmpty());
+        assertExperimentInList(SHARED_EXPERIMENT.getExperimentKey(), experiments);
+    }
+
+    @Test
+    public void testGetExperiments() throws Exception {
+        String experimentName = UUID.randomUUID().toString();
+        String experimentKey;
+        try (OnlineExperiment experiment = createOnlineExperiment()) {
+            experiment.setExperimentName(experimentName);
+            experimentKey = experiment.getExperimentKey();
+
+            // wait for experiment name to be updated
+            awaitForCondition(() -> experimentName.equals(experiment.getMetadata().getExperimentName()),
+                    "Experiment name update timeout");
+        }
+
+        List<ExperimentMetadata> experiments = COMET_API.getExperiments(WORKSPACE_NAME, PROJECT_NAME, experimentName);
+        assertEquals(1, experiments.size(), "one experiment expected");
+
+        ExperimentMetadata experimentMetadata = experiments.get(0);
+        assertEquals(experimentKey, experimentMetadata.getExperimentKey());
+    }
+
+    @Test
+    public void testGetExperiments_emptyProject_with_experimentName() {
+        assertThrows(IllegalArgumentException.class, () ->
+                COMET_API.getExperiments(WORKSPACE_NAME, null, "someExperiment*."));
     }
 
     @Test
@@ -638,7 +677,7 @@ public void testDeleteRegistryModelVersion_model_doesnt_exists() {
         // try to delete version of not existing model
         //
         String modelName = "not existing model";
-        assertThrows(CometApiException.class, ()->
+        assertThrows(CometApiException.class, () ->
                 COMET_API.deleteRegistryModelVersion(modelName, SHARED_EXPERIMENT.getWorkspaceName(),
                         DEFAULT_MODEL_VERSION));
     }
@@ -653,7 +692,7 @@ public void testDeleteRegistryModelVersion_version_doesnt_exists() {
 
         // try to delete not existing version of the model
         //
-        assertThrows(ModelVersionNotFoundException.class, ()->
+        assertThrows(ModelVersionNotFoundException.class, () ->
                 COMET_API.deleteRegistryModelVersion(modelName, SHARED_EXPERIMENT.getWorkspaceName(),
                         "1.0.1"));
     }
@@ -752,4 +791,10 @@ private static void logModelFolder(String modelName) {
         awaitForCondition(() -> !SHARED_EXPERIMENT.getAssetList(MODEL_ELEMENT.type()).isEmpty(),
                 "Failed to get logged model file");
     }
+
+    private static void assertExperimentInList(String experimentKey, List<ExperimentMetadata> experiments) {
+        boolean experimentExists = experiments.stream()
+                .anyMatch(experiment -> experimentKey.equals(experiment.getExperimentKey()));
+        assertTrue(experimentExists);
+    }
 }

comet-java-client/src/test/java/ml/comet/experiment/impl/OnlineExperimentTest.java

@@ -133,7 +133,7 @@ public void testSetAndGetExperimentName() throws Exception {
 
             ExperimentMetadata metadata = experiment.getMetadata();
             String generatedExperimentName = metadata.getExperimentName();
-            assertTrue(StringUtils.isNoneEmpty(generatedExperimentName));
+            assertTrue(StringUtils.isNotEmpty(generatedExperimentName));
 
             experiment.setExperimentName(SOME_NAME);