Merge pull request #19373 from munrocket/unit

Tests: unit refactor
mrdoob · May 16, 2020 · c9e5983 · c9e5983
2 parents b7a25a6 + d068dd0
commit c9e5983
Show file tree

Hide file tree

Showing 30 changed files with 31 additions and 36 deletions.
diff --git a/test/unit/README.md b/test/unit/README.md
@@ -1,15 +1,10 @@
 ## Setup
 
-- Install [Node.js](https://nodejs.org/)
-- Execute `npm install`
-
-## Build
-
-- Execute `npm run build-test`
+- Execute `npm i --prefix test` from root folder
 
 ## Run
 
 You can run the unit tests in two environments:
 
-- Node.js: Execute `npm run test`
+- Node.js: Execute `npm run test-unit` from root folder
 - Browser: Execute `npm run dev-test` and call `http://localhost:8080/test/unit/UnitTests.html` (see [How to run things locally](https://threejs.org/docs/#manual/introduction/How-to-run-things-locally))
diff --git a/...or_toRemoveAfterEditorES6Refactoring.html → ...ts_toRemoveAfterEditorES6Refactoring.html b/...or_toRemoveAfterEditorES6Refactoring.html → ...ts_toRemoveAfterEditorES6Refactoring.html
@@ -11,8 +11,8 @@
   <div id="qunit-fixture"></div>
 
   <script src="../node_modules/qunit/qunit/qunit.js"></script>
-  <script src="qunit-utils.js"></script>
-  <script src="SmartComparer.js"></script>
+  <script src="utils/qunit-utils.js"></script>
+  <script src="utils/SmartComparer.js"></script>
 
 <!-- add sources to test below -->
 <script src="../../build/three.min.js"></script>

diff --git a/test/unit/src/geometries/BoxGeometry.tests.js b/test/unit/src/geometries/BoxGeometry.tests.js
@@ -4,7 +4,7 @@
  */
 /* global QUnit */
 
-import { runStdGeometryTests } from '../../qunit-utils';
+import { runStdGeometryTests } from '../../utils/qunit-utils';
 import {
 	BoxBufferGeometry
 } from '../../../../src/geometries/BoxGeometry';

diff --git a/test/unit/src/geometries/CircleGeometry.tests.js b/test/unit/src/geometries/CircleGeometry.tests.js
@@ -4,7 +4,7 @@
  */
 /* global QUnit */
 
-import { runStdGeometryTests } from '../../qunit-utils';
+import { runStdGeometryTests } from '../../utils/qunit-utils';
 import {
 	CircleBufferGeometry
 } from '../../../../src/geometries/CircleGeometry';

diff --git a/test/unit/src/geometries/ConeGeometry.tests.js b/test/unit/src/geometries/ConeGeometry.tests.js
@@ -3,7 +3,7 @@
  */
 /* global QUnit */
 
-import { runStdGeometryTests } from '../../qunit-utils';
+import { runStdGeometryTests } from '../../utils/qunit-utils';
 import {
 	ConeBufferGeometry
 } from '../../../../src/geometries/ConeGeometry';

diff --git a/test/unit/src/geometries/CylinderGeometry.tests.js b/test/unit/src/geometries/CylinderGeometry.tests.js
@@ -4,7 +4,7 @@
  */
 /* global QUnit */
 
-import { runStdGeometryTests } from '../../qunit-utils';
+import { runStdGeometryTests } from '../../utils/qunit-utils';
 import {
 	CylinderBufferGeometry
 } from '../../../../src/geometries/CylinderGeometry';

diff --git a/test/unit/src/geometries/DodecahedronGeometry.tests.js b/test/unit/src/geometries/DodecahedronGeometry.tests.js
@@ -4,7 +4,7 @@
  */
 /* global QUnit */
 
-import { runStdGeometryTests } from '../../qunit-utils';
+import { runStdGeometryTests } from '../../utils/qunit-utils';
 import {
 	DodecahedronBufferGeometry
 } from '../../../../src/geometries/DodecahedronGeometry';

diff --git a/test/unit/src/geometries/IcosahedronGeometry.tests.js b/test/unit/src/geometries/IcosahedronGeometry.tests.js
@@ -4,7 +4,7 @@
  */
 /* global QUnit */
 
-import { runStdGeometryTests } from '../../qunit-utils';
+import { runStdGeometryTests } from '../../utils/qunit-utils';
 import {
 	IcosahedronBufferGeometry
 } from '../../../../src/geometries/IcosahedronGeometry';

diff --git a/test/unit/src/geometries/LatheGeometry.tests.js b/test/unit/src/geometries/LatheGeometry.tests.js
@@ -3,7 +3,7 @@
  */
 /* global QUnit */
 
-import { runStdGeometryTests } from '../../qunit-utils';
+import { runStdGeometryTests } from '../../utils/qunit-utils';
 import {
 	LatheBufferGeometry
 } from '../../../../src/geometries/LatheGeometry';

diff --git a/test/unit/src/geometries/OctahedronGeometry.tests.js b/test/unit/src/geometries/OctahedronGeometry.tests.js
@@ -4,7 +4,7 @@
  */
 /* global QUnit */
 
-import { runStdGeometryTests } from '../../qunit-utils';
+import { runStdGeometryTests } from '../../utils/qunit-utils';
 import {
 	OctahedronBufferGeometry
 } from '../../../../src/geometries/OctahedronGeometry';

diff --git a/test/unit/src/geometries/PlaneGeometry.tests.js b/test/unit/src/geometries/PlaneGeometry.tests.js
@@ -4,7 +4,7 @@
  */
 /* global QUnit */
 
-import { runStdGeometryTests } from '../../qunit-utils';
+import { runStdGeometryTests } from '../../utils/qunit-utils';
 import {
 	PlaneBufferGeometry
 } from '../../../../src/geometries/PlaneGeometry';

diff --git a/test/unit/src/geometries/PolyhedronGeometry.tests.js b/test/unit/src/geometries/PolyhedronGeometry.tests.js
@@ -3,7 +3,7 @@
  */
 /* global QUnit */
 
-import { runStdGeometryTests } from '../../qunit-utils';
+import { runStdGeometryTests } from '../../utils/qunit-utils';
 import {
 	PolyhedronBufferGeometry
 } from '../../../../src/geometries/PolyhedronGeometry';

diff --git a/test/unit/src/geometries/RingGeometry.tests.js b/test/unit/src/geometries/RingGeometry.tests.js
@@ -4,7 +4,7 @@
  */
 /* global QUnit */
 
-import { runStdGeometryTests } from '../../qunit-utils';
+import { runStdGeometryTests } from '../../utils/qunit-utils';
 import {
 	RingBufferGeometry
 } from '../../../../src/geometries/RingGeometry';

diff --git a/test/unit/src/geometries/SphereGeometry.tests.js b/test/unit/src/geometries/SphereGeometry.tests.js
@@ -4,7 +4,7 @@
  */
 /* global QUnit */
 
-import { runStdGeometryTests } from '../../qunit-utils';
+import { runStdGeometryTests } from '../../utils/qunit-utils';
 import {
 	SphereBufferGeometry
 } from '../../../../src/geometries/SphereGeometry';

diff --git a/test/unit/src/geometries/TetrahedronGeometry.tests.js b/test/unit/src/geometries/TetrahedronGeometry.tests.js
@@ -4,7 +4,7 @@
  */
 /* global QUnit */
 
-import { runStdGeometryTests } from '../../qunit-utils';
+import { runStdGeometryTests } from '../../utils/qunit-utils';
 import {
 	TetrahedronBufferGeometry
 } from '../../../../src/geometries/TetrahedronGeometry';

diff --git a/test/unit/src/geometries/TorusGeometry.tests.js b/test/unit/src/geometries/TorusGeometry.tests.js
@@ -4,7 +4,7 @@
  */
 /* global QUnit */
 
-import { runStdGeometryTests } from '../../qunit-utils';
+import { runStdGeometryTests } from '../../utils/qunit-utils';
 import {
 	TorusBufferGeometry
 } from '../../../../src/geometries/TorusGeometry';

diff --git a/test/unit/src/geometries/TorusKnotGeometry.tests.js b/test/unit/src/geometries/TorusKnotGeometry.tests.js
@@ -4,7 +4,7 @@
  */
 /* global QUnit */
 
-import { runStdGeometryTests } from '../../qunit-utils';
+import { runStdGeometryTests } from '../../utils/qunit-utils';
 import {
 	TorusKnotBufferGeometry
 } from '../../../../src/geometries/TorusKnotGeometry';

diff --git a/test/unit/src/helpers/BoxHelper.tests.js b/test/unit/src/helpers/BoxHelper.tests.js
@@ -4,7 +4,7 @@
  */
 /* global QUnit */
 
-import { runStdGeometryTests } from '../../qunit-utils';
+import { runStdGeometryTests } from '../../utils/qunit-utils';
 import { BoxHelper } from '../../../../src/helpers/BoxHelper';
 import { BoxGeometry } from '../../../../src/geometries/BoxGeometry';
 import { SphereGeometry } from '../../../../src/geometries/SphereGeometry';

diff --git a/test/unit/src/lights/AmbientLight.tests.js b/test/unit/src/lights/AmbientLight.tests.js
@@ -4,7 +4,7 @@
  */
 /* global QUnit */
 
-import { runStdLightTests } from '../../qunit-utils';
+import { runStdLightTests } from '../../utils/qunit-utils';
 import { AmbientLight } from '../../../../src/lights/AmbientLight';
 
 export default QUnit.module( 'Lights', () => {

diff --git a/test/unit/src/lights/DirectionalLight.tests.js b/test/unit/src/lights/DirectionalLight.tests.js
@@ -4,7 +4,7 @@
  */
 /* global QUnit */
 
-import { runStdLightTests } from '../../qunit-utils';
+import { runStdLightTests } from '../../utils/qunit-utils';
 import { DirectionalLight } from '../../../../src/lights/DirectionalLight';
 
 export default QUnit.module( 'Lights', () => {

diff --git a/test/unit/src/lights/HemisphereLight.tests.js b/test/unit/src/lights/HemisphereLight.tests.js
@@ -4,7 +4,7 @@
  */
 /* global QUnit */
 
-import { runStdLightTests } from '../../qunit-utils';
+import { runStdLightTests } from '../../utils/qunit-utils';
 import { HemisphereLight } from '../../../../src/lights/HemisphereLight';
 
 export default QUnit.module( 'Lights', () => {

diff --git a/test/unit/src/lights/Light.tests.js b/test/unit/src/lights/Light.tests.js
@@ -3,7 +3,7 @@
  */
 /* global QUnit */
 
-import { runStdLightTests } from '../../qunit-utils';
+import { runStdLightTests } from '../../utils/qunit-utils';
 import { Light } from '../../../../src/lights/Light';
 
 export default QUnit.module( 'Lights', () => {

diff --git a/test/unit/src/lights/PointLight.tests.js b/test/unit/src/lights/PointLight.tests.js
@@ -4,7 +4,7 @@
  */
 /* global QUnit */
 
-import { runStdLightTests } from '../../qunit-utils';
+import { runStdLightTests } from '../../utils/qunit-utils';
 import { PointLight } from '../../../../src/lights/PointLight';
 
 export default QUnit.module( 'Lights', () => {

diff --git a/test/unit/src/lights/RectAreaLight.tests.js b/test/unit/src/lights/RectAreaLight.tests.js
@@ -4,7 +4,7 @@
  */
 /* global QUnit */
 
-import { runStdLightTests } from '../../qunit-utils';
+import { runStdLightTests } from '../../utils/qunit-utils';
 import { RectAreaLight } from '../../../../src/lights/RectAreaLight';
 
 export default QUnit.module( 'Lights', () => {

diff --git a/test/unit/src/lights/SpotLight.tests.js b/test/unit/src/lights/SpotLight.tests.js
@@ -4,7 +4,7 @@
  */
 /* global QUnit */
 
-import { runStdLightTests } from '../../qunit-utils';
+import { runStdLightTests } from '../../utils/qunit-utils';
 import { SpotLight } from '../../../../src/lights/SpotLight';
 
 export default QUnit.module( 'Lights', () => {

diff --git a/test/unit/three.editor.unit.js b/test/unit/three.editor.unit.js
@@ -5,7 +5,7 @@
 // TODO (Itee) Editor is not es6 module so care to include order !!!
 // TODO: all views could not be testable, waiting modular code before implement units tests on them
 
-import './qunit-utils.js';
+import './utils/qunit-utils.js';
 
 //editor
 import './editor/Command.tests';

diff --git a/test/unit/three.example.unit.js b/test/unit/three.example.unit.js
@@ -2,7 +2,7 @@
  * @author TristanVALCKE / https://github.com/Itee
  */
 
-import './qunit-utils.js';
+import './utils/qunit-utils.js';
 
 import './example/utils/BufferGeometryUtils.tests';
 import './example/exporters/GLTFExporter.tests';

diff --git a/test/unit/three.source.unit.js b/test/unit/three.source.unit.js
@@ -2,7 +2,7 @@
  * @author TristanVALCKE / https://github.com/Itee
  */
 
-import './qunit-utils.js';
+import './utils/qunit-utils.js';
 
 //src
 import './src/constants.tests';

diff --git a/test/unit/SmartComparer.js → test/unit/utils/SmartComparer.js b/test/unit/SmartComparer.js → test/unit/utils/SmartComparer.js
diff --git a/test/unit/qunit-utils.js → test/unit/utils/qunit-utils.js b/test/unit/qunit-utils.js → test/unit/utils/qunit-utils.js
@@ -4,7 +4,7 @@
 /* global QUnit */
 
 import { SmartComparer } from './SmartComparer';
-import { ObjectLoader } from '../../src/loaders/ObjectLoader';
+import { ObjectLoader } from '../../../src/loaders/ObjectLoader';
 
 QUnit.assert.success = function ( message ) {