Lab hardcoded: Move answers into JavaScript

david-a-wheeler · david-a-wheeler · commit 00b6488a83cb · 2025-01-29T16:19:46.000-05:00
Signed-off-by: David A. Wheeler &lt;dwheeler@dwheeler.com&gt;
diff --git a/docs/labs/hardcoded.html b/docs/labs/hardcoded.html
@@ -11,20 +11,6 @@
 <link rel="license" href="https://creativecommons.org/licenses/by/4.0/">
 
 <!-- See create_labs.md for how to create your own lab! -->
-
-<!-- Sample expected answer -->
-<script id="expected0" type="plain/text">
-conn = DriverManager.getConnection(url,
-    System.getenv("USERNAME"), System.getenv("PASSWORD"));
-</script>
-
-<!-- Full pattern of correct answer -->
-<script id="correct0" type="plain/text">
-\s* conn = DriverManager \. getConnection \( url \,
-  System \. getenv \( "USERNAME" \) \,
-  System \. getenv \( "PASSWORD" \) \) \; \s*
-</script>
-
 </head>
 <body>
 <!-- For GitHub Pages formatting: -->
diff --git a/docs/labs/hardcoded.js b/docs/labs/hardcoded.js
@@ -47,5 +47,14 @@ info =
   System \. getenv \( "USERNAME" \) \) \; \s* $`,
       text: "The order of parameters is wrong. Provide the url, then the username, then the password. You're providing the url, then the password, then the username, which swaps the second and third parameters."
     }
-  ]
+  ],
+  expected: [
+    `conn = DriverManager.getConnection(url,
+      System.getenv("USERNAME"), System.getenv("PASSWORD"));`
+  ],
+  correct: [
+    String.raw`\s* conn = DriverManager \. getConnection \( url \,
+      \s* System \. getenv \( "USERNAME" \) \,
+      \s* System \. getenv \( "PASSWORD" \) \) \; \s*`
+  ],
 }
