tests (cont/..): update the tests to use the new markdown-template (#794

) * tests: update the tests to use the new markdown-template Signed-off-by: Dan Selman <danscode@selman.org> * WIP: Fix models - add versioning Signed-off-by: Martin Halford <martin@benext.io> * WIP: Fix models Signed-off-by: Martin Halford <martin@benext.io> * test(core): more fixes from live coding Signed-off-by: Matt Roberts <code@rbrts.uk> * Fix more tests Signed-off-by: Martin Halford <martin@benext.io> * Add even more fixes Signed-off-by: Martin Halford <martin@benext.io> * feat(core): remove default runtime + fix tests Signed-off-by: Matt Roberts <code@rbrts.uk> * Fix all remaining tests in cicero-core, plus a couple in cicero-cli. Signed-off-by: Martin Halford <martin@benext.io> * bug(archive): create with metadata with target runtime only when specified Signed-off-by: sanketshevkar <shevkar.sanket@gmail.com> * tests(cli): remove feature tests Signed-off-by: Matt Roberts <code@rbrts.uk> --------- Signed-off-by: Dan Selman <danscode@selman.org> Signed-off-by: Martin Halford <martin@benext.io> Signed-off-by: Matt Roberts <code@rbrts.uk> Signed-off-by: sanketshevkar <shevkar.sanket@gmail.com> Co-authored-by: Dan Selman <danscode@selman.org> Co-authored-by: Matt Roberts <code@rbrts.uk> Co-authored-by: sanketshevkar <shevkar.sanket@gmail.com>
accordproject · Sep 6, 2023 · 73f33ed · 73f33ed
1 parent c9b8e79
commit 73f33ed
Show file tree

Hide file tree

