Skip to content

Commit a4802b5

Browse files
committed
Add source file processing phase to pipeline
1 parent 11a7d72 commit a4802b5

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

swan-pipeline/src/main/java/de/fraunhofer/iem/swan/SwanPipeline.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package de.fraunhofer.iem.swan;
22

33
import de.fraunhofer.iem.swan.cli.SwanOptions;
4-
import de.fraunhofer.iem.swan.data.Method;
54
import de.fraunhofer.iem.swan.features.FeatureSetSelector;
65
import de.fraunhofer.iem.swan.features.IFeatureSet;
76
import de.fraunhofer.iem.swan.io.dataset.Dataset;
87
import de.fraunhofer.iem.swan.io.dataset.SrmList;
98
import de.fraunhofer.iem.swan.io.dataset.SrmListUtils;
9+
import de.fraunhofer.iem.swan.io.doc.JavadocProcessor;
1010
import de.fraunhofer.iem.swan.model.ModelEvaluator;
1111
import de.fraunhofer.iem.swan.soot.Soot;
1212
import de.fraunhofer.iem.swan.util.Util;
1313
import org.slf4j.Logger;
1414
import org.slf4j.LoggerFactory;
1515

1616
import java.io.IOException;
17-
import java.util.Set;
1817

1918
/**
2019
* Runner for SWAN
@@ -56,9 +55,12 @@ public void run() throws IOException, InterruptedException {
5655

5756
//Load methods from the test set
5857
dataset.setTest(new SrmList(options.getTestDataDir()));
59-
Set<Method> testMethods = soot.loadMethods(dataset.getTest().getTestClasses());
60-
dataset.getTest().setMethods(testMethods);
61-
logger.info("Loaded {} methods from {}", testMethods.size(), options.getTestDataDir());
58+
dataset.getTest().setMethods(soot.loadMethods(dataset.getTest().getTestClasses()));
59+
60+
//Extract doc comments and add to test set, if option is selected
61+
JavadocProcessor javadocProcessor = new JavadocProcessor(options.getTestDataSourceDir(), options.getOutputDir());
62+
javadocProcessor.run(dataset.getTestMethods(), options.getFeatureSet());
63+
logger.info("Loaded {} methods from {}", dataset.getTestMethods().size(), options.getTestDataDir());
6264

6365
//Initialize and populate features
6466
FeatureSetSelector featureSetSelector = new FeatureSetSelector();

0 commit comments

Comments
 (0)