Fix direction of rmem parse sigils

* means ok, : means not.

Also made the tests a bit more DRY.

Author: MattWindsor91

internal/serviceimpl/backend/herdstyle/parser/parser_test.go

@@ -11,8 +11,10 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 
+	"github.com/1set/gut/yos"
 	"github.com/MattWindsor91/c4t/internal/serviceimpl/backend/herdstyle/rmem"
 
 	"github.com/stretchr/testify/require"
@@ -63,21 +65,37 @@ func TestParse_error(t *testing.T) {
 func TestParse_valid(t *testing.T) {
 	t.Parallel()
 
-	cases := map[string]parser.Impl{
-		"herd-ok-small":         herd.Herd{},
-		"rmem-ok-unsat-partial": rmem.Rmem{},
-	}
+	fs, err := yos.ListMatch(filepath.Join("testdata", "valid"), yos.ListIncludeFile, "*.json")
+	require.NoError(t, err, "testdata listing shouldn't fail")
+
+	for _, f := range fs {
+		path := f.Path
+		pprefix := strings.TrimSuffix(path, ".json")
+		name := filepath.Base(pprefix)
 
-	for name, c := range cases {
-		name, c := name, c
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
-			f, err := os.Open(filepath.Join("testdata", "valid", name+".txt"))
+			pfields := strings.SplitN(name, "-", 2)
+			require.NotEmpty(t, pfields, "malformed test name, should be 'type-*.json'")
+
+			var c parser.Impl
+			switch pfields[0] {
+			case "herd":
+				c = herd.Herd{}
+			case "litmus":
+				c = litmus.Litmus{}
+			case "rmem":
+				c = rmem.Rmem{}
+			default:
+				require.Failf(t, "unsupported parser subtype", "got %q", pfields[0])
+			}
+
+			f, err := os.Open(pprefix + ".txt")
 			require.NoError(t, err, "missing input file")
 			defer func() { _ = f.Close() }()
 
-			out, err := ioutil.ReadFile(filepath.Join("testdata", "valid", name+".json"))
+			out, err := ioutil.ReadFile(path)
 			require.NoError(t, err, "missing output file")
 
 			o := new(obs.Obs)

internal/serviceimpl/backend/herdstyle/parser/testdata/valid/rmem-ok-unsat-partial.json renamed to internal/serviceimpl/backend/herdstyle/parser/testdata/valid/rmem-no-partial.json

@@ -29,7 +29,7 @@
       "t0r0": "0"
     }
   ],
-  "witnesses": [
+  "counter_examples": [
     {
       "y": "0",
       "x": "1",
@@ -43,7 +43,7 @@
       "t0r0": "0"
     }
   ],
-  "counter_examples": [
+  "witnesses": [
     {
       "y": "1",
       "x": "1",

internal/serviceimpl/backend/herdstyle/parser/testdata/valid/rmem-ok-unsat-partial.txt renamed to internal/serviceimpl/backend/herdstyle/parser/testdata/valid/rmem-no-partial.txt

@@ -0,0 +1,17 @@
+{
+  "flags": [
+    "sat"
+  ],
+  "witnesses": [
+    {
+      "t0r0": "1",
+      "x": "1"
+    }
+  ],
+  "states": [
+    {
+      "t0r0": "1",
+      "x": "1"
+    }
+  ]
+}

internal/serviceimpl/backend/herdstyle/parser/testdata/valid/rmem-ok-small.json

@@ -0,0 +1,10 @@
+Test test_0 Required
+Memory-writes=
+States 1
+2     *>x=1; t0r0=1;  via "0;0;0;0"
+Unhandled exceptions 0
+Ok
+Condition forall (x=1 /\ t0r0=1)
+Hash=f4ff57c0c324471586adc4e4cab40264
+Observation test_0 Always 1 0
+Runtime: 0.179883 sec

internal/serviceimpl/backend/herdstyle/parser/testdata/valid/rmem-ok-small.txt

@@ -22,9 +22,9 @@ func (Rmem) ParseStateLine(_ parser.TestType, fields []string) (*parser.StateLin
 	// Rmem's state line syntax is similar to that of Litmus's, but with a few gotchas:
 	//
 	// - Asterisks always represent witnesses, not 'interesting' cases; this means we always parse as if the test type
-	//   is 'required';
+	//   is 'allowed';
 	// - State lines contain a 'via "XYZ"' line, which we need to scrub.
-	return litmus.Litmus{}.ParseStateLine(parser.Required, stripVia(fields))
+	return litmus.Litmus{}.ParseStateLine(parser.Allowed, stripVia(fields))
 }
 
 // ParsePreTestLine checks the pre-Test line in fields to check whether it states this is a partial observation.