Showing 349 changed files with 23,451 additions and 37,375 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cicero-cli/.cucumber.js b/packages/cicero-cli/.cucumber.js
diff --git a/packages/cicero-cli/index.js b/packages/cicero-cli/index.js
@@ -65,7 +65,7 @@ require('yargs')
         yargs.option('target', {
             describe: 'the target language of the archive',
             type: 'string',
-            default: 'ergo'
+            default: null
         });
         yargs.option('output', {
             describe: 'file name for new archive',

diff --git a/packages/cicero-cli/lib/commands.js b/packages/cicero-cli/lib/commands.js
@@ -102,18 +102,14 @@ class Commands {
      * @returns {object} a modfied argument object
      */
     static validateArchiveArgs(argv) {
-        argv = Commands.validateCommonArgs(argv);
-
-        argv.target = 'cicero';
-
-        return argv;
+        return Commands.validateCommonArgs(argv);
     }
 
     /**
      * Create an archive using a template
      *
      * @param {string} templatePath - path to the template directory or archive
-     * @param {string} target - target language for the archive (should be either 'ergo' or 'cicero')
+     * @param {string} target - target language for the archive
      * @param {string} outputPath - to the archive file
      * @param {Object} [options] - an optional set of options
      * @returns {object} Promise to the code creating an archive

diff --git a/packages/cicero-cli/package.json b/packages/cicero-cli/package.json
@@ -18,9 +18,8 @@
     "lint": "eslint .",
     "postlint": "npm run licchk",
     "licchk": "license-check-and-add check -f ../../license.config.json",
-    "test:cucumber": "cucumber-js test/features --require .cucumber.js --world-parameters \"{\\\"rootdir\\\":\\\"./test\\\"}\"",
     "test:mocha": "mocha --timeout 30000",
-    "test:all": "npm run test:mocha && npm run test:cucumber",
+    "test:all": "npm run test:mocha",
     "test:windows": "npm run test:all",
     "test:cov": "nyc npm run test",
     "test": "npm run test:all"
@@ -53,7 +52,6 @@
     "chai": "4.3.7",
     "chai-as-promised": "7.1.1",
     "chai-things": "0.2.0",
-    "cucumber": "5.1.0",
     "eslint": "^8.43.0",
     "jsdoc": "^4.0.2",
     "license-check-and-add": "4.0.5",

diff --git a/packages/cicero-cli/test/cli.js b/packages/cicero-cli/test/cli.js
@@ -173,7 +173,7 @@ describe('#archive', async () => {
         const options = {
             keystore: keystore
         };
-        const result = await Commands.archive(template, 'ergo', archiveName, options);
+        const result = await Commands.archive(template, null, archiveName, options);
         result.should.eql(true);
         const newTemplate = await Template.fromArchive(fs.readFileSync(archiveName));
         newTemplate.should.not.be.null;

diff --git a/packages/cicero-cli/test/data/helloemit/logic/logic.ergo b/packages/cicero-cli/test/data/helloemit/logic/logic.ergo
diff --git a/...ordproject.org.accordproject.contract.cto → ...ject.org.accordproject.contract@0.2.0.cto b/...ordproject.org.accordproject.contract.cto → ...ject.org.accordproject.contract@0.2.0.cto
@@ -12,9 +12,9 @@
  * limitations under the License.
  */
 
-concerto version ">= 1.0.0"
+concerto version "^3.0.0"
 
-namespace org.accordproject.contract
+namespace org.accordproject.contract@0.2.0
 
 /**
  * Contract Data

diff --git a/...cordproject.org.accordproject.runtime.cto → ...oject.org.accordproject.runtime@0.2.0.cto b/...cordproject.org.accordproject.runtime.cto → ...oject.org.accordproject.runtime@0.2.0.cto
@@ -12,11 +12,11 @@
  * limitations under the License.
  */
 
-concerto version ">= 1.0.0"
+concerto version "^3.0.0"
 
-namespace org.accordproject.runtime
+namespace org.accordproject.runtime@0.2.0
 
-import org.accordproject.contract.Contract from https://models.accordproject.org/accordproject/contract.cto
+import org.accordproject.contract@0.2.0.Contract from https://models.accordproject.org/accordproject/contract@0.2.0.cto
 
 /**
  * Runtime API

diff --git a/packages/cicero-cli/test/data/helloemit/model/model.cto b/packages/cicero-cli/test/data/helloemit/model/model.cto
@@ -1,7 +1,18 @@
-namespace org.accordproject.helloemit
+namespace org.accordproject.helloemit@1.0.0
 
-import org.accordproject.contract.* from https://models.accordproject.org/accordproject/contract.cto
-import org.accordproject.runtime.* from https://models.accordproject.org/accordproject/runtime.cto
+import org.accordproject.contract@0.2.0.{Clause, Contract} from https://models.accordproject.org/accordproject/contract@0.2.0.cto
+import org.accordproject.runtime@0.2.0.{Request, Response, State, Obligation} from https://models.accordproject.org/accordproject/runtime@0.2.0.cto
+
+/**
+ * The template model
+ */
+@template
+asset TemplateModel extends Clause {
+  /**
+   * The name for the clause
+   */
+  o String name
+}
 
 transaction MyRequest extends Request {
   o String input
@@ -14,13 +25,3 @@ transaction MyResponse extends Response {
 event Greeting {
   o String message
 }
-
-/**
- * The template model
- */
-asset TemplateModel extends Clause {
-  /**
-   * The name for the clause
-   */
-  o String name
-}
diff --git a/packages/cicero-cli/test/data/helloemit/request.json b/packages/cicero-cli/test/data/helloemit/request.json
@@ -1,4 +1,4 @@
 {
-    "$class": "org.accordproject.helloemit.MyRequest",
+    "$class": "org.accordproject.helloemit@1.0.0.MyRequest",
     "input": "World"
 }
diff --git a/packages/cicero-cli/test/data/helloworldstate/data.json b/packages/cicero-cli/test/data/helloworldstate/data.json
diff --git a/packages/cicero-cli/test/data/helloworldstate/logic/logic.ergo b/packages/cicero-cli/test/data/helloworldstate/logic/logic.ergo
diff --git a/...ordproject.org.accordproject.contract.cto → ...ject.org.accordproject.contract@0.2.0.cto b/...ordproject.org.accordproject.contract.cto → ...ject.org.accordproject.contract@0.2.0.cto
@@ -12,9 +12,9 @@
  * limitations under the License.
  */
 
-concerto version ">= 1.0.0"
+concerto version "^3.0.0"
 
-namespace org.accordproject.contract
+namespace org.accordproject.contract@0.2.0
 
 /**
  * Contract Data

diff --git a/...cordproject.org.accordproject.runtime.cto → ...oject.org.accordproject.runtime@0.2.0.cto b/...cordproject.org.accordproject.runtime.cto → ...oject.org.accordproject.runtime@0.2.0.cto
@@ -12,11 +12,11 @@
  * limitations under the License.
  */
 
-concerto version ">= 1.0.0"
+concerto version "^3.0.0"
 
-namespace org.accordproject.runtime
+namespace org.accordproject.runtime@0.2.0
 
-import org.accordproject.contract.Contract from https://models.accordproject.org/accordproject/contract.cto
+import org.accordproject.contract@0.2.0.Contract from https://models.accordproject.org/accordproject/contract@0.2.0.cto
 
 /**
  * Runtime API

diff --git a/...@models.accordproject.org.money@0.2.0.cto → ...@models.accordproject.org.money@0.2.0.cto b/...@models.accordproject.org.money@0.2.0.cto → ...@models.accordproject.org.money@0.2.0.cto
diff --git a/...project.org.accordproject.money@0.2.0.cto → ...@models.accordproject.org.money@0.3.0.cto b/...project.org.accordproject.money@0.2.0.cto → ...@models.accordproject.org.money@0.3.0.cto
@@ -11,8 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+concerto version "^3.0.0"
 
-namespace org.accordproject.money
+namespace org.accordproject.money@0.3.0
 
 /**
  * Represents an amount of Cryptocurrency

diff --git a/.../@models.accordproject.org.time@0.2.0.cto → .../@models.accordproject.org.time@0.2.0.cto b/.../@models.accordproject.org.time@0.2.0.cto → .../@models.accordproject.org.time@0.2.0.cto
diff --git a/.../@models.accordproject.org.time@0.2.0.cto → .../@models.accordproject.org.time@0.3.0.cto b/.../@models.accordproject.org.time@0.2.0.cto → .../@models.accordproject.org.time@0.3.0.cto
@@ -11,8 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+concerto version "^3.0.0"
 
-namespace org.accordproject.time
+namespace org.accordproject.time@0.3.0
 
 /**
  * Months of the year

diff --git a/packages/cicero-cli/test/data/helloworldstate/model/model.cto b/packages/cicero-cli/test/data/helloworldstate/model/model.cto
@@ -1,7 +1,7 @@
-namespace org.accordproject.helloworldstate
+namespace org.accordproject.helloworldstate@1.0.0
 
-import org.accordproject.contract.* from https://models.accordproject.org/accordproject/contract.cto
-import org.accordproject.runtime.* from https://models.accordproject.org/accordproject/runtime.cto
+import org.accordproject.contract@0.2.0.{Clause, Contract} from https://models.accordproject.org/accordproject/contract@0.2.0.cto
+import org.accordproject.runtime@0.2.0.{Request, Response, State} from https://models.accordproject.org/accordproject/runtime@0.2.0.cto
 
 transaction MyRequest extends Request {
   o String input
@@ -18,6 +18,7 @@ asset HelloWorldState extends State {
 /**
  * The template model
  */
+@template
 asset HelloWorldClause extends Clause {
   /**
    * The name for the clause

diff --git a/packages/cicero-cli/test/data/helloworldstate/package.json b/packages/cicero-cli/test/data/helloworldstate/package.json
@@ -1,13 +1 @@
-{
-    "name": "helloworldstate",
-    "displayName": "Hello World State",
-    "version": "0.14.0",
-    "description": "This is the stateful Hello World of Accord Project Templates. Executing the clause will simply echo back the text that occurs after the string `Hello` prepended to text that is passed in the request along with the number of times the clause has been called.",
-    "author": "Accord Project",
-    "license": "Apache-2.0",
-    "accordproject": {
-        "template": "clause",
-        "cicero": "^0.24.0"
-    },
-    "keywords": ["hello", "world", "greet"]
-}
+{"name":"helloworldstate","displayName":"Hello World State","version":"0.14.0","description":"This is the stateful Hello World of Accord Project Templates. Executing the clause will simply echo back the text that occurs after the string `Hello` prepended to text that is passed in the request along with the number of times the clause has been called.","author":"Accord Project","license":"Apache-2.0","accordproject":{"template":"clause","cicero":"^0.24.0"},"keywords":["hello","world","greet"]}
diff --git a/packages/cicero-cli/test/data/helloworldstate/params.json b/packages/cicero-cli/test/data/helloworldstate/params.json
diff --git a/packages/cicero-cli/test/data/helloworldstate/request.json b/packages/cicero-cli/test/data/helloworldstate/request.json
@@ -1,4 +1 @@
-{
-    "$class": "org.accordproject.helloworldstate.MyRequest",
-    "input": "Accord Project"
-}
+{"$class":"org.accordproject.helloworldstate.MyRequest","input":"Accord Project"}
diff --git a/packages/cicero-cli/test/data/helloworldstate/state.json b/packages/cicero-cli/test/data/helloworldstate/state.json
diff --git a/packages/cicero-cli/test/data/helloworldstate@0.14.0.cta b/packages/cicero-cli/test/data/helloworldstate@0.14.0.cta
diff --git a/packages/cicero-cli/test/data/installment-sale-ergo/logic/logic.ergo b/packages/cicero-cli/test/data/installment-sale-ergo/logic/logic.ergo
diff --git a/packages/cicero-cli/test/data/installment-sale-ergo/model/model.cto b/packages/cicero-cli/test/data/installment-sale-ergo/model/model.cto
@@ -1,8 +1,9 @@
-namespace org.accordproject.installmentsale
+namespace org.accordproject.installmentsale@1.0.0
+
+import org.accordproject.contract@0.2.0.Contract from https://models.accordproject.org/accordproject/contract@0.2.0.cto
+import org.accordproject.runtime@0.2.0.{Request, Response, Obligation, State} from https://models.accordproject.org/accordproject/runtime@0.2.0.cto
+import org.accordproject.money@0.3.0.MonetaryAmount from https://models.accordproject.org/money@0.3.0.cto
 
-import org.accordproject.contract.* from https://models.accordproject.org/accordproject/contract.cto
-import org.accordproject.runtime.* from https://models.accordproject.org/accordproject/runtime.cto
-import org.accordproject.money.MonetaryAmount from https://models.accordproject.org/money@0.2.0.cto
 
 transaction Installment extends Request {
   o Double amount
@@ -47,6 +48,7 @@ asset InstallmentSaleState extends State {
 /**
  * The template model
  */
+@template
 asset InstallmentSaleContract extends Contract {
   o String BUYER
 	o String SELLER