Cleanup automated tests

Author: Darkyenus

test/glslplugin/LightGLSLTestCase.java

@@ -1,13 +1,36 @@
 package glslplugin;
 
+import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.psi.PsiFileFactory;
 import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+import glslplugin.lang.parser.GLSLFile;
+
+import java.io.File;
+import java.io.IOException;
 
 /**
- * Created by wyozi on 19.12.2015.
+ * Base for light test cases
  */
-public class LightGLSLTestCase extends LightPlatformCodeInsightFixtureTestCase {
+public abstract class LightGLSLTestCase extends LightPlatformCodeInsightFixtureTestCase {
+
     @Override
     protected String getTestDataPath() {
-        return TestUtils.getTestDataPath();
+        return new File("testdata").getAbsolutePath();
+    }
+
+    private File getTestFile(String fileName){
+        return new File(new File(getTestDataPath()), fileName);
+    }
+
+    public GLSLFile parseFile(String filePath){
+        final String testFileContent;
+        try {
+            testFileContent = FileUtil.loadFile(getTestFile(filePath), "UTF-8", true);
+            assertNotNull(testFileContent);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        return ((GLSLFile) PsiFileFactory.getInstance(getProject()).createFileFromText("dummy.glsl", GLSLSupportLoader.GLSL, testFileContent));
     }
 }

test/glslplugin/TestUtils.java

@@ -1,25 +1,27 @@
 package glslplugin.lang;
 
 import glslplugin.LightGLSLTestCase;
-import glslplugin.TestUtils;
 import glslplugin.lang.parser.GLSLFile;
 
 /**
+ * Test if the versions are inferred correctly
+ *
  * Created by wyozi on 19.12.2015.
  */
 public class VersionDirectiveTest extends LightGLSLTestCase {
+
     @Override
     protected String getTestDataPath() {
         return super.getTestDataPath() + "/lang/version";
     }
 
     public void testDefaultVersion() {
-        GLSLFile file = TestUtils.parseFile(getProject(), getTestDataPath() + "/defaultVersion.glsl");
+        GLSLFile file = parseFile("defaultVersion.glsl");
         assertEquals(GLSLFile.GLSL_DEFAULT_VERSION, file.getGLSLVersion());
     }
 
     public void testSpecifiedVersion() {
-        GLSLFile file = TestUtils.parseFile(getProject(), getTestDataPath() + "/specifiedVersion.glsl");
+        GLSLFile file = parseFile("specifiedVersion.glsl");
         assertEquals(330, file.getGLSLVersion());
     }
 }