Processor test working for windows

d3scomp · Nov 12, 2013 · 847f3a9 · 847f3a9
1 parent 5a92946
commit 847f3a9
Showing 1 changed file with 3 additions and 20 deletions.
diff --git a/jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java b/jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java
@@ -10,7 +10,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
 import junitx.framework.FileAssert;
 
 import org.eclipse.emf.common.util.URI;
@@ -26,23 +25,7 @@
 
 import cz.cuni.mff.d3s.deeco.annotations.pathparser.ParseException;
 import cz.cuni.mff.d3s.deeco.annotations.pathparser.TokenMgrError;
-import cz.cuni.mff.d3s.deeco.annotations.processor.input.samples.C1C2C3E1E2E3;
-import cz.cuni.mff.d3s.deeco.annotations.processor.input.samples.CorrectC1;
-import cz.cuni.mff.d3s.deeco.annotations.processor.input.samples.CorrectC2;
-import cz.cuni.mff.d3s.deeco.annotations.processor.input.samples.CorrectC3;
-import cz.cuni.mff.d3s.deeco.annotations.processor.input.samples.CorrectE1;
-import cz.cuni.mff.d3s.deeco.annotations.processor.input.samples.CorrectE2;
-import cz.cuni.mff.d3s.deeco.annotations.processor.input.samples.CorrectE3;
-import cz.cuni.mff.d3s.deeco.annotations.processor.input.samples.WrongC1;
-import cz.cuni.mff.d3s.deeco.annotations.processor.input.samples.WrongC2;
-import cz.cuni.mff.d3s.deeco.annotations.processor.input.samples.WrongC3;
-import cz.cuni.mff.d3s.deeco.annotations.processor.input.samples.WrongC4;
-import cz.cuni.mff.d3s.deeco.annotations.processor.input.samples.WrongCE1;
-import cz.cuni.mff.d3s.deeco.annotations.processor.input.samples.WrongCE2;
-import cz.cuni.mff.d3s.deeco.annotations.processor.input.samples.WrongE1;
-import cz.cuni.mff.d3s.deeco.annotations.processor.input.samples.WrongE2;
-import cz.cuni.mff.d3s.deeco.annotations.processor.input.samples.WrongE3;
-import cz.cuni.mff.d3s.deeco.annotations.processor.input.samples.WrongE4;
+import cz.cuni.mff.d3s.deeco.annotations.processor.input.samples.*;
 import cz.cuni.mff.d3s.deeco.knowledge.ChangeSet;
 import cz.cuni.mff.d3s.deeco.model.runtime.api.ComponentInstance;
 import cz.cuni.mff.d3s.deeco.model.runtime.api.KnowledgePath;
@@ -481,8 +464,8 @@ private void saveInXMI(RuntimeMetadata model, File file) {
 	private File getExpectedFile(Object o) {
 		String outF = "test"
 				+ File.separator
-				+ getClass().getPackage().getName()
-						.replaceAll("[.]", File.separator) + File.separator
+				+ this.getClass().getPackage().getName().replace('.', File.separatorChar)
+				+ File.separator
 				+ "output" + File.separator;
 		String path = outF + o.getClass().getSimpleName() + ".xmi";
 		return new File(path);