{WIP, NOK} attempt, but failed, to fix double escaping problem (#92)

OASIS-learn-study · Aug 20, 2018 · 2270719 · 2270719
1 parent 33bf22b
commit 2270719
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/api/src/main/typescript/observable-wrapper.ts b/api/src/main/typescript/observable-wrapper.ts
@@ -25,7 +25,7 @@ export class Minecraft {
 
   runCommand(code: string, command: string): Observable<void> {
     return Observable.create(observer => {
-      this.eb.send(this.address, {"code": code, "command": command}, {"action":"runCommand"}, this.handler(observer));
+      this.eb.send(this.address, {"code": code, "command": this.escapeQuotes(command) }, {"action":"runCommand"}, this.handler(observer));
     });
   }
 
@@ -46,6 +46,12 @@ export class Minecraft {
       };
     };
   }
+
+  private escapeQuotes(text: string): string {
+    // see https://github.com/vorburger/minecraft-storeys-maker/issues/92
+    // TODO find the right expression and then replace it with text.replace(new RegExp(..., 'g'), '\\"');
+    return text.replace('\"', '\\"');
+  }
 }
 
 export enum HandType {

diff --git a/web/src/test/java/ch/vorburger/minecraft/storeys/web/SeleniumTest.java b/web/src/test/java/ch/vorburger/minecraft/storeys/web/SeleniumTest.java
@@ -159,11 +159,19 @@ public void e_testNegativeAPI() {
     }
 
     @Test
-    public void e_testPositiveAPI() {
+    public void f_testPositiveAPI() {
         testMinecraft.itemsHeld.put(HandType.MainHand, ItemType.Apple);
         assertThat(runTesterJSAndGetFailures().isEmpty());
     }
 
+    @Test
+    public void g_testEncoding() {
+        // Test encoding problems, see https://github.com/vorburger/minecraft-storeys-maker/issues/92
+        String nonTrivialCommand = "give michaelpapa7 written_book 1 0 {pages:[\"{\\\"text\\\":\\\"Hello\\\"}\"],title:\"First Quest\",author:\"https://www.learn.study\",display:{Lore:[\"The first quest is your first test...\"]}}";
+        testEventBusCall("minecraftCommand", nonTrivialCommand);
+        assertThat(testMinecraft.ranCommands).contains(nonTrivialCommand);
+    }
+
     // TODO testWhenCommand
 
     // TODO testAllOtherBlocks...