Set Up Tests

.gitignore

@@ -5,5 +5,6 @@ lib/*
 data/*
 misc/*
 build
+test/support/*
 .DS_Store
 scraper/config/secrets.exs

Makefile

@@ -11,6 +11,10 @@ CFLAGS	:= -g -Wall -std=c++11 -O1
 LIB     := -L lib
 INC     := -I include
 
+TEST_TARGET 	:= bin/testx
+TEST_SRCDIR 	:= test
+TEST_INC 	:= -I include -I src
+
 $(TARGET): $(OBJECTS)
 	@echo " Linking..."
 	@echo " $(CC) $^ -o $(TARGET) $(LIB)"; $(CC) $^ -o $(TARGET) $(LIB)
@@ -19,6 +23,10 @@ $(BUILDDIR)/%.o: $(SRCDIR)/%.$(SRCEXT)
 	mkdir -p $(BUILDDIR)
 	echo " $(CC) $(CFLAGS) $(INC) -c -o $@ $<"; $(CC) $(CFLAGS) $(INC) -c -o $@ $<
 
+test: $(TEST_SRCDIR)/*.$(SRCEXT)
+	@echo "Building Tests..."
+	$(CC) $(CFLAGS) -o $(TEST_TARGET) $(TEST_INC) $^
+
 clean:
 	@echo "Cleaning..."
 	@echo " $(RM) -r $(BUILDDIR) $(TARGET)"; $(RM) -r $(BUILDDIR) $(TARGET)

include/battle.h

@@ -22,6 +22,7 @@ class Battle {
     // Spits the constructed fire
     void spit();
 
+  private:
     // Builds the flame from a base word using a Model
     std::string traceBack(Word* base, std::string stressPattern, Model* m, Nouncer* n);
 
@@ -30,7 +31,6 @@ class Battle {
 
     WordList filterStressPattern(WordList* leadersList, std::string stressPattern);
 
-  private:
 
     // The fire to be spit
     std::string fire;

include/denouncer.h

@@ -21,8 +21,6 @@ class Denouncer {
     Denouncer();
     ~Denouncer();
 
-    std::vector<std::pair<std::string, std::string>>* getDict();
-
     // Add a nounce and corresponding word to the vector
     void addNounce(std::string nounce, std::string word);
 
@@ -32,17 +30,11 @@ class Denouncer {
     // Look up the value at the given index in the vector
     std::string lookUp(int index);
 
-    // Look up the value of the given nounce in the vector
-    std::string lookUp(std::string nounce);
-
-    // Prints the data structure
-    void print(std::string filename);
-
     // size of dict
-    int getSize() {return dict->size();}
+    int getSize() {return dict.size();}
 
   private:
-    std::vector<std::pair<std::string, std::string>>* dict;
+    std::vector<std::pair<std::string, std::string>> dict;
 
     int binarySearch(std::string nounce, int start, int end);