Browse Source

Fix instance langauge pre-sorting and book store test.

Timur Sağlam 4 years ago
parent
commit
4babaa3b0b

+ 1 - 1
jplag.frontend.emf-model/src/main/java/de/jplag/emf/model/Language.java

@@ -42,7 +42,7 @@ public class Language extends de.jplag.emf.dynamic.Language {
     @Override
     public List<File> customizeSubmissionOrder(List<File> submissionNames) {
         submissionNames.sort((File first, File second) -> {
-            return Boolean.compare(first.getName().endsWith(FILE_ENDING), second.getName().endsWith(FILE_ENDING));
+            return Boolean.compare(second.getName().endsWith(FILE_ENDING), first.getName().endsWith(FILE_ENDING));
         });
         return submissionNames;
     }

+ 10 - 8
jplag.frontend.emf-model/src/test/java/de/jplag/emf/model/ModelInstanceTest.java

@@ -7,6 +7,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -26,7 +27,7 @@ class ModelInstanceTest {
 
     private static final Path BASE_PATH = Path.of("src", "test", "resources", "de", "jplag", "books");
 
-    private de.jplag.Language frontend;
+    private Language frontend;
     private File baseDirectory;
 
     @BeforeEach
@@ -38,19 +39,20 @@ class ModelInstanceTest {
     }
 
     @Test
-    void testParsingTestClass() {
+    void testBookStoreInstances() {
         File baseFile = new File(BASE_PATH.toString());
-        var testSubjects = Arrays.stream(baseFile.listFiles()).map(File::getName).filter(it -> !it.endsWith(Language.VIEW_FILE_SUFFIX))
-                .toArray(String[]::new);
+        var sortedFiles = frontend.customizeSubmissionOrder(new ArrayList<>(Arrays.stream(baseFile.listFiles()).toList()));
+        var testSubjects = sortedFiles.stream().map(File::getName).filter(it -> !it.endsWith(Language.VIEW_FILE_SUFFIX)).toArray(String[]::new);
 
         TokenList result = frontend.parse(baseDirectory, testSubjects);
         assertNotEquals(0, result.size());
-        List<String> treeViewFiles = Arrays.stream(testSubjects).map(it -> it + Language.VIEW_FILE_SUFFIX).collect(toList());
-        System.out.println(TokenPrinter.printTokens(result, baseDirectory, treeViewFiles));
 
+        List<String> treeViewFiles = Arrays.stream(testSubjects).map(it -> it + Language.VIEW_FILE_SUFFIX).collect(toList());
+        logger.info(TokenPrinter.printTokens(result, baseDirectory, treeViewFiles));
         logger.info("Dynamic token set: " + DynamicMetamodelTokenConstants.getTokenStrings());
-        logger.info(result.allTokens().toString());
-        assertEquals(6, result.size());
+        logger.info("Parsed tokens: " + result.allTokens().toString());
+
+        assertEquals(7, result.size());
     }
 
     @AfterEach

+ 1 - 0
jplag.frontend.emf-model/src/test/resources/de/jplag/books/bookStore2.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
 <bookStore:BookStore xmlns:bookStore="http:///com.ibm.dynamic.example.bookstore.ecore" owner="David Brown" location="Street#12, Top Town, NY">
+  <books name="Parry Hotter and the Hallow Deathly" isbn="175112"/>
   <books name="Harry Potter and the Deathly Hallows" isbn="157221"/>
 </bookStore:BookStore>