From a39e43dbc0bc21010ed7648b379d7d4a418aade6 Mon Sep 17 00:00:00 2001
From: Kevin Schneider <schneider.kev@outlook.de>
Date: Tue, 27 Feb 2024 15:00:29 +0100
Subject: [PATCH] update test packages and invenio package to create arc spec
 v2 compliant output folders

---
 .../Data/arc-validate-package-index.json        | 10 +++++-----
 .../Pages/Components/Footer.cs                  |  3 ++-
 .../StagingArea/invenio/invenio@1.0.0.fsx       | 15 ++++++---------
 .../StagingArea/test/test@1.0.0.fsx             | 17 ++++++++++++++++-
 .../StagingArea/test/test@1.0.1.fsx             | 17 ++++++++++++++++-
 .../StagingArea/test/test@2.0.0.fsx             | 17 ++++++++++++++++-
 .../StagingArea/test/test@3.0.0.fsx             | 17 ++++++++++++++++-
 7 files changed, 77 insertions(+), 19 deletions(-)

diff --git a/src/PackageRegistryService/Data/arc-validate-package-index.json b/src/PackageRegistryService/Data/arc-validate-package-index.json
index 0b688b8..2409047 100644
--- a/src/PackageRegistryService/Data/arc-validate-package-index.json
+++ b/src/PackageRegistryService/Data/arc-validate-package-index.json
@@ -2,7 +2,7 @@
   {
     "RepoPath": "src/PackageRegistryService/StagingArea/invenio/invenio@1.0.0.fsx",
     "FileName": "invenio@1.0.0.fsx",
-    "LastUpdated": "2024-02-23T16:27:26+01:00",
+    "LastUpdated": "2024-02-27T15:00:31+01:00",
     "Metadata": {
       "Name": "invenio",
       "Description": "Validates if the ARC contains the necessary metadata to be publishable via Invenio.\nThe following metadata is required:\n    - Investigation has title and description\n    - All persons in Investigation Contacts must have a name, last name, affiliation and valid email\n",
@@ -28,7 +28,7 @@
   {
     "RepoPath": "src/PackageRegistryService/StagingArea/test/test@1.0.0.fsx",
     "FileName": "test@1.0.0.fsx",
-    "LastUpdated": "2024-02-22T09:00:17+01:00",
+    "LastUpdated": "2024-02-27T15:00:31+01:00",
     "Metadata": {
       "Name": "test",
       "Description": "this package is here for testing purposes only.",
@@ -44,7 +44,7 @@
   {
     "RepoPath": "src/PackageRegistryService/StagingArea/test/test@1.0.1.fsx",
     "FileName": "test@1.0.1.fsx",
-    "LastUpdated": "2024-02-22T09:00:17+01:00",
+    "LastUpdated": "2024-02-27T15:00:31+01:00",
     "Metadata": {
       "Name": "test",
       "Description": "this package is here for testing purposes only.",
@@ -60,7 +60,7 @@
   {
     "RepoPath": "src/PackageRegistryService/StagingArea/test/test@2.0.0.fsx",
     "FileName": "test@2.0.0.fsx",
-    "LastUpdated": "2024-02-22T09:00:17+01:00",
+    "LastUpdated": "2024-02-27T15:00:31+01:00",
     "Metadata": {
       "Name": "test",
       "Description": "this package is here for testing purposes only.",
@@ -93,7 +93,7 @@
   {
     "RepoPath": "src/PackageRegistryService/StagingArea/test/test@3.0.0.fsx",
     "FileName": "test@3.0.0.fsx",
-    "LastUpdated": "2024-02-22T09:00:17+01:00",
+    "LastUpdated": "2024-02-27T15:00:31+01:00",
     "Metadata": {
       "Name": "test",
       "Description": "this package is here for testing purposes only.",
diff --git a/src/PackageRegistryService/Pages/Components/Footer.cs b/src/PackageRegistryService/Pages/Components/Footer.cs
index 4bf88f7..7ebdef2 100644
--- a/src/PackageRegistryService/Pages/Components/Footer.cs
+++ b/src/PackageRegistryService/Pages/Components/Footer.cs
@@ -18,7 +18,8 @@ static string RenderFooterItem(string active, string item, string link)
 
         public static string Render(string active) 
         {
-            return $@"<footer style=""margin-top: 100px"" class=""container"">
+            return $@"<footer style=""margin-top: 200px"" class=""container"">
+  <hr/>
   <div class=""grid"">
     <div>
       <small><strong>AVPR - a service by <a class=""secondary"" href=""https://nfdi4plants.org/"">DataPLANT</a></strong></small>
diff --git a/src/PackageRegistryService/StagingArea/invenio/invenio@1.0.0.fsx b/src/PackageRegistryService/StagingArea/invenio/invenio@1.0.0.fsx
index 8ea665d..4931e03 100644
--- a/src/PackageRegistryService/StagingArea/invenio/invenio@1.0.0.fsx
+++ b/src/PackageRegistryService/StagingArea/invenio/invenio@1.0.0.fsx
@@ -20,26 +20,19 @@ ReleaseNotes: "Initial release"
 ---
 *)
 
-#r "nuget: ARCExpect"
-#r "nuget: Anybadge.NET"
-#r "nuget: ARCValidationPackages"
+#r "nuget: ARCExpect, 1.0.1"
 
 open ARCExpect
 open ARCTokenization
 open ARCTokenization.StructuralOntology
 open ControlledVocabulary
 open Expecto
-open ARCValidationPackages
-open ARCValidationPackages.API
 open System.IO
 
 
 // Input:
 
 let arcDir = Directory.GetCurrentDirectory()
-let outDirBadge = Path.Combine(arcDir, "invenio_badge.svg")
-let outDirResXml = Path.Combine(arcDir, "invenio_results.xml")
-
 
 // Values:
 
@@ -116,4 +109,8 @@ let cases =
 
 // Execution:
 
-Execute.ValidationPipeline(outDirResXml, outDirBadge, "Invenio") cases
\ No newline at end of file
+cases
+|> Execute.ValidationPipeline(
+    basePath = arcDir,
+    packageName = "invenio"
+)
\ No newline at end of file
diff --git a/src/PackageRegistryService/StagingArea/test/test@1.0.0.fsx b/src/PackageRegistryService/StagingArea/test/test@1.0.0.fsx
index bc64316..c04d692 100644
--- a/src/PackageRegistryService/StagingArea/test/test@1.0.0.fsx
+++ b/src/PackageRegistryService/StagingArea/test/test@1.0.0.fsx
@@ -10,4 +10,19 @@ Publish: true
 *)
 
 // this file is intended for testing purposes only.
-printfn "Hello, world!" 
\ No newline at end of file
+printfn "If you can read this in your console, you successfully executed test package v1.0.0!" 
+
+#r "nuget: ARCExpect, 1.0.1"
+
+open ARCExpect
+open Expecto
+
+let validationCases = testList "test" [
+    test "yes" {Expect.equal 1 1 "yes"}
+]
+
+validationCases
+|> Execute.ValidationPipeline(
+    basePath = System.Environment.CurrentDirectory,
+    packageName = "test"
+)
\ No newline at end of file
diff --git a/src/PackageRegistryService/StagingArea/test/test@1.0.1.fsx b/src/PackageRegistryService/StagingArea/test/test@1.0.1.fsx
index 82817c5..d1834c0 100644
--- a/src/PackageRegistryService/StagingArea/test/test@1.0.1.fsx
+++ b/src/PackageRegistryService/StagingArea/test/test@1.0.1.fsx
@@ -10,4 +10,19 @@ Publish: true
 *)
 
 // this file is intended for testing purposes only.
-printfn "Hello, world!" 
\ No newline at end of file
+printfn "If you can read this in your console, you successfully executed test package v1.0.1!" 
+
+#r "nuget: ARCExpect, 1.0.1"
+
+open ARCExpect
+open Expecto
+
+let validationCases = testList "test" [
+    test "yes" {Expect.equal 1 1 "yes"}
+]
+
+validationCases
+|> Execute.ValidationPipeline(
+    basePath = System.Environment.CurrentDirectory,
+    packageName = "test"
+)
\ No newline at end of file
diff --git a/src/PackageRegistryService/StagingArea/test/test@2.0.0.fsx b/src/PackageRegistryService/StagingArea/test/test@2.0.0.fsx
index 5331b48..b8e9f96 100644
--- a/src/PackageRegistryService/StagingArea/test/test@2.0.0.fsx
+++ b/src/PackageRegistryService/StagingArea/test/test@2.0.0.fsx
@@ -24,4 +24,19 @@ ReleaseNotes: "add authors and tags for further testing"
 *)
 
 // this file is intended for testing purposes only.
-printfn "Hello, world!" 
\ No newline at end of file
+printfn "If you can read this in your console, you successfully executed test package v2.0.0!" 
+
+#r "nuget: ARCExpect, 1.0.1"
+
+open ARCExpect
+open Expecto
+
+let validationCases = testList "test" [
+    test "yes" {Expect.equal 1 1 "yes"}
+]
+
+validationCases
+|> Execute.ValidationPipeline(
+    basePath = System.Environment.CurrentDirectory,
+    packageName = "test"
+)
\ No newline at end of file
diff --git a/src/PackageRegistryService/StagingArea/test/test@3.0.0.fsx b/src/PackageRegistryService/StagingArea/test/test@3.0.0.fsx
index 2286d4d..814df96 100644
--- a/src/PackageRegistryService/StagingArea/test/test@3.0.0.fsx
+++ b/src/PackageRegistryService/StagingArea/test/test@3.0.0.fsx
@@ -24,4 +24,19 @@ ReleaseNotes: "add authors and tags for further testing"
 *)
 
 // this file is intended for testing purposes only.
-printfn "If you can read this in your console, you successfully executed test package v3.0.0!" 
\ No newline at end of file
+printfn "If you can read this in your console, you successfully executed test package v3.0.0!" 
+
+#r "nuget: ARCExpect, 1.0.1"
+
+open ARCExpect
+open Expecto
+
+let validationCases = testList "test" [
+    test "yes" {Expect.equal 1 1 "yes"}
+]
+
+validationCases
+|> Execute.ValidationPipeline(
+    basePath = System.Environment.CurrentDirectory,
+    packageName = "test"
+)
\ No newline at end of file