Merge pull request #57 from codecrafters-io/andy/fix-2

Add randomWordsNoSubstrings

Author: andy1li

internal/stage_end_of_string_anchor.go

@@ -4,14 +4,13 @@ import (
 	"fmt"
 
 	"github.com/codecrafters-io/grep-tester/internal/test_cases"
-	"github.com/codecrafters-io/tester-utils/random"
 	"github.com/codecrafters-io/tester-utils/test_case_harness"
 )
 
 func testEndOfStringAnchor(stageHarness *test_case_harness.TestCaseHarness) error {
 	RelocateSystemGrep(stageHarness)
 
-	words := random.RandomWords(3)
+	words := randomWordsWithoutSubstrings(3)
 
 	testCaseCollection := test_cases.StdinTestCaseCollection{
 		{

internal/stage_match_alphanumeric.go

@@ -13,7 +13,7 @@ import (
 func testMatchAlphanumeric(stageHarness *test_case_harness.TestCaseHarness) error {
 	RelocateSystemGrep(stageHarness)
 
-	words := random.RandomWords(2)
+	words := randomWordsWithoutSubstrings(2)
 	specialCharacters := []string{"+", "-", "÷", "×", "=", "#", "%"}
 
 	nonWord1 := strings.Join(random.RandomElementsFromArray(specialCharacters, 3), "")

internal/stage_positive_character_groups.go

@@ -12,7 +12,7 @@ import (
 func testPositiveCharacterGroups(stageHarness *test_case_harness.TestCaseHarness) error {
 	RelocateSystemGrep(stageHarness)
 
-	words := random.RandomWords(3)
+	words := randomWordsWithoutSubstrings(3)
 	letterInsideWord0 := random.RandomElementFromArray(strings.Split(words[0], ""))
 	lettersOutsideWord0 := pickLettersOutsideWord(words[0], 2)
 	lettersOutsideWord1 := pickLettersOutsideWord(words[1], len(words[1]))

internal/stage_start_of_string_anchor.go

@@ -4,14 +4,13 @@ import (
 	"fmt"
 
 	"github.com/codecrafters-io/grep-tester/internal/test_cases"
-	"github.com/codecrafters-io/tester-utils/random"
 	"github.com/codecrafters-io/tester-utils/test_case_harness"
 )
 
 func testStartOfStringAnchor(stageHarness *test_case_harness.TestCaseHarness) error {
 	RelocateSystemGrep(stageHarness)
 
-	words := random.RandomWords(2)
+	words := randomWordsWithoutSubstrings(2)
 
 	testCaseCollection := test_cases.StdinTestCaseCollection{
 		{

internal/utils.go

@@ -2,6 +2,7 @@ package internal
 
 import (
 	"strconv"
+	"strings"
 
 	"github.com/codecrafters-io/tester-utils/random"
 )
@@ -14,3 +15,20 @@ var VEGETABLES = []string{"carrot", "onion", "potato", "tomato", "broccoli", "ca
 func randomFilePrefix() string {
 	return strconv.Itoa(random.RandomInt(1000, 10000))
 }
+
+func randomWordsWithoutSubstrings(n int) []string {
+loop:
+	for {
+		words := random.RandomWords(n)
+
+		for i := 0; i < len(words); i++ {
+			for j := i + 1; j < len(words); j++ {
+				if strings.Contains(words[j], words[i]) || strings.Contains(words[i], words[j]) {
+					continue loop
+				}
+			}
+		}
+
+		return words
+	}
+}