master > master: codego - auslagern, erzeugungsmethode verbessert, SyntaxBaum -> Formula

codego/aussagenlogik/schema/schema_test.go

@@ -5,8 +5,8 @@ package schema_test
  * ---------------------------------------------------------------- */
 
 import (
+	"logik/aussagenlogik/formulae"
 	"logik/aussagenlogik/schema"
-	"logik/aussagenlogik/syntaxbaum"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -18,25 +18,25 @@ import (
 
 func TestParseExpr(test *testing.T) {
 	var assert = assert.New(test)
-	var tree syntaxbaum.SyntaxBaum
+	var tree formulae.Formula
 
 	tree = schema.ParseExpr("A8712")
 	assert.Equal("A8712", tree.GetExpr())
 	assert.Equal("atom", tree.GetKind())
-	assert.Equal(0, len(tree.GetChildren()))
+	assert.Equal(0, len(tree.GetSubFormulae()))
 
 	tree = schema.ParseExpr("  ! A5  ")
 	assert.Equal("! A5", tree.GetExpr())
 	assert.Equal("not", tree.GetKind())
-	assert.Equal(1, len(tree.GetChildren()))
+	assert.Equal(1, len(tree.GetSubFormulae()))
 
 	tree = schema.ParseExpr("A0 -> A1")
 	assert.Equal("(A0 -> A1)", tree.GetExpr())
 	assert.Equal("implies", tree.GetKind())
-	assert.Equal(2, len(tree.GetChildren()))
+	assert.Equal(2, len(tree.GetSubFormulae()))
 
 	tree = schema.ParseExpr("(  A0 &&   A1) || A2")
 	assert.Equal("((A0 && A1) || A2)", tree.GetExpr())
 	assert.Equal("or2", tree.GetKind())
-	assert.Equal(2, len(tree.GetChildren()))
+	assert.Equal(2, len(tree.GetSubFormulae()))
 }