Skip to content

Remove hamcrest #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matyasberry merged 2 commits into from
Mar 12, 2026
Merged

Remove hamcrest #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e64d24e
Remove hamcrest
matyasberry Mar 12, 2026
3bbf648
final versions
matyasberry Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 53 additions & 60 deletions config-vault/src/test/java/io/scalecube/config/vault/VaultConfigSourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package io.scalecube.config.vault;

import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.Assumptions.assumeFalse;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
Expand Down Expand Up @@ -62,9 +60,9 @@ void testFirstTenant() {
Map<String, ConfigProperty> loadConfig = vaultConfigSource.loadConfig();
ConfigProperty actual = loadConfig.get("top_secret");

assertThat(actual, notNullValue());
assertThat(actual.name(), equalTo("top_secret"));
assertThat(actual.valueAsString(""), equalTo("password1"));
assertNotNull(actual);
assertEquals("top_secret", actual.name());
assertEquals("password1", actual.valueAsString(""));
}

@Test
Expand All @@ -79,9 +77,9 @@ void testSecondTenant() {
Map<String, ConfigProperty> loadConfig = vaultConfigSource.loadConfig();
ConfigProperty actual = loadConfig.get("top_secret");

assertThat(actual, notNullValue());
assertThat(actual.name(), equalTo("top_secret"));
assertThat(actual.valueAsString(""), equalTo("password2"));
assertNotNull(actual);
assertEquals("top_secret", actual.name());
assertEquals("password2", actual.valueAsString(""));
}

@Test
Expand All @@ -95,26 +93,20 @@ void testMultiplePathsEnv() {
Map<String, ConfigProperty> loadConfig = vaultConfigSource.loadConfig();

ConfigProperty commonSecret = loadConfig.get("top_secret");
assertThat(commonSecret, notNullValue());
assertThat(commonSecret.name(), equalTo("top_secret"));
assertThat(
"Second path should override the first one",
commonSecret.valueAsString(""),
equalTo("password2"));
assertNotNull(commonSecret);
assertEquals("top_secret", commonSecret.name());
assertEquals(
"password2", commonSecret.valueAsString(""), "Second path should override the first one");

ConfigProperty fromFirstPath = loadConfig.get("only_first");
assertThat(fromFirstPath.name(), equalTo("only_first"));
assertThat(
"Secret defined only in first path expected",
fromFirstPath.valueAsString(""),
equalTo("pss1"));
assertEquals("only_first", fromFirstPath.name());
assertEquals(
"pss1", fromFirstPath.valueAsString(""), "Secret defined only in first path expected");

ConfigProperty fromSecondPath = loadConfig.get("only_second");
assertThat(fromSecondPath.name(), equalTo("only_second"));
assertThat(
"Secret defined only in second path expected",
fromSecondPath.valueAsString(""),
equalTo("pss2"));
assertEquals("only_second", fromSecondPath.name());
assertEquals(
"pss2", fromSecondPath.valueAsString(""), "Secret defined only in second path expected");
}

@Test
Expand All @@ -127,10 +119,10 @@ void testMissingProperty() {
.build();
Map<String, ConfigProperty> loadConfig = vaultConfigSource.loadConfig();

assertThat(loadConfig.size(), not(0));
assertFalse(loadConfig.isEmpty());

ConfigProperty actual = loadConfig.get("top_secret");
assertThat(actual, nullValue());
assertNull(actual);
}

@Test
Expand Down Expand Up @@ -188,13 +180,13 @@ void shouldWorkWhenRegistryIsReloadedAndVaultIsRunning() throws InterruptedExcep
ConfigRegistry configRegistry = ConfigRegistry.create(settings);
StringConfigProperty configProperty = configRegistry.stringProperty("top_secret");

assertThat(configProperty.value().get(), containsString("password1"));
assertTrue(configProperty.value().get().contains("password1"));

vaultInstance.putSecrets(VAULT_SECRETS_PATH1, " top_secret=new_password");

TimeUnit.SECONDS.sleep(2);

assertThat(configProperty.value().get(), containsString("new_password"));
assertTrue(configProperty.value().get().contains("new_password"));
}

@Test
Expand Down Expand Up @@ -232,7 +224,7 @@ void shouldWorkWhenRegistryIsReloadedAndVaultIsDown() {
fail(e);
}

assertThat(configProperty.value().get(), containsString(PASSWORD_PROPERTY_VALUE));
assertTrue(configProperty.value().get().contains(PASSWORD_PROPERTY_VALUE));
}

@Test
Expand All @@ -252,9 +244,9 @@ void testSealed() throws Throwable {
.loadConfig();
fail("Negative test failed");
} catch (ConfigSourceNotAvailableException expectedException) {
assertThat(expectedException.getCause(), instanceOf(VaultException.class));
assertInstanceOf(VaultException.class, expectedException.getCause());
String message = expectedException.getCause().getMessage();
assertThat(message, containsString("Vault responded with HTTP status code: 503"));
assertTrue(message.contains("Vault responded with HTTP status code: 503"));
}
}

Expand Down Expand Up @@ -282,8 +274,9 @@ void shouldWorkWhenRegistryIsReloadedAndVaultIsUnSealed() throws InterruptedExce
ConfigRegistry configRegistry = ConfigRegistry.create(settings);
StringConfigProperty configProperty = configRegistry.stringProperty("top_secret");

