From 523a96751cd2954f6de7d5ec72def6a8e0074470 Mon Sep 17 00:00:00 2001 From: Stanislav Demchenko Date: Mon, 18 Dec 2017 15:08:34 +0200 Subject: [PATCH 1/2] Updated mediator version to 1.+ because mediator 1.0.1 is not in Maven Central, and therefore cannot be transitevely fetched via gold. With this change, the latest version on gold will transitively pull the latest mediator. --- build.gradle | 11 ++++++++- .../shield/dynamic/ApplicationTestConfig.java | 2 ++ .../nfl/dm/shield/dynamic/BaseBeanTest.java | 6 +++-- .../referencedby/ReferencedByTest.java | 3 --- .../InstanceMutatorPermissionsTest.java | 9 +++---- .../dynamic/security/NameSpaceTest.java | 3 --- .../dynamic/service/ConstraintTest.java | 7 +----- .../dynamic/service/DepthCheckSelfTest.java | 3 --- .../dynamic/service/DepthCheckTest.java | 7 ++---- .../dynamic/service/EnclosedValueTest.java | 3 --- .../service/ExternalReferenceArrayTest.java | 3 --- .../service/ExternalReferenceTest.java | 3 --- .../dynamic/service/FindSchemaTest.java | 3 --- .../service/GraphQLInstanceServiceTest.java | 9 +++---- .../service/GraphQLSchemaRelationTest.java | 5 +--- .../service/GraphQLSchemaServiceTest.java | 3 --- .../dynamic/service/InstanceRelationTest.java | 13 ++++------ .../service/MemberConfigurationTest.java | 3 --- .../MemberFieldNameValidationTest.java | 3 --- .../MultiTypeDynamicReferenceTest.java | 24 +++++++++---------- .../MultipleIDFetchingInstanceTest.java | 3 --- .../dynamic/service/MutualReferenceTest.java | 7 ++---- .../shield/dynamic/service/OrderByTest.java | 10 ++++---- .../dynamic/service/PaginationTest.java | 7 +++--- .../dynamic/service/PaintSchemaTest.java | 3 --- .../ReservedKeywordValidationTest.java | 7 ++---- .../service/SchemaDefinitionCacheTest.java | 9 +++---- .../SchemaDescriptionNameValidationTest.java | 7 +----- 28 files changed, 58 insertions(+), 118 deletions(-) diff --git a/build.gradle b/build.gradle index e0c0105..240f8be 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ dependencies { compile 'org.springframework:spring-web:4.3.13.RELEASE' compile 'com.graphql-java:graphql-java:4.2' - compile 'com.nfl.graphql:mediator:1.0.1' + compile 'com.nfl.graphql:mediator:1.+' testCompile('org.testng:testng:6.13.1') testCompile('org.codehaus.groovy:groovy-all:2.4.4') @@ -79,6 +79,9 @@ publishing { artifact javadocJar { classifier "javadoc" } + artifact testJar { + classifier "tests" + } pom.withXml { asNode().children().last() + { @@ -156,9 +159,15 @@ task javadocJar(type: Jar, dependsOn: javadoc) { from javadoc.destinationDir } +task testJar(type: Jar) { + classifier = 'tests' + from sourceSets.test.output+sourceSets.test.allSource +} + artifacts { archives sourcesJar archives javadocJar + archives testJar } jar { diff --git a/src/test/java/com/nfl/dm/shield/dynamic/ApplicationTestConfig.java b/src/test/java/com/nfl/dm/shield/dynamic/ApplicationTestConfig.java index 3bf991c..a8a0eee 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/ApplicationTestConfig.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/ApplicationTestConfig.java @@ -4,8 +4,10 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; +import org.springframework.context.annotation.Profile; @Configuration +@Profile("gold_test") @ComponentScan(basePackages = {"com.nfl.dm.shield.dynamic"}, excludeFilters = { @ComponentScan.Filter(value = { diff --git a/src/test/java/com/nfl/dm/shield/dynamic/BaseBeanTest.java b/src/test/java/com/nfl/dm/shield/dynamic/BaseBeanTest.java index 9ea2956..82eb8df 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/BaseBeanTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/BaseBeanTest.java @@ -11,6 +11,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; +import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.testng.AbstractTestNGSpringContextTests; import org.testng.Assert; @@ -24,6 +25,7 @@ @ContextConfiguration(classes = ApplicationTestConfig.class) +@ActiveProfiles("gold_test") public abstract class BaseBeanTest extends AbstractTestNGSpringContextTests { private final Logger log = LoggerFactory.getLogger(getClass()); @@ -100,13 +102,13 @@ protected void assertResult(GraphQLResult actual, String expectedData) { } } - protected void assertSuccess(GraphQLResult actual) throws Exception { + protected void assertSuccess(GraphQLResult actual) { Assert.assertNotNull(actual, "Actual GraphQLResult should not be null."); Assert.assertTrue(actual.isSuccessful()); } - protected GraphQLResult executeSchemaQuery(String query) throws Exception { + protected GraphQLResult executeSchemaQuery(String query) { GraphQLResult graphQLResult = schemaService.executeQuery(query, buildSchemaVariableMap(), buildSchemaWriteAccess()); if (log.isDebugEnabled()) { diff --git a/src/test/java/com/nfl/dm/shield/dynamic/referencedby/ReferencedByTest.java b/src/test/java/com/nfl/dm/shield/dynamic/referencedby/ReferencedByTest.java index 133d324..bc7af35 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/referencedby/ReferencedByTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/referencedby/ReferencedByTest.java @@ -1,6 +1,5 @@ package com.nfl.dm.shield.dynamic.referencedby; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.BaseBeanTest; import com.nfl.dm.shield.dynamic.security.SchemaWriteAccess; import com.nfl.dm.shield.dynamic.service.CacheService; @@ -10,7 +9,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -21,7 +19,6 @@ @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class ReferencedByTest extends BaseBeanTest { // Variables to contain queries for the Schema Definitions used for the tests private final String videoSchema; diff --git a/src/test/java/com/nfl/dm/shield/dynamic/security/InstanceMutatorPermissionsTest.java b/src/test/java/com/nfl/dm/shield/dynamic/security/InstanceMutatorPermissionsTest.java index fde0710..4b50714 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/security/InstanceMutatorPermissionsTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/security/InstanceMutatorPermissionsTest.java @@ -1,6 +1,5 @@ package com.nfl.dm.shield.dynamic.security; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.BaseBeanTest; import com.nfl.dm.shield.dynamic.exception.UnauthorizedException; import com.nfl.dm.shield.dynamic.service.GraphQLInstanceService; @@ -8,7 +7,6 @@ import com.nfl.dm.shield.dynamic.service.GraphQLSchemaService; import graphql.ExceptionWhileDataFetching; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -18,7 +16,6 @@ import static org.testng.Assert.*; @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class InstanceMutatorPermissionsTest extends BaseBeanTest { private static final String PAINT_SCHEMA_NAME = "Paint"; @@ -103,7 +100,7 @@ public void truncatePerm() { } @Test - public void removeExistingPaintInstanceWithoutPermissions() throws Exception { + public void removeExistingPaintInstanceWithoutPermissions() { SchemaWriteAccess perms = new SchemaWriteAccess(); perms.addPermission(SCHEMA_NAME_SPACE, SchemaWriteAccess.SCHEMA_MODIFY); perms.addPermission(MUTATOR_NAME_SPACE, SchemaWriteAccess.INSTANCE_MODIFY); @@ -125,7 +122,7 @@ public void removeExistingPaintInstanceWithoutPermissions() throws Exception { } @Test - public void upsertPaintInstanceWithoutPermissions() throws Exception { + public void upsertPaintInstanceWithoutPermissions() { SchemaWriteAccess perms = new SchemaWriteAccess(); perms.addPermission(SCHEMA_NAME_SPACE, SchemaWriteAccess.SCHEMA_MODIFY); @@ -143,7 +140,7 @@ public void upsertPaintInstanceWithoutPermissions() throws Exception { } @Test - public void removeAllPaintInstancesWithoutPetitions() throws Exception { + public void removeAllPaintInstancesWithoutPetitions() { SchemaWriteAccess perms = new SchemaWriteAccess(); perms.addPermission(SCHEMA_NAME_SPACE, SchemaWriteAccess.SCHEMA_MODIFY); perms.addPermission(MUTATOR_NAME_SPACE, SchemaWriteAccess.INSTANCE_MODIFY); diff --git a/src/test/java/com/nfl/dm/shield/dynamic/security/NameSpaceTest.java b/src/test/java/com/nfl/dm/shield/dynamic/security/NameSpaceTest.java index 353e8a4..85a349d 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/security/NameSpaceTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/security/NameSpaceTest.java @@ -1,12 +1,10 @@ package com.nfl.dm.shield.dynamic.security; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.BaseBeanTest; import com.nfl.dm.shield.dynamic.service.GraphQLInstanceService; import com.nfl.dm.shield.dynamic.service.GraphQLResult; import com.nfl.dm.shield.dynamic.service.GraphQLSchemaService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -16,7 +14,6 @@ import static org.testng.Assert.assertTrue; @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class NameSpaceTest extends BaseBeanTest { private static final String PAINT_SCHEMA_NAME = "Paint"; diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/ConstraintTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/ConstraintTest.java index 7265057..a03a7f5 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/ConstraintTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/ConstraintTest.java @@ -1,18 +1,13 @@ package com.nfl.dm.shield.dynamic.service; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.InstanceBaseBeanTest; import com.nfl.dm.shield.dynamic.security.SchemaWriteAccess; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; +import static org.testng.Assert.*; @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class ConstraintTest extends InstanceBaseBeanTest { @Autowired diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/DepthCheckSelfTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/DepthCheckSelfTest.java index 82ccb0f..54b6cf1 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/DepthCheckSelfTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/DepthCheckSelfTest.java @@ -1,10 +1,8 @@ package com.nfl.dm.shield.dynamic.service; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.BaseBeanTest; import com.nfl.dm.shield.dynamic.security.SchemaWriteAccess; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -15,7 +13,6 @@ import static org.testng.Assert.assertTrue; @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class DepthCheckSelfTest extends BaseBeanTest { private static final String SCHEMA_NAME = "Deep_Thought"; diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/DepthCheckTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/DepthCheckTest.java index feff811..0cbdbba 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/DepthCheckTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/DepthCheckTest.java @@ -1,21 +1,18 @@ package com.nfl.dm.shield.dynamic.service; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.BaseBeanTest; import com.nfl.dm.shield.dynamic.security.SchemaWriteAccess; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - import java.util.Map; -import static org.testng.Assert.*; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class DepthCheckTest extends BaseBeanTest { private static final String SCHEMA_NAME = "Depth_Check_First"; diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/EnclosedValueTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/EnclosedValueTest.java index 2a52673..8fc05b5 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/EnclosedValueTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/EnclosedValueTest.java @@ -1,9 +1,7 @@ package com.nfl.dm.shield.dynamic.service; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.BaseBeanTest; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -13,7 +11,6 @@ @SuppressWarnings("unused") @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class EnclosedValueTest extends BaseBeanTest { diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/ExternalReferenceArrayTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/ExternalReferenceArrayTest.java index c2458d4..8e08e81 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/ExternalReferenceArrayTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/ExternalReferenceArrayTest.java @@ -1,11 +1,8 @@ package com.nfl.dm.shield.dynamic.service; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.Test; @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class ExternalReferenceArrayTest extends BaseExternalReferenceTest { private static final String SIMON = "Simon"; diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/ExternalReferenceTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/ExternalReferenceTest.java index 64feab8..f2a0b1e 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/ExternalReferenceTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/ExternalReferenceTest.java @@ -1,13 +1,10 @@ package com.nfl.dm.shield.dynamic.service; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.Test; import static org.testng.Assert.assertFalse; @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class ExternalReferenceTest extends BaseExternalReferenceTest { private static final String SIMON = "Simon"; diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/FindSchemaTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/FindSchemaTest.java index fd238ac..36bdd67 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/FindSchemaTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/FindSchemaTest.java @@ -1,10 +1,8 @@ package com.nfl.dm.shield.dynamic.service; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.InstanceBaseBeanTest; import org.skyscreamer.jsonassert.JSONAssert; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.Test; import java.util.Map; @@ -12,7 +10,6 @@ import static org.testng.Assert.*; @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class FindSchemaTest extends InstanceBaseBeanTest { @Autowired diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/GraphQLInstanceServiceTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/GraphQLInstanceServiceTest.java index eb6de59..c5117cc 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/GraphQLInstanceServiceTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/GraphQLInstanceServiceTest.java @@ -2,12 +2,10 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.InstanceBaseBeanTest; import com.nfl.dm.shield.dynamic.security.SchemaWriteAccess; import graphql.ErrorType; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.Test; import java.time.Instant; @@ -20,7 +18,6 @@ @SuppressWarnings("unused") @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class GraphQLInstanceServiceTest extends InstanceBaseBeanTest { private static final Map VARIABLE_MAP = buildVariableMap(INSTANCE_NAME_SPACE, JOHN_CARTER_SCHEMA); @@ -120,7 +117,7 @@ private void addInstance(String query, String expectedResult) { assertEquals(result.getData().toString(), expectedResult); } - public void instanceCanReferArrayOfInstancesOfTheSameType() throws Exception { + public void instanceCanReferArrayOfInstancesOfTheSameType() { addInstance(addJohnCarterInstance, addJohnCarterInstanceResults); addInstance(addJohnCarterInstanceReferringJohnCarter, viewJohnCarterInstanceReferringJohnCarter); } @@ -228,14 +225,14 @@ public void deleteAllInstances() { addInstance("mutation { removeAllInstances { count }}", "{removeAllInstances={count=1}}"); } - public void findSchemaInstanceWithSchemaInstanceKey() throws Exception{ + public void findSchemaInstanceWithSchemaInstanceKey() { GraphQLResult result = instanceService.executeQuery(viewSkibobWithSchemaInstanceKey, buildVariableMap("skibob"), buildSchemaWriteAccess(), DEFAULT_MAX_RECURSE_DEPTH); assertTrue(result.isSuccessful()); assertEquals(result.getData().toString(), viewSkibobWithSchemaInstanceKeyResult); } - public void testUpdatedDate() throws Exception { + public void testUpdatedDate() { String baldy = "{viewer={instances={edges=[{node={id=ski_ski_ski, resort=baldy}}]}}}"; Map variableMap = buildVariableMap("skibob"); diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/GraphQLSchemaRelationTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/GraphQLSchemaRelationTest.java index f2d4908..73721cc 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/GraphQLSchemaRelationTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/GraphQLSchemaRelationTest.java @@ -1,10 +1,8 @@ package com.nfl.dm.shield.dynamic.service; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.BaseBeanTest; import com.nfl.dm.shield.dynamic.domain.schema.SchemaDescription; import graphql.ErrorType; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -13,7 +11,6 @@ import static org.testng.Assert.*; -@ContextConfiguration(classes = ApplicationTestConfig.class) public class GraphQLSchemaRelationTest extends BaseBeanTest { private final String addElementSchemaOne; @@ -199,7 +196,7 @@ private SchemaDescription buildSchemaDescriptionForSearch(String name) { } @AfterMethod - public void tearDown() throws Exception { + public void tearDown() { inMemorySchemaRepository.clearForSchemaTesting(); } } \ No newline at end of file diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/GraphQLSchemaServiceTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/GraphQLSchemaServiceTest.java index 792ad49..4873b45 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/GraphQLSchemaServiceTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/GraphQLSchemaServiceTest.java @@ -1,11 +1,9 @@ package com.nfl.dm.shield.dynamic.service; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.BaseBeanTest; import com.nfl.dm.shield.dynamic.security.SchemaWriteAccess; import graphql.ExceptionWhileDataFetching; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -16,7 +14,6 @@ @SuppressWarnings("unused") @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class GraphQLSchemaServiceTest extends BaseBeanTest { @Autowired diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/InstanceRelationTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/InstanceRelationTest.java index a0dbb03..b8fdb59 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/InstanceRelationTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/InstanceRelationTest.java @@ -1,15 +1,12 @@ package com.nfl.dm.shield.dynamic.service; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.BaseBeanTest; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.*; import java.util.Map; @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class InstanceRelationTest extends BaseBeanTest { private final String addPalette; @@ -51,7 +48,7 @@ public void setUp() throws Exception { } @BeforeMethod - public void addRedGreenBlueColorInstances() throws Exception { + public void addRedGreenBlueColorInstances() { instanceQuery(COLOR, addRedColorInstance, "{upsertSchemaInstance={id=red, name=Red color}}"); @@ -63,7 +60,7 @@ public void addRedGreenBlueColorInstances() throws Exception { "{upsertSchemaInstance={id=blue, name=Blue color}}"); } - public void deleteRedColorInstance() throws Exception { + public void deleteRedColorInstance() { instanceQuery(PALETTE, addRedGreenRedPaletteInstance, "{upsertSchemaInstance={id=rgr, name=Red Green Red, colors=[{id=red}, {id=green}, {id=red}]}}"); @@ -74,7 +71,7 @@ public void deleteRedColorInstance() throws Exception { "{viewer={instances={edges=[{node={id=rgr, colors=[{id=green}]}}]}}}"); } - public void deleteGreenColorInstance() throws Exception { + public void deleteGreenColorInstance() { instanceQuery(PALETTE, addRedGreenRedPaletteInstance, "{upsertSchemaInstance={id=rgr, name=Red Green Red, colors=[{id=red}, {id=green}, {id=red}]}}"); @@ -85,7 +82,7 @@ public void deleteGreenColorInstance() throws Exception { "{viewer={instances={edges=[{node={id=rgr, colors=[{id=red}, {id=red}]}}]}}}"); } - public void reductionPaletteColorsToEmptyInNaturalOrder() throws Exception { + public void reductionPaletteColorsToEmptyInNaturalOrder() { instanceQuery(PALETTE, addRedGreenBluePaletteInstance, "{upsertSchemaInstance={id=rgb, name=Red Green Blue, colors=[{id=red}, {id=green}, {id=blue}]}}"); @@ -108,7 +105,7 @@ public void reductionPaletteColorsToEmptyInNaturalOrder() throws Exception { "{viewer={instances={edges=[{node={id=rgb, colors=[]}}]}}}"); } - public void reductionPaletteColorsToEmptyInOppositeOrder() throws Exception { + public void reductionPaletteColorsToEmptyInOppositeOrder() { instanceQuery(PALETTE, addRedGreenBluePaletteInstance, "{upsertSchemaInstance={id=rgb, name=Red Green Blue, colors=[{id=red}, {id=green}, {id=blue}]}}"); diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/MemberConfigurationTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/MemberConfigurationTest.java index 2fa5cd0..306694c 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/MemberConfigurationTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/MemberConfigurationTest.java @@ -1,11 +1,9 @@ package com.nfl.dm.shield.dynamic.service; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.BaseBeanTest; import com.nfl.dm.shield.dynamic.security.SchemaWriteAccess; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; @@ -13,7 +11,6 @@ @SuppressWarnings("unused") @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class MemberConfigurationTest extends BaseBeanTest { private final String addSkiBobWithMemberConfiguration; diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/MemberFieldNameValidationTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/MemberFieldNameValidationTest.java index a565c6c..136568c 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/MemberFieldNameValidationTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/MemberFieldNameValidationTest.java @@ -1,9 +1,7 @@ package com.nfl.dm.shield.dynamic.service; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.BaseBeanTest; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; @@ -11,7 +9,6 @@ import static org.testng.Assert.assertFalse; @Test -@ContextConfiguration(classes = ApplicationTestConfig.class) public class MemberFieldNameValidationTest extends BaseBeanTest { private final String withEmptyMemberFieldName; private final String withEmptyMemberFieldNameResult; diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/MultiTypeDynamicReferenceTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/MultiTypeDynamicReferenceTest.java index 68e2ecc..0241f5f 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/MultiTypeDynamicReferenceTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/MultiTypeDynamicReferenceTest.java @@ -1,18 +1,16 @@ package com.nfl.dm.shield.dynamic.service; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.BaseBeanTest; import com.nfl.dm.shield.dynamic.security.SchemaWriteAccess; import graphql.ErrorType; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.*; import java.util.Map; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class MultiTypeDynamicReferenceTest extends BaseBeanTest { @Autowired @@ -86,7 +84,7 @@ public MultiTypeDynamicReferenceTest() { } @BeforeClass - private void setupSchemas() throws Exception { + private void setupSchemas() { Map schemaVariableMap = buildSchemaVariableMap(); GraphQLResult result; result = schemaService.executeQuery(addPhoto, schemaVariableMap, writeAccess); @@ -106,7 +104,7 @@ private void setupSchemas() throws Exception { } @BeforeMethod - private void setupInstances() throws Exception { + private void setupInstances() { GraphQLResult result; result = upsert(DOG, addDogInstance); @@ -120,13 +118,13 @@ private void setupInstances() throws Exception { } @Test - public void addMediaInstanceWithPhotoReference() throws Exception { + public void addMediaInstanceWithPhotoReference() { GraphQLResult result = upsert(MEDIA, addPhotoMediaInstance); assertResult(result, addMediaInstanceResult); } @Test - public void addPhotoMediaInstanceAndThenReplaceItToVideo() throws Exception { + public void addPhotoMediaInstanceAndThenReplaceItToVideo() { GraphQLResult result = upsert(MEDIA, addPhotoMediaInstance); assertResult(result, addMediaInstanceResult); @@ -136,13 +134,13 @@ public void addPhotoMediaInstanceAndThenReplaceItToVideo() throws Exception { } @Test - public void addLibraryInstanceWhichStoresPhotoAndVideos() throws Exception { + public void addLibraryInstanceWhichStoresPhotoAndVideos() { GraphQLResult result = upsert(LIBRARY, addLibraryInstance); assertResult(result, addLibraryInstanceResult); } @Test - public void removeVideoFromLibrary() throws Exception { + public void removeVideoFromLibrary() { GraphQLResult result = upsert(LIBRARY, addLibraryInstance); assertResult(result, addLibraryInstanceResult); @@ -154,13 +152,13 @@ public void removeVideoFromLibrary() throws Exception { } @Test - public void addMediaInstanceWithBadReference() throws Exception { + public void addMediaInstanceWithBadReference() { GraphQLResult result = upsert(MEDIA, addBadMediaRef); assertResult(result, addBadMediaRefResult); } @Test - public void addMediaInstanceWithWrongTypeDefinition() throws Exception { + public void addMediaInstanceWithWrongTypeDefinition() { GraphQLResult result = upsert(MEDIA, mediaInstanceWithWrongType); assertFalse(result.isSuccessful()); @@ -181,7 +179,7 @@ public void clearInstanceRepo() { @AfterClass - public void tearDown() throws Exception { + public void tearDown() { inMemorySchemaRepository.clearForSchemaTesting(); } } \ No newline at end of file diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/MultipleIDFetchingInstanceTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/MultipleIDFetchingInstanceTest.java index 7fa7ac3..df15892 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/MultipleIDFetchingInstanceTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/MultipleIDFetchingInstanceTest.java @@ -1,16 +1,13 @@ package com.nfl.dm.shield.dynamic.service; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.InstanceBaseBeanTest; import com.nfl.dm.shield.dynamic.security.SchemaWriteAccess; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.Test; import static org.testng.Assert.*; @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class MultipleIDFetchingInstanceTest extends InstanceBaseBeanTest { @Autowired diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/MutualReferenceTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/MutualReferenceTest.java index e6d593f..d71b16b 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/MutualReferenceTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/MutualReferenceTest.java @@ -1,19 +1,16 @@ package com.nfl.dm.shield.dynamic.service; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.InstanceBaseBeanTest; import com.nfl.dm.shield.dynamic.security.SchemaWriteAccess; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.Test; import java.util.Map; -import static org.testng.Assert.*; +import static org.testng.Assert.assertTrue; @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) -public class MutualReferenceTest extends InstanceBaseBeanTest { +public class MutualReferenceTest extends InstanceBaseBeanTest { @SuppressWarnings("SpringJavaAutowiredMembersInspection") @Autowired diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/OrderByTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/OrderByTest.java index 0f06396..1c7504f 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/OrderByTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/OrderByTest.java @@ -3,27 +3,27 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.jayway.jsonpath.JsonPath; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.BaseBeanTest; import com.nfl.dm.shield.dynamic.domain.instance.OrderBy; import com.nfl.dm.shield.dynamic.domain.instance.OrderByDirection; import graphql.schema.CoercingParseValueException; import net.minidev.json.JSONArray; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import java.util.*; +import java.util.HashSet; +import java.util.List; +import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import static java.util.Arrays.asList; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class OrderByTest extends BaseBeanTest { private static final String ORDERED_TYPE_NAME = "ordered"; diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/PaginationTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/PaginationTest.java index 0a667f9..cada5b6 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/PaginationTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/PaginationTest.java @@ -2,13 +2,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.jayway.jsonpath.JsonPath; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.BaseBeanTest; import com.nfl.dm.shield.dynamic.security.SchemaWriteAccess; import net.minidev.json.JSONArray; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.testng.annotations.*; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; import java.util.List; import java.util.Map; @@ -17,7 +17,6 @@ import static org.testng.Assert.*; @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class PaginationTest extends BaseBeanTest { private static final String PAGED_TYPE_NAME = "paged"; diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/PaintSchemaTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/PaintSchemaTest.java index 997b79b..98dc676 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/PaintSchemaTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/PaintSchemaTest.java @@ -1,10 +1,8 @@ package com.nfl.dm.shield.dynamic.service; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.BaseBeanTest; import com.nfl.dm.shield.dynamic.security.SchemaWriteAccess; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -15,7 +13,6 @@ @SuppressWarnings("WeakerAccess") @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class PaintSchemaTest extends BaseBeanTest { private static final String PAINT_SCHEMA_NAME = "Paint"; diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/ReservedKeywordValidationTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/ReservedKeywordValidationTest.java index 337cb81..0344ba9 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/ReservedKeywordValidationTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/ReservedKeywordValidationTest.java @@ -1,9 +1,7 @@ package com.nfl.dm.shield.dynamic.service; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.BaseBeanTest; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; @@ -11,7 +9,6 @@ import static org.testng.Assert.assertFalse; @Test -@ContextConfiguration(classes = ApplicationTestConfig.class) public class ReservedKeywordValidationTest extends BaseBeanTest { private final String userReservedKeywordErrorResult; @@ -27,7 +24,7 @@ public ReservedKeywordValidationTest() { userReservedKeywordErrorResult = loadFromFile("graphql/validation/add_schema_with_reserved_field_name_result.txt"); } - public void shouldNotCreateSchemaWithDomainFieldNameId() throws Exception { + public void shouldNotCreateSchemaWithDomainFieldNameId() { GraphQLResult result = schemaService.executeQuery(withIdFieldName, buildSchemaVariableMap(), buildSchemaWriteAccess()); @@ -35,7 +32,7 @@ public void shouldNotCreateSchemaWithDomainFieldNameId() throws Exception { assertEquals(result.getErrors().get(0).getMessage(), userReservedKeywordErrorResult); } - public void shouldNotCreateSchemaWithDomainFieldNameReferencedByKeyword() throws Exception { + public void shouldNotCreateSchemaWithDomainFieldNameReferencedByKeyword() { GraphQLResult result = schemaService.executeQuery(withReferencedBy, buildSchemaVariableMap(), buildSchemaWriteAccess()); diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/SchemaDefinitionCacheTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/SchemaDefinitionCacheTest.java index de0a66d..f68ef56 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/SchemaDefinitionCacheTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/SchemaDefinitionCacheTest.java @@ -1,15 +1,13 @@ package com.nfl.dm.shield.dynamic.service; import com.google.common.cache.Cache; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.BaseBeanTest; import com.nfl.dm.shield.dynamic.domain.schema.SchemaKey; import com.nfl.dm.shield.dynamic.security.SchemaWriteAccess; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; - -import org.springframework.test.context.TestPropertySource; -import org.testng.annotations.*; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; import java.util.Map; import java.util.Set; @@ -17,7 +15,6 @@ import static org.testng.Assert.*; @Test -@ContextConfiguration(classes = {ApplicationTestConfig.class}) public class SchemaDefinitionCacheTest extends BaseBeanTest { // Variables to contain queries for the Schema Definitions used for the tests private final String videoSchema; diff --git a/src/test/java/com/nfl/dm/shield/dynamic/service/SchemaDescriptionNameValidationTest.java b/src/test/java/com/nfl/dm/shield/dynamic/service/SchemaDescriptionNameValidationTest.java index 756e01c..d34fd4a 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/service/SchemaDescriptionNameValidationTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/service/SchemaDescriptionNameValidationTest.java @@ -1,18 +1,13 @@ package com.nfl.dm.shield.dynamic.service; -import com.nfl.dm.shield.dynamic.ApplicationTestConfig; import com.nfl.dm.shield.dynamic.BaseBeanTest; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; +import static org.testng.Assert.*; @Test -@ContextConfiguration(classes = ApplicationTestConfig.class) public class SchemaDescriptionNameValidationTest extends BaseBeanTest { private final String withNotValidSchemaDescriptionName; private final String withNotValidSchemaDescriptionNameResult; From 00e5b564ba3a9705f6fe6e80e911f56455782157 Mon Sep 17 00:00:00 2001 From: Stanislav Demchenko Date: Tue, 9 Jan 2018 04:10:18 +0200 Subject: [PATCH 2/2] Deleted experimental changes. Upped Gold version. --- gradle.properties | 2 +- .../java/com/nfl/dm/shield/dynamic/ApplicationTestConfig.java | 2 -- src/test/java/com/nfl/dm/shield/dynamic/BaseBeanTest.java | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index eec7b97..241ccf3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,6 +5,6 @@ maven.central.sync=false sonatype.username=DUMMY_SONATYPE_USER sonatype.password=DUMMY_SONATYPE_PASSWORD -PROJECT_VERSION=1.0.6 +PROJECT_VERSION=1.0.7 PROJECT_GITHUB_REPO_URL=https://github.com/nfl/gold PROJECT_LICENSE_URL=https://github.com/nfl/gold/blob/master/LICENSE \ No newline at end of file diff --git a/src/test/java/com/nfl/dm/shield/dynamic/ApplicationTestConfig.java b/src/test/java/com/nfl/dm/shield/dynamic/ApplicationTestConfig.java index 0dc6808..8fda358 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/ApplicationTestConfig.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/ApplicationTestConfig.java @@ -2,10 +2,8 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Profile; @Configuration -@Profile("gold_test") @ComponentScan(basePackages = {"com.nfl.dm.shield.dynamic"}) public class ApplicationTestConfig { diff --git a/src/test/java/com/nfl/dm/shield/dynamic/BaseBeanTest.java b/src/test/java/com/nfl/dm/shield/dynamic/BaseBeanTest.java index 82eb8df..fe67159 100644 --- a/src/test/java/com/nfl/dm/shield/dynamic/BaseBeanTest.java +++ b/src/test/java/com/nfl/dm/shield/dynamic/BaseBeanTest.java @@ -11,7 +11,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; -import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.testng.AbstractTestNGSpringContextTests; import org.testng.Assert; @@ -25,7 +24,6 @@ @ContextConfiguration(classes = ApplicationTestConfig.class) -@ActiveProfiles("gold_test") public abstract class BaseBeanTest extends AbstractTestNGSpringContextTests { private final Logger log = LoggerFactory.getLogger(getClass());