new command structure

BFergerson · BFergerson · commit c2733975f616 · 2022-02-27T21:36:18.000+01:00
diff --git a/src/test/kotlin/integration/BatchLiveInstrumentCLI.kt b/src/test/kotlin/integration/BatchLiveInstrumentCLI.kt
@@ -39,7 +39,7 @@ class BatchLiveInstrumentCLI : CLIIntegrationTest() {
             Main.main(
                 arrayOf(
                     "-v",
-                    "add-breakpoint",
+                    "add", "breakpoint",
                     "integration.BatchLiveInstrumentCLI", i.toString(),
                 )
             )
@@ -53,7 +53,7 @@ class BatchLiveInstrumentCLI : CLIIntegrationTest() {
         Main.main(
             arrayOf(
                 "-v",
-                "get-instruments"
+                "get", "instruments"
             )
         )
 
@@ -67,7 +67,7 @@ class BatchLiveInstrumentCLI : CLIIntegrationTest() {
             Main.main(
                 arrayOf(
                     "-v",
-                    "remove-instrument",
+                    "remove", "instrument",
                     it.id!!
                 )
             )
diff --git a/src/test/kotlin/integration/CLIIntegrationTest.kt b/src/test/kotlin/integration/CLIIntegrationTest.kt
@@ -35,6 +35,7 @@ abstract class CLIIntegrationTest {
             Main.main(
                 arrayOf(
                     "-v",
+                    "-a", "change-me",
                     "admin",
                     "reset"
                 )
diff --git a/src/test/kotlin/integration/LiveInstrumentCLI.kt b/src/test/kotlin/integration/LiveInstrumentCLI.kt
@@ -37,7 +37,7 @@ class LiveInstrumentCLI : CLIIntegrationTest() {
         Main.main(
             arrayOf(
                 "-v",
-                "add-log",
+                "add", "log",
                 "-h", "100",
                 "integration.LiveInstrumentCLI",
                 "1",
@@ -57,7 +57,7 @@ class LiveInstrumentCLI : CLIIntegrationTest() {
         Main.main(
             arrayOf(
                 "-v",
-                "remove-instrument",
+                "remove", "instrument",
                 addedLiveLog.id!!
             )
         )
@@ -79,7 +79,7 @@ class LiveInstrumentCLI : CLIIntegrationTest() {
         Main.main(
             arrayOf(
                 "-v",
-                "add-breakpoint",
+                "add", "breakpoint",
                 "integration.LiveInstrumentCLI", "2",
             )
         )
@@ -95,7 +95,7 @@ class LiveInstrumentCLI : CLIIntegrationTest() {
         Main.main(
             arrayOf(
                 "-v",
-                "remove-instrument",
+                "remove", "instrument",
                 removedLiveBp.id!!
             )
         )
@@ -116,7 +116,7 @@ class LiveInstrumentCLI : CLIIntegrationTest() {
         Main.main(
             arrayOf(
                 "-v",
-                "add-log",
+                "add", "log",
                 "integration.LiveInstrumentCLI", "4",
                 "getMultipleLiveInstruments"
             )
@@ -132,7 +132,7 @@ class LiveInstrumentCLI : CLIIntegrationTest() {
         Main.main(
             arrayOf(
                 "-v",
-                "add-breakpoint",
+                "add", "breakpoint",
                 "integration.LiveInstrumentCLI", "4",
             )
         )
@@ -146,7 +146,7 @@ class LiveInstrumentCLI : CLIIntegrationTest() {
         Main.main(
             arrayOf(
                 "-v",
-                "get-instruments"
+                "get", "instruments"
             )
         )
         val liveInstruments = toList(interceptor.output.toString(), LiveInstrument::class)
@@ -159,7 +159,7 @@ class LiveInstrumentCLI : CLIIntegrationTest() {
         Main.main(
             arrayOf(
                 "-v",
-                "remove-instrument",
+                "remove", "instrument",
                 addedLiveLog.id!!
             )
         )
@@ -173,7 +173,7 @@ class LiveInstrumentCLI : CLIIntegrationTest() {
         Main.main(
             arrayOf(
                 "-v",
-                "remove-instrument",
+                "remove", "instrument",
                 addedLiveBp.id!!
             )
         )

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class BatchLiveInstrumentCLI : CLIIntegrationTest() {`
`39`	`39`	`Main.main(`
`40`	`40`	`arrayOf(`
`41`	`41`	`"-v",`
`42`		`- "add-breakpoint",`
	`42`	`+ "add", "breakpoint",`
`43`	`43`	`"integration.BatchLiveInstrumentCLI", i.toString(),`
`44`	`44`	`)`
`45`	`45`	`)`
`@@ -53,7 +53,7 @@ class BatchLiveInstrumentCLI : CLIIntegrationTest() {`
`53`	`53`	`Main.main(`
`54`	`54`	`arrayOf(`
`55`	`55`	`"-v",`
`56`		`- "get-instruments"`
	`56`	`+ "get", "instruments"`
`57`	`57`	`)`
`58`	`58`	`)`
`59`	`59`
`@@ -67,7 +67,7 @@ class BatchLiveInstrumentCLI : CLIIntegrationTest() {`
`67`	`67`	`Main.main(`
`68`	`68`	`arrayOf(`
`69`	`69`	`"-v",`
`70`		`- "remove-instrument",`
	`70`	`+ "remove", "instrument",`
`71`	`71`	`it.id!!`
`72`	`72`	`)`
`73`	`73`	`)`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ abstract class CLIIntegrationTest {`
`35`	`35`	`Main.main(`
`36`	`36`	`arrayOf(`
`37`	`37`	`"-v",`
	`38`	`+ "-a", "change-me",`
`38`	`39`	`"admin",`
`39`	`40`	`"reset"`
`40`	`41`	`)`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class LiveInstrumentCLI : CLIIntegrationTest() {`
`37`	`37`	`Main.main(`
`38`	`38`	`arrayOf(`
`39`	`39`	`"-v",`
`40`		`- "add-log",`
	`40`	`+ "add", "log",`
`41`	`41`	`"-h", "100",`
`42`	`42`	`"integration.LiveInstrumentCLI",`
`43`	`43`	`"1",`
`@@ -57,7 +57,7 @@ class LiveInstrumentCLI : CLIIntegrationTest() {`
`57`	`57`	`Main.main(`
`58`	`58`	`arrayOf(`
`59`	`59`	`"-v",`
`60`		`- "remove-instrument",`
	`60`	`+ "remove", "instrument",`
`61`	`61`	`addedLiveLog.id!!`
`62`	`62`	`)`
`63`	`63`	`)`
`@@ -79,7 +79,7 @@ class LiveInstrumentCLI : CLIIntegrationTest() {`
`79`	`79`	`Main.main(`
`80`	`80`	`arrayOf(`
`81`	`81`	`"-v",`
`82`		`- "add-breakpoint",`
	`82`	`+ "add", "breakpoint",`
`83`	`83`	`"integration.LiveInstrumentCLI", "2",`
`84`	`84`	`)`
`85`	`85`	`)`
`@@ -95,7 +95,7 @@ class LiveInstrumentCLI : CLIIntegrationTest() {`
`95`	`95`	`Main.main(`
`96`	`96`	`arrayOf(`
`97`	`97`	`"-v",`
`98`		`- "remove-instrument",`
	`98`	`+ "remove", "instrument",`
`99`	`99`	`removedLiveBp.id!!`
`100`	`100`	`)`
`101`	`101`	`)`
`@@ -116,7 +116,7 @@ class LiveInstrumentCLI : CLIIntegrationTest() {`
`116`	`116`	`Main.main(`
`117`	`117`	`arrayOf(`
`118`	`118`	`"-v",`
`119`		`- "add-log",`
	`119`	`+ "add", "log",`
`120`	`120`	`"integration.LiveInstrumentCLI", "4",`
`121`	`121`	`"getMultipleLiveInstruments"`
`122`	`122`	`)`
`@@ -132,7 +132,7 @@ class LiveInstrumentCLI : CLIIntegrationTest() {`
`132`	`132`	`Main.main(`
`133`	`133`	`arrayOf(`
`134`	`134`	`"-v",`
`135`		`- "add-breakpoint",`
	`135`	`+ "add", "breakpoint",`
`136`	`136`	`"integration.LiveInstrumentCLI", "4",`
`137`	`137`	`)`
`138`	`138`	`)`
`@@ -146,7 +146,7 @@ class LiveInstrumentCLI : CLIIntegrationTest() {`
`146`	`146`	`Main.main(`
`147`	`147`	`arrayOf(`
`148`	`148`	`"-v",`
`149`		`- "get-instruments"`
	`149`	`+ "get", "instruments"`
`150`	`150`	`)`
`151`	`151`	`)`
`152`	`152`	`val liveInstruments = toList(interceptor.output.toString(), LiveInstrument::class)`
`@@ -159,7 +159,7 @@ class LiveInstrumentCLI : CLIIntegrationTest() {`
`159`	`159`	`Main.main(`
`160`	`160`	`arrayOf(`
`161`	`161`	`"-v",`
`162`		`- "remove-instrument",`
	`162`	`+ "remove", "instrument",`
`163`	`163`	`addedLiveLog.id!!`
`164`	`164`	`)`
`165`	`165`	`)`
`@@ -173,7 +173,7 @@ class LiveInstrumentCLI : CLIIntegrationTest() {`
`173`	`173`	`Main.main(`
`174`	`174`	`arrayOf(`
`175`	`175`	`"-v",`
`176`		`- "remove-instrument",`
	`176`	`+ "remove", "instrument",`
`177`	`177`	`addedLiveBp.id!!`
`178`	`178`	`)`
`179`	`179`	`)`