assertThat(
"initial value of top_secret", configProperty.value().get(), containsString("password1"));
assertTrue(
configProperty.value().get().contains("password1"),
"initial value of top_secret");

Vault vault = sealedVaultInstance.vault();
Map<String, Object> newValues = new HashMap<>();
Expand All @@ -307,7 +300,7 @@ void shouldWorkWhenRegistryIsReloadedAndVaultIsUnSealed() throws InterruptedExce
fail(vaultException.getMessage());
}
TimeUnit.SECONDS.sleep(2);
assertThat(configProperty.value().get(), containsString("new_password"));
assertTrue(configProperty.value().get().contains("new_password"));
}

@Test
Expand All @@ -330,9 +323,9 @@ void testRenewableToken() throws InterruptedException {
Map<String, ConfigProperty> loadConfig = vaultConfigSource.loadConfig();
ConfigProperty actual = loadConfig.get("top_secret");

assertThat(actual, notNullValue());
assertThat(actual.name(), equalTo("top_secret"));
assertThat(actual.valueAsString(""), equalTo("password1"));
assertNotNull(actual);
assertEquals("top_secret", actual.name());
assertEquals("password1", actual.valueAsString(""));

TimeUnit.SECONDS.sleep(1);
}
Expand Down Expand Up @@ -363,9 +356,9 @@ void testNonrenewableToken() {
Map<String, ConfigProperty> loadConfig = vaultConfigSource.loadConfig();
ConfigProperty actual = loadConfig.get("top_secret");

assertThat(actual, notNullValue());
assertThat(actual.name(), equalTo("top_secret"));
assertThat(actual.valueAsString(""), equalTo("password1"));
assertNotNull(actual);
assertEquals("top_secret", actual.name());
assertEquals("password1", actual.valueAsString(""));

times.increment();

Expand Down Expand Up @@ -401,9 +394,9 @@ void testRenewableTokenWithExplicitMaxTtl() {
Map<String, ConfigProperty> loadConfig = vaultConfigSource.loadConfig();
ConfigProperty actual = loadConfig.get("top_secret");

assertThat(actual, notNullValue());
assertThat(actual.name(), equalTo("top_secret"));
assertThat(actual.valueAsString(""), equalTo("password1"));
assertNotNull(actual);
assertEquals("top_secret", actual.name());
assertEquals("password1", actual.valueAsString(""));

times.increment();

Expand Down Expand Up @@ -437,9 +430,9 @@ void testRenewableTokenWithUseLimit() {
Map<String, ConfigProperty> loadConfig = vaultConfigSource.loadConfig();
ConfigProperty actual = loadConfig.get("top_secret");

assertThat(actual, notNullValue());
assertThat(actual.name(), equalTo("top_secret"));
assertThat(actual.valueAsString(""), equalTo("password1"));
assertNotNull(actual);
assertEquals("top_secret", actual.name());
assertEquals("password1", actual.valueAsString(""));

TimeUnit.SECONDS.sleep(1);
}
Expand All @@ -465,9 +458,9 @@ void testTokenSupplierGeneratesNewRenewableTokenWithExplicitMaxTtl() throws Exce
Map<String, ConfigProperty> loadConfig = vaultConfigSource.loadConfig();
ConfigProperty actual = loadConfig.get("top_secret");

assertThat(actual, notNullValue());
assertThat(actual.name(), equalTo("top_secret"));
assertThat(actual.valueAsString(""), equalTo("password1"));
assertNotNull(actual);
assertEquals("top_secret", actual.name());
assertEquals("password1", actual.valueAsString(""));

TimeUnit.SECONDS.sleep(1);
}
Expand Down Expand Up @@ -496,9 +489,9 @@ void testRenewableTokenWhichWillBeRevoked() {
Map<String, ConfigProperty> loadConfig = vaultConfigSource.loadConfig();
ConfigProperty actual = loadConfig.get("top_secret");

assertThat(actual, notNullValue());
assertThat(actual.name(), equalTo("top_secret"));
assertThat(actual.valueAsString(""), equalTo("password1"));
assertNotNull(actual);
assertEquals("top_secret", actual.name());
assertEquals("password1", actual.valueAsString(""));

TimeUnit.SECONDS.sleep(1);

Expand Down Expand Up @@ -535,9 +528,9 @@ void testTokenSupplierGeneratesNewRenewableTokenWhichWillBeRevoked() throws Exce
Map<String, ConfigProperty> loadConfig = vaultConfigSource.loadConfig();
ConfigProperty actual = loadConfig.get("top_secret");

assertThat(actual, notNullValue());
assertThat(actual.name(), equalTo("top_secret"));
assertThat(actual.valueAsString(""), equalTo("password1"));
assertNotNull(actual);
assertEquals("top_secret", actual.name());
assertEquals("password1", actual.valueAsString(""));

TimeUnit.SECONDS.sleep(1);

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.scalecube</groupId>
<artifactId>scalecube-parent</artifactId>
<version>0.3.18</version>
<version>0.3.20</version>
</parent>

<artifactId>scalecube-config-parent</artifactId>
Expand Down Expand Up @@ -39,7 +39,7 @@
</scm>

<properties>
<scalecube-test-support.version>0.1.3</scalecube-test-support.version>
<scalecube-test-support.version>0.1.7</scalecube-test-support.version>

<distributionManagement.url>https://maven.pkg.github.com/scalecube/scalecube-config
</distributionManagement.url>
Expand Down
Loading