Refatorings and Fixings

Author: JohnTheBeloved

src/jmh/java/org/javarosa/benchmarks/ExternalDataInstanceBuildBenchmark.java

@@ -13,6 +13,7 @@
 import org.javarosa.core.reference.InvalidReferenceException;
 import org.javarosa.xml.util.InvalidStructureException;
 import org.javarosa.xml.util.UnfullfilledRequirementsException;
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Scope;
@@ -33,11 +34,11 @@ public static class ExternalDataInstanceState {
         public int noOfQuestions = 1;
         public int noOfInternalSecondaryInstances = 0;
         @Param({"50", "5000"})
-        public int noOf2ndryInstanceElements = 1;
+        public int noOf2ndryInstanceElements = 100;
         @Param({"1"})
         public int noOfQuestionGroups = 1;
         @Param({"50"})
-        public int noOfExternalSecondaryInstances = 1;
+        public int noOfExternalSecondaryInstances = 10;
         @Setup(Level.Trial)
         public void initialize() throws IOException {
             Map<String, Path> externalInstanceFiles = BenchmarkUtils.generateExternalSecondaryInstances(noOfQuestions, noOfQuestionGroups, noOfInternalSecondaryInstances, noOfExternalSecondaryInstances, noOf2ndryInstanceElements);
@@ -49,7 +50,7 @@ public void initialize() throws IOException {
 
     }
 
-    //@Benchmark
+    @Benchmark
     public void runBenchmark(ExternalDataInstanceState state, Blackhole bh)
         throws IOException, XmlPullParserException, InvalidReferenceException,
         UnfullfilledRequirementsException, InvalidStructureException {

src/jmh/java/org/javarosa/benchmarks/FormEntryControllerAnswerQuestion.java

@@ -127,7 +127,6 @@ public void benchmarkAnswerOne(FormControllerAnswerQuestionState state) throws R
         } else {
             throw new RuntimeException("Form controller not in a question index");
         }
-        state.formEntryController.jumpToIndex(FormIndex.createBeginningOfFormIndex());
     }
 
     private class AnswerCurrentQuestionAction {

src/jmh/java/org/javarosa/benchmarks/TreeElementParserBenchmark.java

@@ -49,7 +49,7 @@ public void initialize() throws IOException {
         }
     }
 
-    //@Benchmark
+    @Benchmark
     public void runBenchmark(TreeElementParserBenchmarkState state, Blackhole bh) throws IOException, UnfullfilledRequirementsException, XmlPullParserException, InvalidStructureException {
         TreeElement documentRootTreeElement = parse(state.xFormFile);
         bh.consume(documentRootTreeElement);

src/jmh/java/org/javarosa/benchmarks/XFormParserBenchmark.java

@@ -45,7 +45,7 @@ public void initialize() throws IOException {
         }
     }
 
-    //@Benchmark
+    @Benchmark
     public void
     runBenchmark(XFormParserBenchmarkState state, Blackhole bh)
         throws IOException {