Skip to content

Commit e457f81

Browse files
committed
chore(WIP): debugging
1 parent 0a5fbd4 commit e457f81

File tree

8 files changed

+50
-34
lines changed

8 files changed

+50
-34
lines changed

.github/workflows/build-test.yml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
matrix:
1111
os: [ubuntu-20.04]
12-
node: [20, 22]
12+
node: [22]
1313
name: ${{ matrix.os }} and node ${{ matrix.node }}
1414
steps:
1515
- uses: actions/checkout@v2
@@ -21,26 +21,26 @@ jobs:
2121
run: |
2222
npm ci
2323
sudo apt-get install xvfb
24-
- name: Build
25-
run: npm run build:release
26-
- name: Archive build output
27-
if: github.event_name != 'merge_group'
28-
uses: actions/upload-artifact@v4
29-
with:
30-
name: build-results-${{ matrix.runs_on }}-node_${{ matrix.node }}
31-
path: dist
32-
retention-days: 15
33-
- name: Validate generated typescript definitions
34-
run: |
35-
npx tsc -p tsconfig.esm-check.json
36-
npx tsc -p tsconfig.umd-check.json
24+
# - name: Build
25+
# run: npm run build:release
26+
# - name: Archive build output
27+
# if: github.event_name != 'merge_group'
28+
# uses: actions/upload-artifact@v4
29+
# with:
30+
# name: build-results-${{ matrix.runs_on }}-node_${{ matrix.node }}
31+
# path: dist
32+
# retention-days: 15
33+
# - name: Validate generated typescript definitions
34+
# run: |
35+
# npx tsc -p tsconfig.esm-check.json
36+
# npx tsc -p tsconfig.umd-check.json
3737
- name: Chrome and Firefox tests
38-
run: xvfb-run --auto-servernum npm run test -- --browsers Chrome,Firefox
39-
- name: Archive test results
40-
if: github.event_name != 'merge_group' && (success() || failure())
41-
uses: actions/upload-artifact@v4
42-
continue-on-error: true
43-
with:
44-
name: test-results-${{ matrix.runs_on }}-node_${{ matrix.node }}
45-
path: Utilities/TestResults/Test-Report.html
46-
retention-days: 15
38+
run: xvfb-run --auto-servernum npm run test -- --browsers Chrome
39+
# - name: Archive test results
40+
# if: github.event_name != 'merge_group' && (success() || failure())
41+
# uses: actions/upload-artifact@v4
42+
# continue-on-error: true
43+
# with:
44+
# name: test-results-${{ matrix.runs_on }}-node_${{ matrix.node }}
45+
# path: Utilities/TestResults/Test-Report.html
46+
# retention-days: 15

Sources/Rendering/Core/HardwareSelector/test/testHardwareSelector.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ test('Test HardwareSelector', (tapeContext) => {
129129
})
130130
);
131131

132-
Promise.all(promises).then(() => {
132+
return Promise.all(promises).then(() => {
133133
gc.releaseResources();
134134
});
135135
});

