Merge branch 'main' into test-skip-fabric-v2-2-x-deploy-cc-from-javas…

…cript
hyperledger-cacti · Oct 22, 2021 · c4dddad · c4dddad
2 parents e4b246f + db0941e
commit c4dddad
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
  },
  "scripts": {
  "run-ci": "./tools/ci.sh",
- "reset:node-modules": "del-cli --dry-run '**/node_modules'",
+ "reset:node-modules": "del-cli '**/node_modules'",
  "reset:git": "git clean -f -X",
  "reset:yarn-lock": "del-cli yarn.lock && yarn install --update-checksums --force",
  "reset": "run-s reset:git reset:node-modules reset:yarn-lock configure",

diff --git a/packages/cactus-common/src/main/typescript/strings.ts b/packages/cactus-common/src/main/typescript/strings.ts
@@ -9,10 +9,17 @@ export class Strings {
  return source.replace(new RegExp(searchValue, "gm"), replaceValue);
  }
 
- public static isString(val: any): boolean {
+ public static isString(val: any): val is string {
  return typeof val === "string" || val instanceof String;
  }
 
+ public static isNonBlank(val: unknown): val is string {
+ if (!Strings.isString(val)) {
+ return false;
+ }
+ return val.trim().length > 0;
+ }
+
  public static dropNonPrintable(val: string): string {
  const fnTag = "Strings#dropNonPrintable()";
  Checks.truthy(Strings.isString(val), `${fnTag} Strings.isString(val)`);

diff --git a/...connector-corda/src/test/typescript/integration/deploy-cordapp-jars-to-nodes-v4.8.test.ts b/...connector-corda/src/test/typescript/integration/deploy-cordapp-jars-to-nodes-v4.8.test.ts
@@ -35,7 +35,7 @@ import { K_CACTUS_CORDA_TOTAL_TX_COUNT } from "../../../main/typescript/promethe
 
 const logLevel: LogLevelDesc = "TRACE";
 
-test("Tests are passing on the JVM side", async (t: Test) => {
+test.skip("Tests are passing on the JVM side", async (t: Test) => {
  test.onFailure(async () => {
  await Containers.logDiagnostics({ logLevel });
  });