Skip to content

Commit

Permalink
[LePmOHly] Fix flakey index test
Browse files Browse the repository at this point in the history
  • Loading branch information
gem-neo4j committed Jul 13, 2023
1 parent 6ac1ebd commit d4cc7ea
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 49 deletions.
43 changes: 23 additions & 20 deletions LICENSES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,23 @@ Apache-2.0
j2objc-annotations-2.8.jar
jPowerShell-3.0.jar
jProcesses-1.6.5.jar
jackson-annotations-2.15.2.jar
jackson-core-2.15.2.jar
jackson-annotations-2.13.4.jar
jackson-annotations-2.15.1.jar
jackson-core-2.13.4.jar
jackson-core-2.15.1.jar
jackson-core-asl-1.9.13.jar
jackson-databind-2.15.2.jar
jackson-dataformat-cbor-2.15.2.jar
jackson-dataformat-csv-2.15.2.jar
jackson-databind-2.13.4.2.jar
jackson-databind-2.15.1.jar
jackson-dataformat-cbor-2.15.1.jar
jackson-dataformat-csv-2.15.1.jar
jackson-datatype-jsr310-2.15.1.jar
jackson-datatype-jsr310-2.15.2.jar
jackson-jaxrs-base-2.15.2.jar
jackson-jaxrs-json-provider-2.15.2.jar
jackson-jaxrs-base-2.13.4.jar
jackson-jaxrs-base-2.15.1.jar
jackson-jaxrs-json-provider-2.13.4.jar
jackson-jaxrs-json-provider-2.15.1.jar
jackson-mapper-asl-1.9.13.jar
jackson-module-jaxb-annotations-2.15.2.jar
jackson-module-jaxb-annotations-2.13.4.jar
jackson-module-jaxb-annotations-2.15.1.jar
jakarta.validation-api-2.0.2.jar
jamm-0.3.3.jar
java-util-1.9.0.jar
Expand All @@ -119,15 +124,15 @@ Apache-2.0
jcip-annotations-1.0-1.jar
jctools-core-3.3.0.jar
jettison-1.5.4.jar
jetty-http-9.4.51.v20230217.jar
jetty-io-9.4.51.v20230217.jar
jetty-security-9.4.51.v20230217.jar
jetty-server-9.4.51.v20230217.jar
jetty-servlet-9.4.51.v20230217.jar
jetty-util-9.4.51.v20230217.jar
jetty-util-ajax-9.4.51.v20230217.jar
jetty-webapp-9.4.51.v20230217.jar
jetty-xml-9.4.51.v20230217.jar
jetty-http-9.4.48.v20220622.jar
jetty-io-9.4.48.v20220622.jar
jetty-security-9.4.48.v20220622.jar
jetty-server-9.4.48.v20220622.jar
jetty-servlet-9.4.48.v20220622.jar
jetty-util-9.4.48.v20220622.jar
jetty-util-ajax-9.4.48.v20220622.jar
jetty-webapp-9.4.48.v20220622.jar
jetty-xml-9.4.48.v20220622.jar
jffi-1.2.16-native.jar
jffi-1.2.16.jar
jmespath-java-1.12.425.jar
Expand Down Expand Up @@ -170,7 +175,6 @@ Apache-2.0
netty-all-4.1.89.Final.jar
netty-buffer-4.1.86.Final.jar
netty-buffer-4.1.89.Final.jar
netty-buffer-4.1.94.Final.jar
netty-codec-4.1.86.Final.jar
netty-codec-4.1.89.Final.jar
netty-codec-dns-4.1.89.Final.jar
Expand All @@ -187,7 +191,6 @@ Apache-2.0
netty-codec-xml-4.1.89.Final.jar
netty-common-4.1.86.Final.jar
netty-common-4.1.89.Final.jar
netty-common-4.1.94.Final.jar
netty-handler-4.1.86.Final.jar
netty-handler-4.1.89.Final.jar
netty-handler-proxy-4.1.89.Final.jar
Expand Down
61 changes: 32 additions & 29 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -126,18 +126,23 @@ Apache-2.0
j2objc-annotations-2.8.jar
jPowerShell-3.0.jar
jProcesses-1.6.5.jar
jackson-annotations-2.15.2.jar
jackson-core-2.15.2.jar
jackson-annotations-2.13.4.jar
jackson-annotations-2.15.1.jar
jackson-core-2.13.4.jar
jackson-core-2.15.1.jar
jackson-core-asl-1.9.13.jar
jackson-databind-2.15.2.jar
jackson-dataformat-cbor-2.15.2.jar
jackson-dataformat-csv-2.15.2.jar
jackson-databind-2.13.4.2.jar
jackson-databind-2.15.1.jar
jackson-dataformat-cbor-2.15.1.jar
jackson-dataformat-csv-2.15.1.jar
jackson-datatype-jsr310-2.15.1.jar
jackson-datatype-jsr310-2.15.2.jar
jackson-jaxrs-base-2.15.2.jar
jackson-jaxrs-json-provider-2.15.2.jar
jackson-jaxrs-base-2.13.4.jar
jackson-jaxrs-base-2.15.1.jar
jackson-jaxrs-json-provider-2.13.4.jar
jackson-jaxrs-json-provider-2.15.1.jar
jackson-mapper-asl-1.9.13.jar
jackson-module-jaxb-annotations-2.15.2.jar
jackson-module-jaxb-annotations-2.13.4.jar
jackson-module-jaxb-annotations-2.15.1.jar
jakarta.validation-api-2.0.2.jar
jamm-0.3.3.jar
java-util-1.9.0.jar
Expand All @@ -149,15 +154,15 @@ Apache-2.0
jcip-annotations-1.0-1.jar
jctools-core-3.3.0.jar
jettison-1.5.4.jar
jetty-http-9.4.51.v20230217.jar
jetty-io-9.4.51.v20230217.jar
jetty-security-9.4.51.v20230217.jar
jetty-server-9.4.51.v20230217.jar
jetty-servlet-9.4.51.v20230217.jar
jetty-util-9.4.51.v20230217.jar
jetty-util-ajax-9.4.51.v20230217.jar
jetty-webapp-9.4.51.v20230217.jar
jetty-xml-9.4.51.v20230217.jar
jetty-http-9.4.48.v20220622.jar
jetty-io-9.4.48.v20220622.jar
jetty-security-9.4.48.v20220622.jar
jetty-server-9.4.48.v20220622.jar
jetty-servlet-9.4.48.v20220622.jar
jetty-util-9.4.48.v20220622.jar
jetty-util-ajax-9.4.48.v20220622.jar
jetty-webapp-9.4.48.v20220622.jar
jetty-xml-9.4.48.v20220622.jar
jffi-1.2.16-native.jar
jffi-1.2.16.jar
jmespath-java-1.12.425.jar
Expand Down Expand Up @@ -200,7 +205,6 @@ Apache-2.0
netty-all-4.1.89.Final.jar
netty-buffer-4.1.86.Final.jar
netty-buffer-4.1.89.Final.jar
netty-buffer-4.1.94.Final.jar
netty-codec-4.1.86.Final.jar
netty-codec-4.1.89.Final.jar
netty-codec-dns-4.1.89.Final.jar
Expand All @@ -217,7 +221,6 @@ Apache-2.0
netty-codec-xml-4.1.89.Final.jar
netty-common-4.1.86.Final.jar
netty-common-4.1.89.Final.jar
netty-common-4.1.94.Final.jar
netty-handler-4.1.86.Final.jar
netty-handler-4.1.89.Final.jar
netty-handler-proxy-4.1.89.Final.jar
Expand Down Expand Up @@ -354,15 +357,15 @@ Eclipse Distribution License - v 1.0
Eclipse Public License - Version 1.0
javax-websocket-client-impl-9.4.51.v20230217.jar
javax-websocket-server-impl-9.4.51.v20230217.jar
jetty-http-9.4.51.v20230217.jar
jetty-io-9.4.51.v20230217.jar
jetty-security-9.4.51.v20230217.jar
jetty-server-9.4.51.v20230217.jar
jetty-servlet-9.4.51.v20230217.jar
jetty-util-9.4.51.v20230217.jar
jetty-util-ajax-9.4.51.v20230217.jar
jetty-webapp-9.4.51.v20230217.jar
jetty-xml-9.4.51.v20230217.jar
jetty-http-9.4.48.v20220622.jar
jetty-io-9.4.48.v20220622.jar
jetty-security-9.4.48.v20220622.jar
jetty-server-9.4.48.v20220622.jar
jetty-servlet-9.4.48.v20220622.jar
jetty-util-9.4.48.v20220622.jar
jetty-util-ajax-9.4.48.v20220622.jar
jetty-webapp-9.4.48.v20220622.jar
jetty-xml-9.4.48.v20220622.jar
websocket-api-9.4.51.v20230217.jar
websocket-client-9.4.51.v20230217.jar
websocket-common-9.4.51.v20230217.jar
Expand Down
5 changes: 5 additions & 0 deletions core/src/test/java/apoc/schema/SchemasTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
Expand Down Expand Up @@ -849,6 +850,8 @@ public void testSchemaNodesWithFailedIndex() {

// create the failed index and check that has state "FAILED"
db.executeTransactionally("CREATE INDEX failedIdx FOR (n:LabelTest) ON (n.prop)");
assertThrows(IllegalStateException.class, this::awaitIndexesOnline);

testCall(db, "SHOW INDEXES YIELD name, state WHERE name = 'failedIdx'", (r) -> {
assertEquals("FAILED", r.get("state"));
});
Expand Down Expand Up @@ -876,6 +879,8 @@ public void testSchemaRelationshipsWithFailedIndex() {

// create the failed index and check that has state "FAILED"
db.executeTransactionally("CREATE INDEX failedIdx FOR ()-[r:REL_TEST]-() ON (r.prop)");
assertThrows(IllegalStateException.class, this::awaitIndexesOnline);

testCall(db, "SHOW INDEXES YIELD name, state WHERE name = 'failedIdx'", (r) -> {
assertEquals("FAILED", r.get("state"));
});
Expand Down

0 comments on commit d4cc7ea

Please sign in to comment.