Skip to content

Refactor tests #2

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

Open
ktarbet wants to merge 1 commit into
base: 7.0-CompParmTableModel
Choose a base branch
from
Open

Refactor tests #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
155 changes: 69 additions & 86 deletions java/opendcs-api/src/test/java/org/opendcs/annotations/PropertySpecValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,120 +177,111 @@ static class MultipleGroupsAlgorithm
private Map<String, String> properties;

@BeforeEach
public void setup()
public void setup()
{
validator = new PropertySpecValidator(TestAlgorithm.class);
properties = new HashMap<>();
}


/**
* Returns a valid baseline property map for TestAlgorithm with all groups satisfied:
* - apiUrl (required field)
* - username (ONE_OF auth)
* - host, port, database (ALL_REQUIRED database)
* - email (AT_LEAST_ONE contact)
* - proxy group satisfied by omission (ALL_OR_NONE)
*/
private static Map<String, String> validBaseProperties()
{
Map<String, String> props = new HashMap<>();
props.put("apiUrl", "https://api.example.com");
props.put("username", "user123");
props.put("host", "localhost");
props.put("port", "5432");
props.put("database", "mydb");
props.put("email", "test@example.com");
return props;
}

@Test
public void testValidateWithAllRequirementsSatisfied()
public void testValidateWithAllRequirementsSatisfied()
{
// Satisfy all requirements
properties.put("apiUrl", "https://api.example.com");
properties.put("username", "user123"); // ONE_OF auth
properties.put("host", "localhost"); // ALL_REQUIRED database
properties.put("port", "5432");
properties.put("database", "mydb");
properties.put("email", "test@example.com"); // AT_LEAST_ONE contact
// proxy group satisfied by providing none (ALL_OR_NONE)

properties = validBaseProperties();

PropertySpecValidator.ValidationResult result = validator.validate(properties);
Assertions.assertTrue(result.isValid());
Assertions.assertTrue(result.getErrors().isEmpty());
}

@Test
public void testValidateWithMissingRequired()
public void testValidateWithMissingRequired()
{
// Missing required apiUrl
properties.put("username", "user123");
properties.put("host", "localhost");
properties.put("port", "5432");
properties.put("database", "mydb");
properties.put("email", "test@example.com");

properties = validBaseProperties();
properties.remove("apiUrl");

PropertySpecValidator.ValidationResult result = validator.validate(properties);
Assertions.assertFalse(result.isValid());
Assertions.assertFalse(result.getErrors().isEmpty());

String errorMessage = result.getErrorMessage();
Assertions.assertTrue(errorMessage.contains("apiUrl"));
}

@Test
public void testValidateOneOfViolation()
public void testValidateOneOfViolation()
{
properties.put("apiUrl", "https://api.example.com");
properties = validBaseProperties();
// Provide two auth methods (violates ONE_OF)
properties.put("username", "user123");
properties.put("apiKey", "key456");
properties.put("host", "localhost");
properties.put("port", "5432");
properties.put("database", "mydb");
properties.put("email", "test@example.com");


PropertySpecValidator.ValidationResult result = validator.validate(properties);
Assertions.assertFalse(result.isValid());

String errorMessage = result.getErrorMessage();
Assertions.assertTrue(errorMessage.contains("auth"));
Assertions.assertTrue(errorMessage.contains("exactly one"));
}

@Test
public void testValidateAllRequiredViolation()
public void testValidateAllRequiredViolation()
{
properties.put("apiUrl", "https://api.example.com");
properties.put("username", "user123");
// Missing some database properties (violates ALL_REQUIRED)
properties.put("host", "localhost");
properties.put("port", "5432");
// missing 'database'
properties.put("email", "test@example.com");

properties = validBaseProperties();
// Remove one database property (violates ALL_REQUIRED)
properties.remove("database");

PropertySpecValidator.ValidationResult result = validator.validate(properties);
Assertions.assertFalse(result.isValid());

String errorMessage = result.getErrorMessage();
Assertions.assertTrue(errorMessage.contains("database"));
Assertions.assertTrue(errorMessage.contains("all"));
}

