Spring Feature Variants Validation

libraryValidations/Spring/validation-tests/src/test/java/com/microsoft/validation_tests/BasicVariantTests.java

@@ -0,0 +1,24 @@
+package com.microsoft.validation_tests;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+@SpringJUnitConfig
+@TestPropertySource(locations = "file:./../../../Samples/BasicVariant.sample.json", factory = YamlPropertySourceFactory.class)
+@SpringBootTest(classes = { SpringBootTest.class, Filters.class })
+@EnableConfigurationProperties
+@ComponentScan(basePackages = { "com.azure.spring.cloud.feature.management" })
+class BasicVariantTests extends ValidationTestsApplicationTests {  
+
+    @Test
+    void validateTest() throws IOException {
+        runTests("BasicVariant");
+    }
+
+}

libraryValidations/Spring/validation-tests/src/test/java/com/microsoft/validation_tests/NoFiltersTests.java

@@ -6,7 +6,6 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
@@ -15,7 +14,6 @@
 @SpringBootTest(classes = { SpringBootTest.class, Filters.class })
 @EnableConfigurationProperties
 @ComponentScan(basePackages = { "com.azure.spring.cloud.feature.management" })
-@ActiveProfiles("override")
 class NoFiltersTests extends ValidationTestsApplicationTests {  
 
     @Test

libraryValidations/Spring/validation-tests/src/test/java/com/microsoft/validation_tests/RequirementTypeTests.java

@@ -6,7 +6,6 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
@@ -15,7 +14,6 @@
 @SpringBootTest(classes = { SpringBootTest.class, Filters.class })
 @EnableConfigurationProperties
 @ComponentScan(basePackages = { "com.azure.spring.cloud.feature.management" })
-@ActiveProfiles("requirementType")
 class RequirementTypeTests extends ValidationTestsApplicationTests {
 
     @Test

libraryValidations/Spring/validation-tests/src/test/java/com/microsoft/validation_tests/TargetingFilterModifiedTests.java

@@ -0,0 +1,24 @@
+package com.microsoft.validation_tests;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+@SpringJUnitConfig
+@TestPropertySource(locations = "file:./../../../Samples/TargetingFilter.modified.sample.json", factory = YamlPropertySourceFactory.class)
+@SpringBootTest(classes = { SpringBootTest.class, Filters.class })
+@EnableConfigurationProperties
+@ComponentScan(basePackages = { "com.azure.spring.cloud.feature.management" })
+class TargetingFilterModifiedTests extends ValidationTestsApplicationTests {
+
+    @Test
+    void validateTest() throws IOException {
+        runTests("TargetingFilter.modified");
+    }
+
+}

libraryValidations/Spring/validation-tests/src/test/java/com/microsoft/validation_tests/TargetingFilterTests.java

@@ -2,12 +2,10 @@
 
 import java.io.IOException;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
@@ -16,11 +14,9 @@
 @SpringBootTest(classes = { SpringBootTest.class, Filters.class })
 @EnableConfigurationProperties
 @ComponentScan(basePackages = { "com.azure.spring.cloud.feature.management" })
-@ActiveProfiles("TargetingFilter")
 class TargetingFilterTests extends ValidationTestsApplicationTests {
 
     @Test
-    @Disabled("Wrong Endian used.")
     void validateTest() throws IOException {
         runTests("TargetingFilter");
     }

libraryValidations/Spring/validation-tests/src/test/java/com/microsoft/validation_tests/TimeWindowFilterTests.java

@@ -6,7 +6,6 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
@@ -15,7 +14,6 @@
 @SpringBootTest(classes = { SpringBootTest.class, Filters.class })
 @EnableConfigurationProperties
 @ComponentScan(basePackages = { "com.azure.spring.cloud.feature.management" })
-@ActiveProfiles("TimeWindowFilter")
 class TimeWindowFilterTests extends ValidationTestsApplicationTests {
 
     @Test

libraryValidations/Spring/validation-tests/src/test/java/com/microsoft/validation_tests/ValidationTestsApplicationTests.java

@@ -1,6 +1,7 @@
 package com.microsoft.validation_tests;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.io.File;
 import java.io.IOException;
@@ -13,12 +14,14 @@
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.azure.spring.cloud.feature.management.FeatureManager;
+import com.azure.spring.cloud.feature.management.models.Variant;
+import com.azure.spring.cloud.feature.management.validation_tests.models.ValidationTestCase;
+import com.azure.spring.cloud.feature.management.validation_tests.models.VariantResult;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.type.CollectionType;
 import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.microsoft.validation_tests.models.ValidationTestCase;
 
 class ValidationTestsApplicationTests {
 
@@ -37,7 +40,6 @@ class ValidationTestsApplicationTests {
 
     @Autowired
     private FeatureManager featureManager;
-
     @Autowired
     private TargetingFilterTestContextAccessor accessor;
 
@@ -62,7 +64,19 @@ void runTests(String name) throws IOException {
             }
 
             final Boolean result = featureManager.isEnabled(testCase.getFeatureFlagName());
-            assertEquals(testCase.getIsEnabled().getResult(), result.toString(), testCase.getFeatureFlagName());
+            assertEquals(testCase.getIsEnabled().getResult(), result.toString(), testCase.getFriendlyName());
+
+            VariantResult variantResult = testCase.getVariant();
+
+            if (variantResult != null && variantResult.getResult() != null && testCase.getVariant() != null) {
+                final Variant getVariantResult = featureManager.getVariant(testCase.getFeatureFlagName());
+                if (variantResult.getResult().getName() != null) {
+                    assertEquals(variantResult.getResult().getName(), getVariantResult.getName());
+                }
+                assertEquals(variantResult.getResult().getConfigurationValue(), getVariantResult.getValue());
+
+            }
+
         }
     }
 

libraryValidations/Spring/validation-tests/src/test/java/com/microsoft/validation_tests/VariantAssignmentTests.java

@@ -0,0 +1,24 @@
+package com.microsoft.validation_tests;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+@SpringJUnitConfig
+@TestPropertySource(locations = "file:./../../../Samples/VariantAssignment.sample.json", factory = YamlPropertySourceFactory.class)
+@SpringBootTest(classes = { SpringBootTest.class, Filters.class })
+@EnableConfigurationProperties
+@ComponentScan(basePackages = { "com.azure.spring.cloud.feature.management" })
+class VariantAssignmentTests extends ValidationTestsApplicationTests {
+
+    @Test
+    void validateTest() throws IOException {
+        runTests("VariantAssignment");
+    }
+
+}