Skip to content

Commit

Permalink
Fix test with proper prefixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeffalder
jeffalder committed Nov 19, 2023
1 parent a68f67c commit 8aaac84
Showing 1 changed file with 35 additions and 35 deletions.
70 changes: 35 additions & 35 deletions newrelic-agent/src/test/java/com/newrelic/agent/config/BaseConfigTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@
import org.junit.Rule;
import org.junit.Test;

import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;

import static com.newrelic.agent.config.AgentConfigImpl.SYSTEM_PROPERTY_ROOT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;

Expand All @@ -26,9 +28,10 @@ public class BaseConfigTest {
// SystemProperties collections with our key value, so we need to be able to identify this magic test
// key so we can set up and clean up using @Before and @After methods.

private static final String PREFIX = "BaseConfig";
private static final String KEY = "TestMagicKey";
private static final String FULL_KEY = PREFIX + KEY;
private static final String KEY_PROP = "item";
private static final String KEY_ENV_VAR = "NEW_RELIC_ITEM";
private static final String KEY_SYS_PROP = "newrelic.config.item";


@Rule
public SaveSystemPropertyProviderRule saveSystemPropertyProviderRule = new SaveSystemPropertyProviderRule();
Expand All @@ -43,75 +46,72 @@ public void emptyPrefixNotAllowed() {
@Test
public void getWithSyspropOverride() {
Map<String, Object> settings = new HashMap<>();
settings.put(KEY, "valueInMap");
saveSystemPropertyProviderRule.mockSingleProperty(FULL_KEY, "valueInSystemProperties");
settings.put(KEY_PROP, "valueInMap");
saveSystemPropertyProviderRule.mockSingleProperty(KEY_SYS_PROP, "valueInSystemProperties");

BaseConfig config = new BaseConfig(settings, PREFIX);
assertEquals("valueInSystemProperties", config.getProperty(KEY));
assertNull(config.getProperty(FULL_KEY));
BaseConfig config = new BaseConfig(settings, SYSTEM_PROPERTY_ROOT);
assertEquals("valueInSystemProperties", config.getProperty(KEY_PROP));
assertNull(config.getProperty(KEY_SYS_PROP));

config = new BaseConfig(settings, "DoesNotMatch");
assertEquals("valueInMap", config.getProperty(KEY));
assertNull(config.getProperty(FULL_KEY));
assertEquals("valueInMap", config.getProperty(KEY_PROP));
assertNull(config.getProperty(KEY_SYS_PROP));

config = new BaseConfig(settings);
assertEquals("valueInMap", config.getProperty(KEY));
assertNull(config.getProperty(FULL_KEY));
assertEquals("valueInMap", config.getProperty(KEY_PROP));
assertNull(config.getProperty(KEY_SYS_PROP));
}

@Test
public void getWithEnvironmentOverride() {
Map<String, Object> settings = new HashMap<>();
settings.put(KEY, "valueInMap");
settings.put(KEY_PROP, "valueInMap");

SystemPropertyFactory.setSystemPropertyProvider(new SystemPropertyProvider(
new SaveSystemPropertyProviderRule.TestSystemProps(),
new SaveSystemPropertyProviderRule.TestEnvironmentFacade(ImmutableMap.of(
KEY, "keyValueInEnvironment",
FULL_KEY, "fullKeyValueInEnvironment"
KEY_ENV_VAR, "fullKeyValueInEnvironment"
))
));

BaseConfig config = new BaseConfig(settings, PREFIX);
assertEquals("fullKeyValueInEnvironment", config.getProperty(KEY));
assertNull(config.getProperty(FULL_KEY));
BaseConfig config = new BaseConfig(settings, SYSTEM_PROPERTY_ROOT);
assertEquals("fullKeyValueInEnvironment", config.getProperty(KEY_PROP));
assertNull(config.getProperty(KEY_SYS_PROP));

config = new BaseConfig(settings, "DoesNotMatch");
assertEquals("valueInMap", config.getProperty(KEY));
assertNull(config.getProperty(FULL_KEY));
assertEquals("valueInMap", config.getProperty(KEY_PROP));
assertNull(config.getProperty(KEY_SYS_PROP));

config = new BaseConfig(settings);
assertEquals("valueInMap", config.getProperty(KEY));
assertNull(config.getProperty(FULL_KEY));
assertEquals("valueInMap", config.getProperty(KEY_PROP));
assertNull(config.getProperty(KEY_SYS_PROP));
}

@Test
public void getWithSyspropAndEnvironmentOverride() {
Map<String, Object> settings = new HashMap<>();
settings.put(KEY, "valueInMap");
settings.put(KEY_PROP, "valueInMap");

Properties props = new Properties();
props.setProperty(KEY, "keyValueInSystemProperties");
props.setProperty(FULL_KEY, "fullKeyValueInSystemProperties");
props.setProperty(KEY_SYS_PROP, "fullKeyValueInSystemProperties");

SystemPropertyFactory.setSystemPropertyProvider(new SystemPropertyProvider(
new SaveSystemPropertyProviderRule.TestSystemProps(props),
new SaveSystemPropertyProviderRule.TestEnvironmentFacade(ImmutableMap.of(
KEY, "keyValueInEnvironment",
FULL_KEY, "fullKeyValueInEnvironment"
new SaveSystemPropertyProviderRule.TestEnvironmentFacade(Collections.singletonMap(
KEY_ENV_VAR, "fullKeyValueInEnvironment"
))
));

BaseConfig config = new BaseConfig(settings, PREFIX);
assertEquals("fullKeyValueInEnvironment", config.getProperty(KEY));
assertNull(config.getProperty(FULL_KEY));
BaseConfig config = new BaseConfig(settings, SYSTEM_PROPERTY_ROOT);
assertEquals("fullKeyValueInEnvironment", config.getProperty(KEY_PROP));
assertNull(config.getProperty(KEY_ENV_VAR));

config = new BaseConfig(settings, "DoesNotMatch");
assertEquals("valueInMap", config.getProperty(KEY));
assertNull(config.getProperty(FULL_KEY));
assertEquals("valueInMap", config.getProperty(KEY_PROP));
assertNull(config.getProperty(KEY_SYS_PROP));

config = new BaseConfig(settings);
assertEquals("valueInMap", config.getProperty(KEY));
assertNull(config.getProperty(FULL_KEY));
assertEquals("valueInMap", config.getProperty(KEY_PROP));
assertNull(config.getProperty(KEY_ENV_VAR));
}
}

0 comments on commit 8aaac84

Please sign in to comment.