Skip to content

Commit d1fc963

Browse files
committed
fix(test): initialize REST executor in stop fixture
- Initialize the executor mock used by the isolated server stop fixture. - Assert admission shutdown precedes Gremlin and REST shutdown. - Validate the timeout regression with 48 Java 17 regression tests.
1 parent d1239ef commit d1fc963

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

‎hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/HugeFactoryTest.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import java.util.concurrent.atomic.AtomicInteger;
3939
import java.util.concurrent.atomic.AtomicReference;
4040

41+
import org.apache.hugegraph.api.gremlin.GremlinRestExecutor;
4142
import org.apache.hugegraph.backend.store.BackendStoreProvider;
4243
import org.apache.hugegraph.backend.tx.GraphTransaction;
4344
import org.apache.hugegraph.config.HugeConfig;
@@ -63,6 +64,7 @@
6364
import org.apache.hugegraph.util.Events;
6465
import org.junit.Test;
6566
import org.mockito.AdditionalAnswers;
67+
import org.mockito.InOrder;
6668
import org.mockito.Mockito;
6769
import org.apache.tinkerpop.gremlin.server.GremlinServer;
6870

@@ -489,12 +491,18 @@ protected void done() {
489491
}).when(provider).close();
490492
Whitebox.setInternalState(graph, "storeProvider", provider);
491493
HugeGraphServer server = Mockito.mock(HugeGraphServer.class, Mockito.CALLS_REAL_METHODS);
494+
GremlinRestExecutor restExecutor = Mockito.mock(GremlinRestExecutor.class);
495+
Whitebox.setInternalState(server, "gremlinRestExecutor", restExecutor);
492496
Whitebox.setInternalState(server, "gremlinServer", gremlin);
493497
Whitebox.setInternalState(server, "restServer", rest);
494498
Whitebox.setInternalState(server, "memoryMonitor", Mockito.mock(MemoryMonitor.class));
495499

496500
server.stop();
497501

502+
InOrder shutdown = Mockito.inOrder(restExecutor, gremlin, rest);
503+
shutdown.verify(restExecutor).beginShutdown();
504+
shutdown.verify(gremlin).stop();
505+
shutdown.verify(rest).shutdown();
498506
Assert.assertEquals(2, earlyCloses.get());
499507
Assert.assertEquals(TaskStatus.SUCCESS, task.status());
500508
Assert.assertTrue("Pending task must persist completion before owner close", completionPersisted.get());

0 commit comments

Comments
 (0)