Sources/Rendering/Core/HardwareSelector/test/testHardwareSelectorGlyph.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ test('Test HardwareSelectorGlyph', (tapeContext) => {
3333
renderWindow.addRenderer(renderer);
3434
renderer.setBackground(0.32, 0.34, 0.43);
3535

36-
const planeSource = vtkPlaneSource.newInstance();
37-
const simpleFilter = vtkCalculator.newInstance();
38-
const mapper = vtkGlyph3DMapper.newInstance();
39-
const actor = vtkActor.newInstance();
36+
const planeSource = gc.registerResource(vtkPlaneSource.newInstance());
37+
const simpleFilter = gc.registerResource(vtkCalculator.newInstance());
38+
const mapper = gc.registerResource(vtkGlyph3DMapper.newInstance());
39+
const actor = gc.registerResource(vtkActor.newInstance());
4040

4141
simpleFilter.setFormula({
4242
getArrays: (inputDataSets) => ({
@@ -87,7 +87,7 @@ test('Test HardwareSelectorGlyph', (tapeContext) => {
8787

8888
mapper.setInputConnection(simpleFilter.getOutputPort(), 0);
8989

90-
const coneSource = vtkConeSource.newInstance();
90+
const coneSource = gc.registerResource(vtkConeSource.newInstance());
9191
coneSource.setResolution(12);
9292
mapper.setInputConnection(coneSource.getOutputPort(), 1);
9393
mapper.setOrientationArray('pressure');
@@ -107,7 +107,7 @@ test('Test HardwareSelectorGlyph', (tapeContext) => {
107107
const sel = glwindow.getSelector();
108108
sel.setFieldAssociation(FieldAssociations.FIELD_ASSOCIATION_POINTS);
109109

110-
sel.selectAsync(renderer, 200, 200, 250, 300).then((res) => {
110+
return sel.selectAsync(renderer, 200, 200, 250, 300).then((res) => {
111111
const allGood = res.length === 7 && res[0].getProperties().prop === actor;
112112

113113
tapeContext.ok(res.length === 7, 'Seven glyphs selected');

Sources/Rendering/Core/HardwareSelector/test/testHardwareSelectorManyCells.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,13 @@ test('Test HardwareSelector', (tapeContext) => {
6363
glwindow.setSize(400, 400);
6464
renderWindow.addView(glwindow);
6565

66+
console.log(new Date());
67+
6668
// Render to make set up the rendering pipeline
6769
renderWindow.render();
6870

71+
console.log(new Date());
72+
6973
// Selector
7074
const selector = glwindow.getSelector();
7175
selector.setFieldAssociation(FieldAssociations.FIELD_ASSOCIATION_CELLS);
@@ -79,5 +83,6 @@ test('Test HardwareSelector', (tapeContext) => {
7983
const info = selector.getPixelInformation([200, 200], 0, [0, 0]);
8084
tapeContext.equal(info?.attributeID, numberOfVerts, 'Last triangle picked');
8185

86+
console.log(new Date());
8287
gc.releaseResources();
8388
});

Sources/Rendering/Core/HardwareSelector/test/testHardwareSelectorPoints.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ test.onlyIfWebGL('Test HardwareSelector Points', (tapeContext) => {
172172
tapeContext.ok(res[0].getProperties().attributeID === 2);
173173
})
174174
);
175-
Promise.all(promises).then(() => {
175+
return Promise.all(promises).then(() => {
176176
gc.releaseResources();
177177
});
178178
});

Sources/Rendering/Core/HardwareSelector/test/testHardwareSelectorSpeed.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ test('Test HardwareSelector', (tapeContext) => {
5757

5858
console.time('first normal render');
5959
let previousTime = Date.now();
60-
glwindow.captureNextImage().then(() => {
60+
const promise = glwindow.captureNextImage().then(() => {
6161
const taTime = Date.now() - previousTime;
6262
console.timeEnd('first normal render');
6363

@@ -88,4 +88,5 @@ test('Test HardwareSelector', (tapeContext) => {
8888
renderWindow.render();
8989
});
9090
renderWindow.render();
91+
return promise;
9192
});

Sources/Testing/index.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,15 @@ import './setupTestEnv';
99

1010
// webpack will include files that match the regex
1111
// '..' refers to the Sources/ dir
12-
const testsContext = require.context('..', true, /test[^/]*\.js$/);
12+
const testsContext = require.context(
13+
'..',
14+
true,
15+
// /Rendering\/Core\/[A-M].*test[A-Za-z0-9]+\.js$/ // bad
16+
// /Rendering\/Core\/[I-M].*test[A-Za-z0-9]+\.js$/ // good
17+
// /Rendering\/Core\/[A-H].*test[A-Za-z0-9]+\.js$/ // bad
18+
// /Rendering\/Core\/[F-H].*test[A-Za-z0-9]+\.js$/ // bad
19+
// /Rendering\/Core\/[F-G].*test[A-Za-z0-9]+\.js$/ // good
20+
// /Rendering\/Core\/Hard.*test[A-Za-z0-9]+\.js$/ // bad!
21+
/Rendering\/Core\/Hard.*testHardwareSelectorManyCells\.js$/ // bad!
22+
);
1323
testsContext.keys().forEach(testsContext);

karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ module.exports = function init(config) {
9494
},
9595
},
9696
browserNoActivityTimeout: 120000,
97-
browserDisconnectTimeout: 10000,
97+
browserDisconnectTimeout: 30000,
9898
browserDisconnectTolerance: 3,
9999

100100
port: 9876,

0 commit comments

Comments
 (0)