Skip to content

fix: improve test speed #1126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 10.1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/test/java/io/supertokens/test/ApiVersionAPITest.java
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,9 @@ public void testThatWebsiteAndAPIDomainAreSaved() throws Exception {
public void testAPIVersionWorksEvenIfThereIsAnException() throws Exception {
String[] args = {"../"};

TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
FeatureFlagTestContent.getInstance(process.getProcess())
.setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{EE_FEATURES.MULTI_TENANCY});
process.startProcess();
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/io/supertokens/test/CDIVersionTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,7 @@ public void testJWKSEndpointWorksInAllCases() throws Exception {
{
String[] args = {"../"};

TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
process.startProcess();
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

{
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/io/supertokens/test/CLIOptionsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -116,19 +116,19 @@ public void testMultipleInstancesAtTheSameTime() throws Exception {
p1 = pb.start();
p1.waitFor();

TestingProcess process = TestingProcessManager.start(args);
TestingProcess process = TestingProcessManager.start(args, true, true);
assertNotNull(process.checkOrWaitForEvent(PROCESS_STATE.STARTED));

args = new String[]{"../", "port=8081",
"configFile=" + new File("../temp/new1Config.yaml").getAbsolutePath()};

TestingProcess process1 = TestingProcessManager.start(args);
TestingProcess process1 = TestingProcessManager.start(args, true, false);
assertNotNull(process1.checkOrWaitForEvent(PROCESS_STATE.STARTED));

args = new String[]{"../", "port=8082",
"configFile=" + new File("../temp/new2Config.yaml").getAbsolutePath()};

TestingProcess process2 = TestingProcessManager.start(args);
TestingProcess process2 = TestingProcessManager.start(args, true, false);
assertNotNull(process2.checkOrWaitForEvent(PROCESS_STATE.STARTED));

assertEquals(Config.getConfig(process.getProcess()).getPort(process.getProcess()), 3567);
Expand Down
18 changes: 6 additions & 12 deletions src/test/java/io/supertokens/test/CronjobTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -453,10 +453,9 @@ public void testAddingCronJobTwice() throws Exception {
public void testAddingTenantsDoesNotIncreaseCronJobs() throws Exception {
String[] args = {"../"};

TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
FeatureFlagTestContent.getInstance(process.getProcess())
.setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{EE_FEATURES.MULTI_TENANCY});
process.startProcess();
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
Expand Down Expand Up @@ -547,10 +546,9 @@ public void testAddingTenantsDoesNotIncreaseCronJobs() throws Exception {
public void testTargetTenantCronTask() throws Exception {
String[] args = {"../"};

TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
FeatureFlagTestContent.getInstance(process.getProcess())
.setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{EE_FEATURES.MULTI_TENANCY});
process.startProcess();
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
Expand Down Expand Up @@ -605,10 +603,9 @@ public void testTargetTenantCronTask() throws Exception {
public void testPerTenantCronTask() throws Exception {
String[] args = {"../"};

TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
FeatureFlagTestContent.getInstance(process.getProcess())
.setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{EE_FEATURES.MULTI_TENANCY});
process.startProcess();
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
Expand Down Expand Up @@ -665,10 +662,9 @@ public void testPerTenantCronTask() throws Exception {
public void testPerAppCronTask() throws Exception {
String[] args = {"../"};

TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
FeatureFlagTestContent.getInstance(process.getProcess())
.setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{EE_FEATURES.MULTI_TENANCY});
process.startProcess();
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
Expand Down Expand Up @@ -725,10 +721,9 @@ public void testPerAppCronTask() throws Exception {
public void testPerUserPoolCronTask() throws Exception {
String[] args = {"../"};

TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
FeatureFlagTestContent.getInstance(process.getProcess())
.setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{EE_FEATURES.MULTI_TENANCY});
process.startProcess();
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
Expand Down Expand Up @@ -912,10 +907,9 @@ public void testThatNoCronJobIntervalIsMoreThanADay() throws Exception {
public void testThatCronJobsHaveTenantsInfoAfterRestart() throws Exception {
String[] args = {"../"};

TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
FeatureFlagTestContent.getInstance(process.getProcess())
.setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{EE_FEATURES.MULTI_TENANCY});
process.startProcess();
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/io/supertokens/test/DotStartedFileTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,27 +48,27 @@ public void beforeEach() {
public void fiveProcessInParallelDotStartedFileTest() throws Exception {
String[] args = {"../"};

TestingProcessManager.TestingProcess process1 = TestingProcessManager.start(args);
TestingProcessManager.TestingProcess process1 = TestingProcessManager.start(args, true, true);
assertNotNull(process1.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

Utils.setValueInConfig("port", "8081");

TestingProcessManager.TestingProcess process2 = TestingProcessManager.start(args);
TestingProcessManager.TestingProcess process2 = TestingProcessManager.start(args, true, false);
assertNotNull(process2.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

Utils.setValueInConfig("port", "8082");

TestingProcessManager.TestingProcess process3 = TestingProcessManager.start(args);
TestingProcessManager.TestingProcess process3 = TestingProcessManager.start(args, true, false);
assertNotNull(process3.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

Utils.setValueInConfig("port", "8083");

TestingProcessManager.TestingProcess process4 = TestingProcessManager.start(args);
TestingProcessManager.TestingProcess process4 = TestingProcessManager.start(args, true, false);
assertNotNull(process4.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

Utils.setValueInConfig("port", "8084");

TestingProcessManager.TestingProcess process5 = TestingProcessManager.start(args);
TestingProcessManager.TestingProcess process5 = TestingProcessManager.start(args, true, false);
assertNotNull(process5.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

File[] flist = new File("../.started").listFiles();
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/io/supertokens/test/InMemoryDBTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -856,8 +856,7 @@ public void forceInMemDBIsTrueIfSetToTrue() throws InterruptedException {
@Test
public void forceInMemDBIsFalseByDefault() throws InterruptedException {
String[] args = {"../"};
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
process.startProcess();
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
assertFalse(process.getProcess().isForceInMemoryDB());
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));
}
Expand Down
22 changes: 9 additions & 13 deletions src/test/java/io/supertokens/test/LoggingTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -217,12 +217,10 @@ public void testStandardOutLoggingWithNullStr() throws Exception {
System.setOut(new PrintStream(stdOutput));
System.setErr(new PrintStream(errorOutput));

TestingProcess process = TestingProcessManager.start(args, false);
TestingProcess process = TestingProcessManager.start(args);
assertNotNull(process.checkOrWaitForEvent(PROCESS_STATE.STARTED));

try {
process.startProcess();
assertNotNull(process.checkOrWaitForEvent(PROCESS_STATE.STARTED));

Logging.debug(process.getProcess(), TenantIdentifier.BASE_TENANT, "outTest-dfkn3knsakn");
Logging.error(process.getProcess(), TenantIdentifier.BASE_TENANT, "errTest-sdvjovnoasid", true);

Expand Down Expand Up @@ -251,14 +249,13 @@ public void testTenantNotFoundExceptionUsesTheRightCUD() throws Exception {
System.setOut(new PrintStream(stdOutput));
System.setErr(new PrintStream(errorOutput));

TestingProcess process = TestingProcessManager.start(args, false);
TestingProcess process = TestingProcessManager.start(args);
FeatureFlagTestContent.getInstance(process.getProcess())
.setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{
EE_FEATURES.MULTI_TENANCY});
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

try {
FeatureFlagTestContent.getInstance(process.getProcess())
.setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{
EE_FEATURES.MULTI_TENANCY});
process.startProcess();
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
return;
Expand Down Expand Up @@ -328,11 +325,10 @@ public void testStandardOutLoggingWithNull() throws Exception {
System.setOut(new PrintStream(stdOutput));
System.setErr(new PrintStream(errorOutput));

TestingProcess process = TestingProcessManager.start(args, false);
TestingProcess process = TestingProcessManager.start(args);
assertNotNull(process.checkOrWaitForEvent(PROCESS_STATE.STARTED));

try {
process.startProcess();
assertNotNull(process.checkOrWaitForEvent(PROCESS_STATE.STARTED));

Logging.debug(process.getProcess(), TenantIdentifier.BASE_TENANT, "outTest-dfkn3knsakn");
Logging.error(process.getProcess(), TenantIdentifier.BASE_TENANT, "errTest-sdvjovnoasid", true);
Expand Down
18 changes: 6 additions & 12 deletions src/test/java/io/supertokens/test/PathRouterTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -1421,10 +1421,9 @@ public void tenantNotFoundTest()
String[] args = {"../"};

Utils.setValueInConfig("host", "\"0.0.0.0\"");
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
FeatureFlagTestContent.getInstance(process.getProcess())
.setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{EE_FEATURES.MULTI_TENANCY});
process.startProcess();
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
Expand Down Expand Up @@ -1550,10 +1549,9 @@ public void tenantNotFoundTest2()
String[] args = {"../"};

Utils.setValueInConfig("host", "\"0.0.0.0\"");
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
FeatureFlagTestContent.getInstance(process.getProcess())
.setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{EE_FEATURES.MULTI_TENANCY});
process.startProcess();
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
Expand Down Expand Up @@ -1674,10 +1672,9 @@ public void tenantNotFoundTest3()
String[] args = {"../"};

Utils.setValueInConfig("host", "\"0.0.0.0\"");
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
FeatureFlagTestContent.getInstance(process.getProcess())
.setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{EE_FEATURES.MULTI_TENANCY});
process.startProcess();
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
Expand Down Expand Up @@ -2647,10 +2644,9 @@ public void tenantNotFoundWithAppIdTest()
String[] args = {"../"};

Utils.setValueInConfig("host", "\"0.0.0.0\"");
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
FeatureFlagTestContent.getInstance(process.getProcess())
.setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{EE_FEATURES.MULTI_TENANCY});
process.startProcess();
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
Expand Down Expand Up @@ -2795,10 +2791,9 @@ public void tenantNotFoundWithAppIdTest2()
String[] args = {"../"};

Utils.setValueInConfig("host", "\"0.0.0.0\"");
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
FeatureFlagTestContent.getInstance(process.getProcess())
.setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{EE_FEATURES.MULTI_TENANCY});
process.startProcess();
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
Expand Down Expand Up @@ -2966,10 +2961,9 @@ public void tenantNotFoundWithAppIdTest3()
String[] args = {"../"};

Utils.setValueInConfig("host", "\"0.0.0.0\"");
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
FeatureFlagTestContent.getInstance(process.getProcess())
.setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{EE_FEATURES.MULTI_TENANCY});
process.startProcess();
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
Expand Down
6 changes: 2 additions & 4 deletions src/test/java/io/supertokens/test/RequestStatsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,10 @@ public void testLastMinuteStats() throws Exception {
public void testLastMinuteStatsPerApp() throws Exception {
String[] args = {"../"};

TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
FeatureFlagTestContent.getInstance(process.getProcess())
.setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{
EE_FEATURES.MULTI_TENANCY});
process.startProcess();
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
Expand Down Expand Up @@ -259,11 +258,10 @@ public void testLastMinuteStatsPerApp() throws Exception {
public void testWithNonExistantApp() throws Exception {
String[] args = {"../"};

TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
FeatureFlagTestContent.getInstance(process.getProcess())
.setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{
EE_FEATURES.MULTI_TENANCY});
process.startProcess();
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

if (StorageLayer.getStorage(process.getProcess()).getType() != STORAGE_TYPE.SQL) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,9 @@ public void beforeEach() {
public void testClearAllResourcesWithKeyWorksCorrectly() throws Exception {
String[] args = {"../"};

TestingProcessManager.TestingProcess process = TestingProcessManager.start(args, false);
TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
FeatureFlagTestContent.getInstance(process.getProcess())
.setKeyValue(FeatureFlagTestContent.ENABLED_FEATURES, new EE_FEATURES[]{EE_FEATURES.MULTI_TENANCY});
process.startProcess();
assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STARTED));

AppIdentifier a1 = new AppIdentifier(null, "a1");
Expand Down
Loading
Loading