From 53b0ce955b21458af662893837342f1835bd6a02 Mon Sep 17 00:00:00 2001 From: dwm10005 Date: Fri, 1 May 2015 11:46:32 -0400 Subject: [PATCH] Merge solomontests --- src/{tests => }/MinonTests.java | 2 +- src/{tests => }/MockGuiTests.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) rename src/{tests => }/MinonTests.java (60%) rename src/{tests => }/MockGuiTests.java (91%) diff --git a/src/tests/MinonTests.java b/src/MinonTests.java similarity index 60% rename from src/tests/MinonTests.java rename to src/MinonTests.java index de21524..dcc4a07 100644 --- a/src/tests/MinonTests.java +++ b/src/MinonTests.java @@ -1,4 +1,4 @@ -package tests; + public class MinonTests { diff --git a/src/tests/MockGuiTests.java b/src/MockGuiTests.java similarity index 91% rename from src/tests/MockGuiTests.java rename to src/MockGuiTests.java index 83586d7..c342492 100644 --- a/src/tests/MockGuiTests.java +++ b/src/MockGuiTests.java @@ -1,7 +1,6 @@ -package tests; + import static org.junit.Assert.*; -import MockGui; import java.awt.Color;