mirror of
https://github.com/Kingsrook/qqq.git
synced 2025-07-18 13:10:44 +00:00
Updated for updated deps
This commit is contained in:
@ -26,13 +26,14 @@ import java.io.File;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import com.kingsrook.qqq.backend.core.exceptions.QInstanceValidationException;
|
import com.kingsrook.qqq.backend.core.exceptions.QInstanceValidationException;
|
||||||
import com.kingsrook.qqq.backend.core.instances.QInstanceValidator;
|
import com.kingsrook.qqq.backend.core.instances.QInstanceValidator;
|
||||||
import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationMetaData;
|
import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationType;
|
||||||
|
import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
|
||||||
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
|
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
|
||||||
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType;
|
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType;
|
||||||
import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
|
|
||||||
import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
|
import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
|
||||||
import com.kingsrook.qqq.backend.core.model.session.QSession;
|
import com.kingsrook.qqq.backend.core.model.session.QSession;
|
||||||
import com.kingsrook.qqq.backend.core.modules.authentication.MockAuthenticationModule;
|
import com.kingsrook.qqq.backend.core.modules.authentication.MockAuthenticationModule;
|
||||||
|
import com.kingsrook.qqq.backend.core.modules.authentication.metadata.QAuthenticationMetaData;
|
||||||
import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.Cardinality;
|
import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.Cardinality;
|
||||||
import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.RecordFormat;
|
import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.RecordFormat;
|
||||||
import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemBackendMetaData;
|
import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemBackendMetaData;
|
||||||
@ -135,7 +136,7 @@ public class TestUtils
|
|||||||
{
|
{
|
||||||
return new QAuthenticationMetaData()
|
return new QAuthenticationMetaData()
|
||||||
.withName("mock")
|
.withName("mock")
|
||||||
.withType("mock");
|
.withType(QAuthenticationType.MOCK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -219,9 +220,9 @@ public class TestUtils
|
|||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
**
|
**
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
public static QSession getMockSession()
|
public static QSession getMockSession() throws QInstanceValidationException
|
||||||
{
|
{
|
||||||
MockAuthenticationModule mockAuthenticationModule = new MockAuthenticationModule();
|
MockAuthenticationModule mockAuthenticationModule = new MockAuthenticationModule();
|
||||||
return (mockAuthenticationModule.createSession(null));
|
return (mockAuthenticationModule.createSession(defineInstance(), null));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -70,8 +70,7 @@ class FilesystemBackendMetaDataTest
|
|||||||
String json = qInstanceAdapter.qInstanceToJsonIncludingBackend(qInstance);
|
String json = qInstanceAdapter.qInstanceToJsonIncludingBackend(qInstance);
|
||||||
|
|
||||||
QInstance deserialized = qInstanceAdapter.jsonToQInstanceIncludingBackends(json);
|
QInstance deserialized = qInstanceAdapter.jsonToQInstanceIncludingBackends(json);
|
||||||
assertThat(deserialized).usingRecursiveComparison()
|
assertThat(deserialized.getBackends()).usingRecursiveComparison()
|
||||||
.ignoringFields("hasBeenValidated") // note, this field is @JsonIgnore
|
.isEqualTo(qInstance.getBackends());
|
||||||
.isEqualTo(qInstance);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -70,8 +70,7 @@ class S3BackendMetaDataTest
|
|||||||
String json = qInstanceAdapter.qInstanceToJsonIncludingBackend(qInstance);
|
String json = qInstanceAdapter.qInstanceToJsonIncludingBackend(qInstance);
|
||||||
|
|
||||||
QInstance deserialized = qInstanceAdapter.jsonToQInstanceIncludingBackends(json);
|
QInstance deserialized = qInstanceAdapter.jsonToQInstanceIncludingBackends(json);
|
||||||
assertThat(deserialized).usingRecursiveComparison()
|
assertThat(deserialized.getBackends()).usingRecursiveComparison()
|
||||||
.ignoringFields("hasBeenValidated") // note, this field is @JsonIgnore
|
.isEqualTo(qInstance.getBackends());
|
||||||
.isEqualTo(qInstance);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
Reference in New Issue
Block a user