Skip to content

Commit ff53df7

Browse files
authored
Tests that rely on addons should not run by default
1 parent 14c0d95 commit ff53df7

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractApiTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,8 @@ public void testManualModeration() throws Exception {
608608
}
609609

610610
@Test
611-
public void testOcrUpdate() {
611+
public void testOcrUpdate() throws Exception {
612+
assumeAddonEnabled("ocr");
612613
Exception expected = null;
613614
// should support requesting ocr info
614615
try {

cloudinary-test-common/src/main/java/com/cloudinary/test/MockableTest.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
import com.cloudinary.utils.ObjectUtils;
55
import com.cloudinary.utils.StringUtils;
66

7+
import static org.junit.Assume.assumeTrue;
8+
79
import java.io.IOException;
10+
import java.util.Arrays;
11+
import java.util.List;
812
import java.util.Map;
913
import java.util.Random;
1014

@@ -36,4 +40,22 @@ protected Map preloadResource(Map options) throws IOException {
3640
combinedOptions.putAll(options);
3741
return cloudinary.uploader().upload("http://res.cloudinary.com/demo/image/upload/sample", combinedOptions);
3842
}
43+
44+
private static final List<String> enabledAddons = getEnabledAddons();
45+
46+
protected void assumeAddonEnabled(String addon) throws Exception {
47+
boolean enabled = enabledAddons.contains(addon.toLowerCase())
48+
|| (enabledAddons.size() == 1 && enabledAddons.get(0).equalsIgnoreCase("all"));
49+
50+
assumeTrue(String.format("Use CLD_TEST_ADDONS environment variable to enable tests for %s.", addon), enabled);
51+
}
52+
53+
private static List<String> getEnabledAddons() {
54+
String envAddons = System.getenv()
55+
.getOrDefault("CLD_TEST_ADDONS", "")
56+
.toLowerCase()
57+
.replaceAll("\\s", "");
58+
59+
return Arrays.asList(envAddons.split(","));
60+
}
3961
}

0 commit comments

Comments
 (0)