Skip to content

Commit

Permalink
gh-2573: Cherry pick federated store tests fix from 2553
Browse files Browse the repository at this point in the history
  • Loading branch information
@r32575 @t92549
r32575 authored and t92549 committed Jan 25, 2022
1 parent 0f75cdf commit c367555
Show file tree
Hide file tree
Showing 2 changed files with 197 additions and 121 deletions.
116 changes: 74 additions & 42 deletions ...tore/src/test/java/uk/gov/gchq/gaffer/federatedstore/FederatedGraphStorageTraitsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@ public class FederatedGraphStorageTraitsTest {
StoreTrait.POST_AGGREGATION_FILTERING,
StoreTrait.MATCHED_VERTEX);
private static final Set MAP_TRAITS_EXCLUSIVE_OF_ACCUMULO = Collections.emptySet();
private static final FederatedAccess ACCESS_UNUSED_AUTH_AND_USER = new FederatedAccess(Sets.newHashSet(UNUSED_AUTH_STRING), UNUSED_AUTH_STRING);
private static final FederatedAccess ACCESS_UNUSED_AUTH_WITH_TEST_USER = new FederatedAccess(Sets.newHashSet(UNUSED_AUTH_STRING), TEST_USER_ID);
private static final FederatedAccess ACCESS_UNUSED_AUTH_AND_USER = new FederatedAccess(
Sets.newHashSet(UNUSED_AUTH_STRING), UNUSED_AUTH_STRING);
private static final FederatedAccess ACCESS_UNUSED_AUTH_WITH_TEST_USER = new FederatedAccess(
Sets.newHashSet(UNUSED_AUTH_STRING), TEST_USER_ID);
private static final Set<StoreTrait> MAP_TRAITS = ImmutableSet.of(
StoreTrait.INGEST_AGGREGATION,
StoreTrait.MATCHED_VERTEX,
Expand Down Expand Up @@ -117,11 +119,14 @@ public class FederatedGraphStorageTraitsTest {

private static Class currentClass = new Object() {
}.getClass().getEnclosingClass();
private static final StoreProperties ACCUMULO_PROPERTIES = StoreProperties.loadStoreProperties(StreamUtil.openStream(currentClass, "properties/singleUseAccumuloStore.properties"));
private static final StoreProperties MAP_PROPERTIES = StoreProperties.loadStoreProperties(StreamUtil.openStream(currentClass, "properties/singleUseMapStore.properties"));
private static final StoreProperties ACCUMULO_PROPERTIES = StoreProperties
.loadStoreProperties(StreamUtil.openStream(currentClass, "properties/singleUseAccumuloStore.properties"));
private static final StoreProperties MAP_PROPERTIES = StoreProperties
.loadStoreProperties(StreamUtil.openStream(currentClass, "properties/singleUseMapStore.properties"));

@BeforeEach
public void setUp() throws Exception {
CacheServiceLoader.shutdown();
graphStorage = new FederatedGraphStorage();

clearCache();
Expand Down Expand Up @@ -174,59 +179,79 @@ public void shouldVerifyAssumptionsNoTraitsFound() throws Exception {
assertEquals(0, graphStorage.get(testUser, null).size(), "no graphs should have been found for testUser");
assertEquals(0, graphStorage.get(authUser, null).size(), "no graphs should have been found for authUser");
assertEquals(0, graphStorage.get(blankUser, null).size(), "no graphs should have been found for blankUser");
CacheServiceLoader.shutdown();
}

@Test
public void shouldVerifyAssumptionsStoreTraitsNonCurrent() throws Exception {
//given
Set<StoreTrait> mapTraits = map.getGraph().getStoreTraits();
Set<StoreTrait> accTraits = acc.getGraph().getStoreTraits();
// given
final Set<StoreTrait> mapTraits = map.getGraph().getStoreTraits();
final Set<StoreTrait> accTraits = acc.getGraph().getStoreTraits();
getTraits.setCurrentTraits(false);
Set<StoreTrait> mapTraitsOperation = map.getGraph().execute(getTraits, testUser);
Set<StoreTrait> accTraitsOperation = acc.getGraph().execute(getTraits, testUser);
final Set<StoreTrait> mapTraitsOperation = map.getGraph().execute(getTraits, testUser);
final Set<StoreTrait> accTraitsOperation = acc.getGraph().execute(getTraits, testUser);

//when
Set<StoreTrait> mapTraitsExclusive = mapTraits.stream().filter(t -> !accTraits.contains(t)).collect(Collectors.toSet());
Set<StoreTrait> accTraitsExclusive = accTraits.stream().filter(t -> !mapTraits.contains(t)).collect(Collectors.toSet());
Set<StoreTrait> intersectionTraits = accTraits.stream().filter(mapTraits::contains).collect(Collectors.toSet());
// when
final Set<StoreTrait> mapTraitsExclusive = mapTraits.stream().filter(t -> !accTraits.contains(t))
.collect(Collectors.toSet());
final Set<StoreTrait> accTraitsExclusive = accTraits.stream().filter(t -> !mapTraits.contains(t))
.collect(Collectors.toSet());
final Set<StoreTrait> intersectionTraits = accTraits.stream().filter(mapTraits::contains).collect(Collectors.toSet());

//then
// then
assertEquals(ACCUMULO_TRAITS, accTraits, "This store does not have AccumuloStore Traits");
assertEquals(MAP_TRAITS, mapTraits, "This store does not have MapStore Traits");
assertNotEquals(accTraits, mapTraits, "Test stores cannot have same traits");
assertEquals(10, accTraits.size(), "Expected AccumuloStore trait size is different");
assertEquals(8, mapTraits.size(), "Expected MapStore trait size is different");
assertEquals(MAP_TRAITS_EXCLUSIVE_OF_ACCUMULO, mapTraitsExclusive, "Expected traits exclusive to MapStore is different");
assertEquals(ACCUMULO_TRAITS_EXCLUSIVE_OF_MAP, accTraitsExclusive, "Expected traits exclusive to AccumuloStore is different");
assertEquals(MAP_TRAITS_EXCLUSIVE_OF_ACCUMULO, mapTraitsExclusive,
"Expected traits exclusive to MapStore is different");
assertEquals(ACCUMULO_TRAITS_EXCLUSIVE_OF_MAP, accTraitsExclusive,
"Expected traits exclusive to AccumuloStore is different");
assertEquals(INTERSECTION_TRAITS, intersectionTraits, "Expected intersection of traits is different");
assertEquals(mapTraits, mapTraitsOperation);
assertEquals(accTraits, accTraitsOperation);
}

@Test
public void shouldVerifyAssumptionsStoreTraitsCurrent() throws Exception {
//given
// given
getTraits.setCurrentTraits(true);
Set<StoreTrait> mapTraitsIsCurrent = map.getGraph().execute(getTraits, testUser);
Set<StoreTrait> accTraitsIsCurrent = acc.getGraph().execute(getTraits, testUser);

//when
Set<StoreTrait> mapTraitsIsCurrentExclusive = mapTraitsIsCurrent.stream().filter(t -> !accTraitsIsCurrent.contains(t)).collect(Collectors.toSet());
Set<StoreTrait> accTraitsIsCurrentExclusive = accTraitsIsCurrent.stream().filter(t -> !mapTraitsIsCurrent.contains(t)).collect(Collectors.toSet());
Set<StoreTrait> intersectionTraitsIsCurrent = accTraitsIsCurrent.stream().filter(mapTraitsIsCurrent::contains).collect(Collectors.toSet());
Set<StoreTrait> mapTraitsIsCurrentIsSubSetOfStoreTraits = mapTraitsIsCurrent.stream().filter(t -> !MAP_TRAITS.contains(t)).collect(Collectors.toSet());
Set<StoreTrait> accTraitsIsCurrentIsSubSetOfStoreTraits = accTraitsIsCurrent.stream().filter(t -> !ACCUMULO_TRAITS.contains(t)).collect(Collectors.toSet());

//then
final Set<StoreTrait> mapTraitsIsCurrent = map.getGraph().execute(getTraits, testUser);
final Set<StoreTrait> accTraitsIsCurrent = acc.getGraph().execute(getTraits, testUser);

// when
final Set<StoreTrait> mapTraitsIsCurrentExclusive = mapTraitsIsCurrent.stream()
.filter(t -> !accTraitsIsCurrent.contains(t)).collect(Collectors.toSet());
final Set<StoreTrait> accTraitsIsCurrentExclusive = accTraitsIsCurrent.stream()
.filter(t -> !mapTraitsIsCurrent.contains(t)).collect(Collectors.toSet());
final Set<StoreTrait> intersectionTraitsIsCurrent = accTraitsIsCurrent.stream().filter(mapTraitsIsCurrent::contains)
.collect(Collectors.toSet());
final Set<StoreTrait> mapTraitsIsCurrentIsSubSetOfStoreTraits = mapTraitsIsCurrent.stream()
.filter(t -> !MAP_TRAITS.contains(t)).collect(Collectors.toSet());
final Set<StoreTrait> accTraitsIsCurrentIsSubSetOfStoreTraits = accTraitsIsCurrent.stream()
.filter(t -> !ACCUMULO_TRAITS.contains(t)).collect(Collectors.toSet());

// then
assertNotEquals(ACCUMULO_TRAITS, accTraitsIsCurrent);
assertNotEquals(MAP_TRAITS, mapTraitsIsCurrent);
assertEquals(ACC_CURRENT_TRAITS, accTraitsIsCurrent, "Expected traits for the AccumuloStore 'Current schema' is different");
assertEquals(MAP_CURRENT_TRAITS, mapTraitsIsCurrent, "Expected traits for the MapStore 'Current schema' is different");
assertEquals(Collections.emptySet(), mapTraitsIsCurrentExclusive, "Expected traits exclusive to MapStore is different");
assertEquals(Sets.newHashSet(StoreTrait.ORDERED), accTraitsIsCurrentExclusive, "Expected traits exclusive to AccumuloStore is different");
assertEquals(Sets.newHashSet(StoreTrait.INGEST_AGGREGATION, StoreTrait.MATCHED_VERTEX, StoreTrait.PRE_AGGREGATION_FILTERING, StoreTrait.TRANSFORMATION, StoreTrait.POST_AGGREGATION_FILTERING, StoreTrait.POST_TRANSFORMATION_FILTERING), intersectionTraitsIsCurrent, "Expected intersection traits is different");
assertEquals(Collections.emptySet(), mapTraitsIsCurrentIsSubSetOfStoreTraits, "The IsCurrent traits is not a subset of MapStore traits");
assertEquals(Collections.emptySet(), accTraitsIsCurrentIsSubSetOfStoreTraits, "The IsCurrent traits is not a subset of AccumuloStore traits");
assertEquals(ACC_CURRENT_TRAITS, accTraitsIsCurrent,
"Expected traits for the AccumuloStore 'Current schema' is different");
assertEquals(MAP_CURRENT_TRAITS, mapTraitsIsCurrent,
"Expected traits for the MapStore 'Current schema' is different");
assertEquals(Collections.emptySet(), mapTraitsIsCurrentExclusive,
"Expected traits exclusive to MapStore is different");
assertEquals(Sets.newHashSet(StoreTrait.ORDERED), accTraitsIsCurrentExclusive,
"Expected traits exclusive to AccumuloStore is different");
assertEquals(
Sets.newHashSet(StoreTrait.INGEST_AGGREGATION, StoreTrait.MATCHED_VERTEX,
StoreTrait.PRE_AGGREGATION_FILTERING, StoreTrait.TRANSFORMATION,
StoreTrait.POST_AGGREGATION_FILTERING, StoreTrait.POST_TRANSFORMATION_FILTERING),
intersectionTraitsIsCurrent, "Expected intersection traits is different");
assertEquals(Collections.emptySet(), mapTraitsIsCurrentIsSubSetOfStoreTraits,
"The IsCurrent traits is not a subset of MapStore traits");
assertEquals(Collections.emptySet(), accTraitsIsCurrentIsSubSetOfStoreTraits,
"The IsCurrent traits is not a subset of AccumuloStore traits");
}

@Test
Expand All @@ -239,7 +264,9 @@ public void shouldGetNonCurrentTraitsForAddingUser() throws Exception {
final Set<StoreTrait> traits = fedStore.execute(getTraits, testUserContext);
//then
assertNotEquals(ACCUMULO_TRAITS, traits, "Returning AccumuloStore traits instead of MapStore");
assertEquals(Collections.emptySet(), traits.stream().filter(ACCUMULO_TRAITS_EXCLUSIVE_OF_MAP::contains).collect(Collectors.toSet()), "Revealing some hidden traits from the AccumuloStore instead of only MapStore");
assertEquals(Collections.emptySet(),
traits.stream().filter(ACCUMULO_TRAITS_EXCLUSIVE_OF_MAP::contains).collect(Collectors.toSet()),
"Revealing some hidden traits from the AccumuloStore instead of only MapStore");
assertEquals(MAP_TRAITS, traits);
}

Expand All @@ -253,13 +280,15 @@ public void shouldGetCurrentTraitsForAddingUser() throws Exception {
final Set<StoreTrait> traits = fedStore.execute(getTraits, testUserContext);
//then
assertNotEquals(ACCUMULO_TRAITS, traits, "Returning AccumuloStore traits instead of MapStore");
assertEquals(Collections.emptySet(), traits.stream().filter(ACCUMULO_TRAITS_EXCLUSIVE_OF_MAP::contains).collect(Collectors.toSet()), "Revealing some hidden traits from the AccumuloStore instead of only MapStore");
assertEquals(Collections.emptySet(),
traits.stream().filter(ACCUMULO_TRAITS_EXCLUSIVE_OF_MAP::contains).collect(Collectors.toSet()),
"Revealing some hidden traits from the AccumuloStore instead of only MapStore");
assertEquals(MAP_CURRENT_TRAITS, traits);
}

@Test
public void shouldGetCurrentTraitsForAddingUserButSelectedGraphsOnly() throws Exception {
//given
// given
final GraphSerialisable acc2 = new GraphSerialisable.Builder()
.graph(acc.getGraph())
.config(new GraphConfig(GRAPH_ID_ACCUMULO + 2))
Expand All @@ -273,13 +302,15 @@ public void shouldGetCurrentTraitsForAddingUserButSelectedGraphsOnly() throws Ex
final Set<StoreTrait> traits = fedStore.execute(getTraits, testUserContext);
//then
assertNotEquals(ACCUMULO_TRAITS, traits, "Returning AccumuloStore traits instead of MapStore");
assertEquals(Collections.emptySet(), traits.stream().filter(ACCUMULO_TRAITS_EXCLUSIVE_OF_MAP::contains).collect(Collectors.toSet()), "Revealing some hidden traits from the AccumuloStore instead of only MapStore");
assertEquals(Collections.emptySet(),
traits.stream().filter(ACCUMULO_TRAITS_EXCLUSIVE_OF_MAP::contains).collect(Collectors.toSet()),
"Revealing some hidden traits from the AccumuloStore instead of only MapStore");
assertEquals(MAP_CURRENT_TRAITS, traits);
}

@Test
public void shouldGetNonCurrentTraitsForAddingUserButSelectedGraphsOnly() throws Exception {
//given
// given
final GraphSerialisable acc2 = new GraphSerialisable.Builder()
.graph(acc.getGraph())
.config(new GraphConfig(GRAPH_ID_ACCUMULO + 2))
Expand All @@ -294,7 +325,9 @@ public void shouldGetNonCurrentTraitsForAddingUserButSelectedGraphsOnly() throws
final Set<StoreTrait> traits = fedStore.execute(getTraits, testUserContext);
//then
assertNotEquals(ACCUMULO_TRAITS, traits, "Returning AccumuloStore traits instead of MapStore");
assertEquals(Collections.emptySet(), traits.stream().filter(ACCUMULO_TRAITS_EXCLUSIVE_OF_MAP::contains).collect(Collectors.toSet()), "Revealing some hidden traits from the AccumuloStore instead of only MapStore");
assertEquals(Collections.emptySet(),
traits.stream().filter(ACCUMULO_TRAITS_EXCLUSIVE_OF_MAP::contains).collect(Collectors.toSet()),
"Revealing some hidden traits from the AccumuloStore instead of only MapStore");
assertEquals(MAP_TRAITS, traits);
}

Expand Down Expand Up @@ -350,7 +383,6 @@ public void shouldNotGetTraitsForNonAuthUser() throws Exception {
assertEquals(Collections.emptySet(), traits, "Revealing hidden traits");
}


/**
* Note:
* The permissiveAccessPredicate will allow ALL access.
Expand Down
Loading

0 comments on commit c367555

Please sign in to comment.