@Test
public void testValidateAtLeastOneViolation()
public void testValidateAtLeastOneViolation()
{
properties.put("apiUrl", "https://api.example.com");
properties.put("username", "user123");
properties.put("host", "localhost");
properties.put("port", "5432");
properties.put("database", "mydb");
// No contact method provided (violates AT_LEAST_ONE)

properties = validBaseProperties();
// Remove contact method (violates AT_LEAST_ONE)
properties.remove("email");

PropertySpecValidator.ValidationResult result = validator.validate(properties);
Assertions.assertFalse(result.isValid());

String errorMessage = result.getErrorMessage();
Assertions.assertTrue(errorMessage.contains("contact"));
Assertions.assertTrue(errorMessage.contains("at least one"));
}

@Test
public void testValidateAllOrNoneViolation()
public void testValidateAllOrNoneViolation()
{
properties.put("apiUrl", "https://api.example.com");
properties.put("username", "user123");
properties.put("host", "localhost");
properties.put("port", "5432");
properties.put("database", "mydb");
properties.put("email", "test@example.com");
properties = validBaseProperties();
// Only partial proxy settings (violates ALL_OR_NONE)
properties.put("proxyHost", "proxy.example.com");
// missing proxyPort


PropertySpecValidator.ValidationResult result = validator.validate(properties);
Assertions.assertFalse(result.isValid());

String errorMessage = result.getErrorMessage();
Assertions.assertTrue(errorMessage.contains("proxy"));
Assertions.assertTrue(errorMessage.contains("all or none"));
Expand Down Expand Up @@ -337,49 +328,41 @@ public void testGetGroupsForProperty()
}

@Test
public void testIsMissingPropertyViolatingRequirements()
public void testIsMissingPropertyViolatingRequirements()
{
// Set up some valid properties
properties.put("apiUrl", "https://api.example.com");
properties.put("username", "user123");
properties.put("host", "localhost");
properties.put("port", "5432");
properties.put("database", "mydb");
properties.put("email", "test@example.com");

properties = validBaseProperties();

// Test missing required property - should violate
Assertions.assertTrue(validator.isMissingPropertyViolatingRequirements("apiUrl", new HashMap<>()));

// Test property with value - should not violate
Assertions.assertFalse(validator.isMissingPropertyViolatingRequirements("apiUrl", properties));

// Test missing property in satisfied ONE_OF group - should not violate
Assertions.assertFalse(validator.isMissingPropertyViolatingRequirements("apiKey", properties));

// Test missing property in unsatisfied ALL_REQUIRED group - should violate
Map<String, String> partialProps = new HashMap<>();
partialProps.put("host", "localhost");
// missing port and database
Assertions.assertTrue(validator.isMissingPropertyViolatingRequirements("port", partialProps));

// Test optional property - should not violate
Assertions.assertFalse(validator.isMissingPropertyViolatingRequirements("optional", properties));
}

@Test
public void testStaticValidateClass()
public void testStaticValidateClass()
{
Map<String, String> props = new HashMap<>();
props.put("apiUrl", "https://api.example.com");
Map<String, String> props = validBaseProperties();
// Use different valid choices to verify alternatives work
props.remove("username");
props.put("apiKey", "key123");
props.put("host", "localhost");
props.put("port", "5432");
props.put("database", "mydb");
props.remove("email");
props.put("phone", "555-1234");
PropertySpecValidator.ValidationResult result =

PropertySpecValidator.ValidationResult result =
PropertySpecValidator.validateClass(TestAlgorithm.class, props);

Assertions.assertTrue(result.isValid());
}

Expand Down Expand Up @@ -545,4 +528,4 @@ public void testMultipleGroupsOfSameType()
Assertions.assertFalse(result.isValid());
Assertions.assertTrue(result.getErrorMessage().contains("databaseSettings"));
}
}
}