소스 검색

Reorganize exhaustive tests, and add some pauses.

Bentley James Oakes 6 년 전
부모
커밋
352c1fbb6f
4개의 변경된 파일41개의 추가작업 그리고 19개의 파일을 삭제
  1. 0 4
      tests/03_model_test.js
  2. 0 12
      tests/04_toolbar_test.js
  3. 36 0
      tests/50_stress_test.js
  4. 5 3
      tests/model_building_utils.js

+ 0 - 4
tests/03_model_test.js

@@ -27,10 +27,6 @@ module.exports = {
         test_utils.load_model(client, filenames);
     },
 
-    'Load all models' : function (client) {
-        test_utils.getFiles(client, user, '/**/*.model', test_utils.load_model);
-    },
-
     after : function (client) {
         client.end();
     },

+ 0 - 12
tests/04_toolbar_test.js

@@ -18,18 +18,6 @@ module.exports = {
         test_utils.load_toolbar(client, [filename]);
     },
 
-    'Load all toolbars': function (client) {
-
-        console.log("Testing toolbars...");
-        test_utils.getFiles(client, user, '/**/*.buttons.model', test_utils.load_toolbar);
-
-        console.log("Testing metamodels...");
-        test_utils.getFiles(client, user, '/**/*Icons.metamodel', test_utils.load_toolbar);
-
-        console.log("Testing pattern metamodels...");
-        test_utils.getFiles(client, user, '/**/*Icons.pattern.metamodel', test_utils.load_toolbar);
-    },
-
     after: function (client) {
         client.end();
     },

+ 36 - 0
tests/50_stress_test.js

@@ -0,0 +1,36 @@
+let test_utils = require('./test_utils');
+let user = "./users/testuser/";
+
+// performs the long-running and exhaustive tests
+module.exports = {
+
+    beforeEach : function (client) {
+        client.url('http://localhost:8124/atompm').pause(300);
+    },
+
+    'Login' : function (client) {
+        test_utils.login(client);
+    },
+
+    'Load all toolbars': function (client) {
+
+        console.log("Testing toolbars...");
+        test_utils.getFiles(client, user, '/**/*.buttons.model', test_utils.load_toolbar);
+
+        console.log("Testing metamodels...");
+        test_utils.getFiles(client, user, '/**/*Icons.metamodel', test_utils.load_toolbar);
+
+        console.log("Testing pattern metamodels...");
+        test_utils.getFiles(client, user, '/**/*Icons.pattern.metamodel', test_utils.load_toolbar);
+    },
+
+    'Load all models' : function (client) {
+        test_utils.getFiles(client, user, '/**/*.model', test_utils.load_model);
+    },
+
+    after : function (client) {
+        client.end();
+    },
+
+
+};

+ 5 - 3
tests/model_building_utils.js

@@ -195,7 +195,7 @@ function load_model(client, folder_name, model_name) {
         .click(model_name_div);
     client.waitForElementPresent("#dialog_btn", 2000, "Looking for close")
         .click("#dialog_btn");
-    client.waitForElementNotPresent("#dialog_btn", 2000, "Save menu closes");
+    client.waitForElementNotPresent("#dialog_btn", 2000, "Load menu closes");
 
 }
 
@@ -219,8 +219,10 @@ function save_model(client, folder_name, model_name) {
             }
 
             client.waitForElementPresent("#dialog_btn", 2000, "Looking for close")
-                .click("#dialog_btn");
-            client.waitForElementNotPresent("#dialog_btn", 2000, "Save menu closes");
+                .pause(500)
+                .click("#dialog_btn")
+                .pause(500)
+                .waitForElementNotPresent("#dialog_btn", 2000, "Save menu closes");
         }
     );
 }