#126 and #127, extracts ExpressApp, AddDevice UI fixes

Add a few API tests to Server (they work, but the request/responses are not always closed nicely).

Unit testing is setup correctly now.

Remove /docs/ (not needed).

Remove .gitmodules (not used)

Fix UI updates not running on UI thread for AddDevice activity (occurred when trying to run a second connection attempt).

.github/workflows/jekyll-gh-pages.yml

@@ -38,7 +38,7 @@ jobs:
         with:
           source_dir: ./Server/src
           recurse: true
-          template: better-docs
+          template: minami
           output_dir: ./Documents/Dev/Server
           front_page: ./Server/Readme.md
       - name: Build with Jekyll

Client/Android/app/src/main/java/com/neptune/app/AddDeviceActivity.java

@@ -229,17 +229,21 @@ public void addServerToList(MDNSResolver.NeptuneService server) {
             dialog.dismiss();
             new Thread(() -> {
                 // Add server
-                hideOrShowImageButtonProgressBar(serverSyncButton, serverSyncProgress, false);
-                serverSyncIssueButton.setVisibility(View.GONE);
+                runOnUiThread(() -> {
+                    hideOrShowImageButtonProgressBar(serverSyncButton, serverSyncProgress, false);
+                    serverSyncIssueButton.setVisibility(View.GONE);
+                });
                 Log.i("AddDeviceActivity", "Adding  " + server.friendlyName);
                 boolean added = addServer(server);
 
                 if (added) {
                     runOnUiThread(() -> showErrorMessage("Server added", server.friendlyName + " has successfully been paired."));
                     removeServer(server.serverId); // We added it, remove it!
                 } else {
-                    hideOrShowImageButtonProgressBar(serverSyncIssueButton, serverSyncProgress, true);
-                    serverSyncButton.setVisibility(View.GONE);
+                    runOnUiThread(() -> {
+                        hideOrShowImageButtonProgressBar(serverSyncIssueButton, serverSyncProgress, true);
+                        serverSyncButton.setVisibility(View.GONE);
+                    });
                 }
             }).start();
         };
@@ -262,8 +266,10 @@ public void addServerToList(MDNSResolver.NeptuneService server) {
                 });
 
             } catch (Exception e) {
-                hideOrShowImageButtonProgressBar(serverSyncIssueButton, serverSyncProgress, true);
-                runOnUiThread(() -> serverSyncButton.setVisibility(View.GONE));
+                runOnUiThread(() -> {
+                    hideOrShowImageButtonProgressBar(serverSyncIssueButton, serverSyncProgress, true);
+                    serverSyncButton.setVisibility(View.GONE);
+                });
                 e.printStackTrace();
             }
         }).start();

Server/.gitignore

@@ -3,6 +3,8 @@
 /dist/
 /deploy/
 /tests/coverage/
+/tests/logs/
+/tests/data/
 
 /data/
 /logs/

Server/jest.config.js

@@ -2,8 +2,10 @@
  * For a detailed explanation regarding each configuration property, visit:
  * https://jestjs.io/docs/configuration
  */
-
+ 
 module.exports = {
+  testTimeout: 30000, // API (HTTP) can take up to 30 seconds!
+
   // All imported modules in your tests should be mocked automatically
   // automock: false,
 
@@ -65,7 +67,8 @@ module.exports = {
   globalTeardown: "./tests/JestTeardown.js",
 
   // A set of global variables that need to be available in all test environments
-  // globals: {},
+  globals: {
+  },
 
   // The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
   // maxWorkers: "50%",
@@ -106,7 +109,7 @@ module.exports = {
   // projects: undefined,
 
   // Use this configuration option to add custom reporters to Jest
-  // reporters: undefined,
+  // reporters: ["default", "./tests/JestTestReporter.js"],
 
   // Automatically reset mock state before every test
   // resetMocks: false,
@@ -135,7 +138,7 @@ module.exports = {
   // setupFiles: [],
 
   // A list of paths to modules that run some code to configure or set up the testing framework before each test
-  // setupFilesAfterEnv: [],
+  setupFilesAfterEnv: ["./tests/JestSetupEachTest.js"],
 
   // The number of seconds after which a test is considered as slow and reported as such in the results.
   // slowTestThreshold: 5,