Skip to content

Commit

Permalink
Fixes for failing unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
NavidMitchell committed Jan 28, 2025
1 parent 24423d7 commit 51c3d02
Show file tree
Hide file tree
Showing 14 changed files with 165 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .run/StructuresServerApplication.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</envs>
<module name="structures.structures-server.main" />
<option name="SPRING_BOOT_MAIN_CLASS" value="org.kinotic.structuresserver.StructuresServerApplication" />
<option name="VM_PARAMETERS" value="-XX:MaxDirectMemorySize=50m -Xmx4096m -XX:+AlwaysPreTouch -XX:+UseG1GC -XX:+ScavengeBeforeFullGC -XX:+DisableExplicitGC" />
<option name="VM_PARAMETERS" value="-XX:MaxDirectMemorySize=1g -Xmx4096m -XX:+AlwaysPreTouch -XX:+UseG1GC -XX:+ScavengeBeforeFullGC -XX:+DisableExplicitGC" />
<extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
<option name="credential" />
<option name="region" />
Expand Down
4 changes: 4 additions & 0 deletions compose.ek-m4.override.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
services:
structures-elasticsearch:
environment:
- _JAVA_OPTIONS=-XX:UseSVE=0
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,8 @@ public class ListParameterHolder implements ParameterHolder {

private final List<QueryParameter> parameters;

@Override
public boolean isEmpty() {
return parameters == null || parameters.isEmpty();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,8 @@ public class MapParameterHolder implements ParameterHolder {

private final Map<String, Object> parameters;

@Override
public boolean isEmpty() {
return parameters == null || parameters.isEmpty();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,9 @@
*/
public interface ParameterHolder {

/**
* @return true if this holder contains no parameters
*/
boolean isEmpty();

}
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public <T> CompletableFuture<Page<T>> executePage(ParameterHolder parameterHolde
Pair<List<Object>, QueryOptions> pair = QueryUtils.extractOrderedParameterList(parameterHolder, parameterNames);
paramsToUse = pair.getLeft();
options = pair.getRight();
}else if(parameterHolder != null){
}else if(parameterHolder != null && !parameterHolder.isEmpty()){
throw new IllegalArgumentException("This query does not support any parameters");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,9 @@ public static Pair<List<Object>, QueryOptions> extractOrderedParameterList(Param
List<Object> parameters = new ArrayList<>(parameterNames.size());
QueryOptions.QueryOptionsBuilder queryOptionsBuilder = QueryOptions.builder();

if(parameterHolder instanceof ListParameterHolder) {
if(parameterHolder instanceof ListParameterHolder listParameterHolder) {

List<QueryParameter> queryParameters
= ((ListParameterHolder) parameterHolder).getParameters();
List<QueryParameter> queryParameters = listParameterHolder.getParameters();

// for now, we will just return the parameters in the order they are in the list.
// We may need to use the parameterNames list to reorder them.
Expand All @@ -52,10 +51,9 @@ public static Pair<List<Object>, QueryOptions> extractOrderedParameterList(Param
parameters.add(queryParameter.getValue());
}
}
}else if(parameterHolder instanceof MapParameterHolder){
}else if(parameterHolder instanceof MapParameterHolder mapParameterHolder){

Map<String, Object> queryParameters
= ((MapParameterHolder) parameterHolder).getParameters();
Map<String, Object> queryParameters = mapParameterHolder.getParameters();

for(String key : parameterNames){
Object value = queryParameters.get(key);
Expand Down
1 change: 1 addition & 0 deletions structures-js/structures-api/.env.development
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VITE_USE_STRUCTURES_DOCKER=false
4 changes: 3 additions & 1 deletion structures-js/structures-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"test": "vitest run"
"test": "vitest run",
"ui-test": "vitest --ui --coverage.enabled=true --mode development"
},
"dependencies": {
"@kinotic/continuum-idl": "^2.0.2",
Expand All @@ -32,6 +33,7 @@
"@types/ws": "^8.5.14",
"@vitest/coverage-v8": "^2.1.8",
"@vitest/runner": "^3.0.4",
"@vitest/ui": "2.1.8",
"allure-vitest": "^3.0.9",
"delay": "^6.0.0",
"testcontainers": "^10.17.1",
Expand Down
94 changes: 86 additions & 8 deletions structures-js/structures-api/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions structures-js/structures-api/src/vite-env.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/// <reference types="vite/client" />

interface ImportMetaEnv {
readonly VITE_USE_STRUCTURES_DOCKER: boolean
}

interface ImportMeta {
readonly env: ImportMetaEnv
}
2 changes: 1 addition & 1 deletion structures-js/structures-api/test/NamedQuery.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ describe('NamedQueryTest', () => {
await namedQueriesService.save(namedQueriesDefinition)

const pageable = Pageable.createWithCursor(null, 10)
const personPage: Page<Person> = await entityService.namedQueryPage('countPeopleByLastName',
const personPage: Page<Person> = await entityService.namedQueryPage('countPeopleByLastNamePage',
[],
pageable)
console.log(personPage)
Expand Down
Loading

0 comments on commit 51c3d02

Please sign in to comment.