Move Scenario to main to allow clients and modules to use it

getodk · Jun 26, 2024 · ea3d691 · ea3d691
1 parent 6e72a2a
commit ea3d691
Show file tree

Hide file tree

Showing 82 changed files with 557 additions and 557 deletions.
diff --git a/src/jmh/java/org/javarosa/benchmarks/BenchmarkUtils.java b/src/jmh/java/org/javarosa/benchmarks/BenchmarkUtils.java
@@ -1,6 +1,6 @@
 package org.javarosa.benchmarks;
 
-import static org.javarosa.test.utils.ResourcePathHelper.r;
+import static org.javarosa.test.ResourcePathHelper.r;
 import static org.javarosa.core.reference.ReferenceManagerTestUtils.setUpSimpleReferenceManager;
 
 import java.io.IOException;

diff --git a/src/jmh/java/org/javarosa/benchmarks/ChildVaccinationBenchmark.java b/src/jmh/java/org/javarosa/benchmarks/ChildVaccinationBenchmark.java
@@ -28,16 +28,16 @@
 import static org.javarosa.benchmarks.ChildVaccinationBenchmark.Vaccines.DIPHTERIA_FIRST_AND_MEASLES;
 import static org.javarosa.benchmarks.ChildVaccinationBenchmark.Vaccines.MEASLES;
 import static org.javarosa.benchmarks.ChildVaccinationBenchmark.Vaccines.NONE;
-import static org.javarosa.core.test.Scenario.getRef;
-import static org.javarosa.core.test.Scenario.init;
+import static org.javarosa.test.Scenario.getRef;
+import static org.javarosa.test.Scenario.init;
 
 import java.nio.file.Path;
 import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Consumer;
 import org.javarosa.core.model.instance.TreeReference;
-import org.javarosa.core.test.Scenario;
+import org.javarosa.test.Scenario;
 import org.javarosa.xform.parse.XFormParser;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;

diff --git a/src/jmh/java/org/javarosa/benchmarks/PopulateTreeNodeBenchmark.java b/src/jmh/java/org/javarosa/benchmarks/PopulateTreeNodeBenchmark.java
@@ -8,7 +8,7 @@
 import java.nio.file.Path;
 import org.javarosa.core.model.FormDef;
 import org.javarosa.core.model.instance.TreeElement;
-import org.javarosa.core.test.FormParseInit;
+import org.javarosa.test.FormParseInit;
 import org.javarosa.form.api.FormEntryController;
 import org.javarosa.xform.parse.XFormParser;
 import org.openjdk.jmh.annotations.Benchmark;

diff --git a/src/jmh/java/org/javarosa/benchmarks/WhoVaBenchmark.java b/src/jmh/java/org/javarosa/benchmarks/WhoVaBenchmark.java
@@ -19,11 +19,11 @@
 
 import static org.javarosa.benchmarks.BenchmarkUtils.dryRun;
 import static org.javarosa.benchmarks.BenchmarkUtils.prepareAssets;
-import static org.javarosa.core.test.Scenario.init;
+import static org.javarosa.test.Scenario.init;
 
 import java.time.LocalDate;
 import java.util.stream.IntStream;
-import org.javarosa.core.test.Scenario;
+import org.javarosa.test.Scenario;
 import org.javarosa.xform.parse.XFormParser;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;

diff --git a/src/jmh/java/org/javarosa/benchmarks/core/model/CreateRepeatDagBenchmark.java b/src/jmh/java/org/javarosa/benchmarks/core/model/CreateRepeatDagBenchmark.java
@@ -2,19 +2,19 @@
 
 import static java.util.stream.IntStream.range;
 import static org.javarosa.benchmarks.BenchmarkUtils.dryRun;
-import static org.javarosa.core.util.BindBuilderXFormsElement.bind;
-import static org.javarosa.core.util.XFormsElement.body;
-import static org.javarosa.core.util.XFormsElement.head;
-import static org.javarosa.core.util.XFormsElement.html;
-import static org.javarosa.core.util.XFormsElement.input;
-import static org.javarosa.core.util.XFormsElement.mainInstance;
-import static org.javarosa.core.util.XFormsElement.model;
-import static org.javarosa.core.util.XFormsElement.repeat;
-import static org.javarosa.core.util.XFormsElement.t;
-import static org.javarosa.core.util.XFormsElement.title;
+import static org.javarosa.test.BindBuilderXFormsElement.bind;
+import static org.javarosa.test.XFormsElement.body;
+import static org.javarosa.test.XFormsElement.head;
+import static org.javarosa.test.XFormsElement.html;
+import static org.javarosa.test.XFormsElement.input;
+import static org.javarosa.test.XFormsElement.mainInstance;
+import static org.javarosa.test.XFormsElement.model;
+import static org.javarosa.test.XFormsElement.repeat;
+import static org.javarosa.test.XFormsElement.t;
+import static org.javarosa.test.XFormsElement.title;
 
 import java.io.IOException;
-import org.javarosa.core.test.Scenario;
+import org.javarosa.test.Scenario;
 import org.javarosa.xform.parse.XFormParser;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;

diff --git a/src/jmh/java/org/javarosa/benchmarks/core/model/DeleteRepeatDagBenchmark.java b/src/jmh/java/org/javarosa/benchmarks/core/model/DeleteRepeatDagBenchmark.java
@@ -8,7 +8,7 @@
 import static org.javarosa.benchmarks.core.model.CreateRepeatDagBenchmark.getSumExpressionOutsideScenario;
 
 import java.io.IOException;
-import org.javarosa.core.test.Scenario;
+import org.javarosa.test.Scenario;
 import org.javarosa.xform.parse.XFormParser;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;

diff --git a/...a/core/util/BindBuilderXFormsElement.java → ...varosa/test/BindBuilderXFormsElement.java b/...a/core/util/BindBuilderXFormsElement.java → ...varosa/test/BindBuilderXFormsElement.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.javarosa.core.util;
+package org.javarosa.test;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...avarosa/core/util/EmptyXFormsElement.java → ...org/javarosa/test/EmptyXFormsElement.java b/...avarosa/core/util/EmptyXFormsElement.java → ...org/javarosa/test/EmptyXFormsElement.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.javarosa.core.util;
+package org.javarosa.test;
 
-import static org.javarosa.core.util.XFormsElement.buildAttributesString;
+import static org.javarosa.test.XFormsElement.buildAttributesString;
 
 import java.util.Map;
 
-public class EmptyXFormsElement implements XFormsElement {
+class EmptyXFormsElement implements XFormsElement {
     private final String name;
     private final Map<String, String> attributes;
 

diff --git a/...org/javarosa/core/test/FormParseInit.java → ...java/org/javarosa/test/FormParseInit.java b/...org/javarosa/core/test/FormParseInit.java → ...java/org/javarosa/test/FormParseInit.java
@@ -1,13 +1,5 @@
-package org.javarosa.core.test;
+package org.javarosa.test;
 
-import static org.javarosa.form.api.FormEntryController.EVENT_END_OF_FORM;
-import static org.javarosa.test.utils.ResourcePathHelper.r;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.List;
 import org.javarosa.core.model.FormDef;
 import org.javarosa.core.model.FormIndex;
 import org.javarosa.core.model.GroupDef;
@@ -21,6 +13,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+
+import static org.javarosa.form.api.FormEntryController.EVENT_END_OF_FORM;
+import static org.javarosa.test.ResourcePathHelper.r;
+
 /**
  * This class sets up everything you need to perform tests on the models and form elements found in JR (such
  * as QuestionDef, FormDef, Selections, etc).  It exposes hooks to the FormEntryController,FormEntryModel and

diff --git a/...varosa/test/utils/ResourcePathHelper.java → ...org/javarosa/test/ResourcePathHelper.java b/...varosa/test/utils/ResourcePathHelper.java → ...org/javarosa/test/ResourcePathHelper.java
@@ -1,4 +1,4 @@
-package org.javarosa.test.utils;
+package org.javarosa.test;
 
 import static java.nio.file.Files.isRegularFile;
 import static java.nio.file.Files.walk;

diff --git a/...java/org/javarosa/core/test/Scenario.java → ...main/java/org/javarosa/test/Scenario.java b/...java/org/javarosa/core/test/Scenario.java → ...main/java/org/javarosa/test/Scenario.java
@@ -14,43 +14,8 @@
  * limitations under the License.
  */
 
-package org.javarosa.core.test;
+package org.javarosa.test;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.nio.file.Files.createTempDirectory;
-import static java.nio.file.Files.createTempFile;
-import static java.nio.file.Files.delete;
-import static java.nio.file.Files.newInputStream;
-import static java.nio.file.Files.newOutputStream;
-import static java.nio.file.Files.write;
-import static java.nio.file.StandardOpenOption.CREATE;
-import static java.util.stream.Collectors.joining;
-import static org.javarosa.core.model.instance.TreeReference.INDEX_TEMPLATE;
-import static org.javarosa.form.api.FormEntryController.EVENT_BEGINNING_OF_FORM;
-import static org.javarosa.form.api.FormEntryController.EVENT_END_OF_FORM;
-import static org.javarosa.form.api.FormEntryController.EVENT_GROUP;
-import static org.javarosa.form.api.FormEntryController.EVENT_PROMPT_NEW_REPEAT;
-import static org.javarosa.form.api.FormEntryController.EVENT_QUESTION;
-import static org.javarosa.form.api.FormEntryController.EVENT_REPEAT;
-import static org.javarosa.form.api.FormEntryController.EVENT_REPEAT_JUNCTURE;
-import static org.javarosa.test.utils.ResourcePathHelper.r;
-import static org.javarosa.xpath.expr.XPathPathExpr.INIT_CONTEXT_RELATIVE;
-import static org.javarosa.xpath.expr.XPathStep.AXIS_ATTRIBUTE;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.file.Path;
-import java.sql.Date;
-import java.time.LocalDate;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import org.javarosa.core.model.CoreModelModule;
 import org.javarosa.core.model.FormDef;
 import org.javarosa.core.model.FormIndex;
@@ -77,7 +42,6 @@
 import org.javarosa.core.services.storage.StorageManager;
 import org.javarosa.core.services.storage.util.DummyIndexedStorageUtility;
 import org.javarosa.core.util.JavaRosaCoreModule;
-import org.javarosa.core.util.XFormsElement;
 import org.javarosa.core.util.externalizable.DeserializationException;
 import org.javarosa.debug.Event;
 import org.javarosa.form.api.FormEntryController;
@@ -96,6 +60,41 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.Path;
+import java.sql.Date;
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.nio.file.Files.createTempDirectory;
+import static java.nio.file.Files.createTempFile;
+import static java.nio.file.Files.delete;
+import static java.nio.file.Files.newInputStream;
+import static java.nio.file.Files.newOutputStream;
+import static java.nio.file.Files.write;
+import static java.nio.file.StandardOpenOption.CREATE;
+import static java.util.stream.Collectors.joining;
+import static org.javarosa.core.model.instance.TreeReference.INDEX_TEMPLATE;
+import static org.javarosa.form.api.FormEntryController.EVENT_BEGINNING_OF_FORM;
+import static org.javarosa.form.api.FormEntryController.EVENT_END_OF_FORM;
+import static org.javarosa.form.api.FormEntryController.EVENT_GROUP;
+import static org.javarosa.form.api.FormEntryController.EVENT_PROMPT_NEW_REPEAT;
+import static org.javarosa.form.api.FormEntryController.EVENT_QUESTION;
+import static org.javarosa.form.api.FormEntryController.EVENT_REPEAT;
+import static org.javarosa.form.api.FormEntryController.EVENT_REPEAT_JUNCTURE;
+import static org.javarosa.xpath.expr.XPathPathExpr.INIT_CONTEXT_RELATIVE;
+import static org.javarosa.xpath.expr.XPathStep.AXIS_ATTRIBUTE;
+
 /**
  * <div style="border: 1px 1px 1px 1px; background-color: #556B2F; color: white; padding: 20px">
  * <b>Warning</b> This class is probably incomplete. If your testing requirements
@@ -455,7 +454,7 @@ public static FormDef createFormDef(String formName, XFormsElement form) throws
      * A form with the provided filename must exist in the classpath
      */
     public static Scenario init(String formFileName) throws XFormParser.ParseException {
-        return init(r(formFileName));
+        return init(ResourcePathHelper.r(formFileName));
     }
 
     /**

diff --git a/...core/util/StringLiteralXFormsElement.java → ...rosa/test/StringLiteralXFormsElement.java b/...core/util/StringLiteralXFormsElement.java → ...rosa/test/StringLiteralXFormsElement.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.javarosa.core.util;
+package org.javarosa.test;
 
-import static org.javarosa.core.util.XFormsElement.buildAttributesString;
+import static org.javarosa.test.XFormsElement.buildAttributesString;
 
 import java.util.Map;
 
-public class StringLiteralXFormsElement implements XFormsElement {
+class StringLiteralXFormsElement implements XFormsElement {
     private final String name;
     private final Map<String, String> attributes;
     private final String innerHtml;

diff --git a/.../javarosa/core/util/TagXFormsElement.java → ...a/org/javarosa/test/TagXFormsElement.java b/.../javarosa/core/util/TagXFormsElement.java → ...a/org/javarosa/test/TagXFormsElement.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.javarosa.core.util;
+package org.javarosa.test;
 
-import static org.javarosa.core.util.XFormsElement.buildAttributesString;
+import static org.javarosa.test.XFormsElement.buildAttributesString;
 
 import java.util.List;
 import java.util.Map;
 
-public class TagXFormsElement implements XFormsElement {
+class TagXFormsElement implements XFormsElement {
     private final String name;
     private final Map<String, String> attributes;
     private final List<XFormsElement> children;

diff --git a/...org/javarosa/core/util/XFormsElement.java → ...java/org/javarosa/test/XFormsElement.java b/...org/javarosa/core/util/XFormsElement.java → ...java/org/javarosa/test/XFormsElement.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.javarosa.core.util;
+package org.javarosa.test;
 
 import kotlin.Pair;
 

diff --git a/src/test/java/org/javarosa/core/form/api/test/TextFormTests.java b/src/test/java/org/javarosa/core/form/api/test/TextFormTests.java
@@ -13,7 +13,7 @@
 import org.javarosa.core.services.PrototypeManager;
 import org.javarosa.core.services.locale.Localizer;
 import org.javarosa.core.services.locale.TableLocaleSource;
-import org.javarosa.core.test.FormParseInit;
+import org.javarosa.test.FormParseInit;
 import org.javarosa.core.util.externalizable.ExtUtil;
 import org.javarosa.core.util.externalizable.PrototypeFactory;
 import org.javarosa.form.api.FormEntryCaption;

diff --git a/src/test/java/org/javarosa/core/model/ChoiceNameTest.java b/src/test/java/org/javarosa/core/model/ChoiceNameTest.java
@@ -3,22 +3,22 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.javarosa.core.test.AnswerDataMatchers.stringAnswer;
-import static org.javarosa.core.util.BindBuilderXFormsElement.bind;
-import static org.javarosa.core.util.XFormsElement.body;
-import static org.javarosa.core.util.XFormsElement.head;
-import static org.javarosa.core.util.XFormsElement.html;
-import static org.javarosa.core.util.XFormsElement.item;
-import static org.javarosa.core.util.XFormsElement.mainInstance;
-import static org.javarosa.core.util.XFormsElement.model;
-import static org.javarosa.core.util.XFormsElement.repeat;
-import static org.javarosa.core.util.XFormsElement.select1;
-import static org.javarosa.core.util.XFormsElement.select1Dynamic;
-import static org.javarosa.core.util.XFormsElement.t;
-import static org.javarosa.core.util.XFormsElement.title;
-import static org.javarosa.test.utils.ResourcePathHelper.r;
+import static org.javarosa.test.BindBuilderXFormsElement.bind;
+import static org.javarosa.test.XFormsElement.body;
+import static org.javarosa.test.XFormsElement.head;
+import static org.javarosa.test.XFormsElement.html;
+import static org.javarosa.test.XFormsElement.item;
+import static org.javarosa.test.XFormsElement.mainInstance;
+import static org.javarosa.test.XFormsElement.model;
+import static org.javarosa.test.XFormsElement.repeat;
+import static org.javarosa.test.XFormsElement.select1;
+import static org.javarosa.test.XFormsElement.select1Dynamic;
+import static org.javarosa.test.XFormsElement.t;
+import static org.javarosa.test.XFormsElement.title;
+import static org.javarosa.test.ResourcePathHelper.r;
 
 import java.io.IOException;
-import org.javarosa.core.test.Scenario;
+import org.javarosa.test.Scenario;
 import org.javarosa.xform.parse.XFormParser;
 import org.junit.Test;
 

diff --git a/src/test/java/org/javarosa/core/model/DynamicSelectUpdateTest.java b/src/test/java/org/javarosa/core/model/DynamicSelectUpdateTest.java
@@ -23,22 +23,22 @@
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.sameInstance;
 import static org.javarosa.core.test.SelectChoiceMatchers.choice;
-import static org.javarosa.core.util.XFormsElement.body;
-import static org.javarosa.core.util.XFormsElement.head;
-import static org.javarosa.core.util.XFormsElement.html;
-import static org.javarosa.core.util.XFormsElement.input;
-import static org.javarosa.core.util.XFormsElement.instance;
-import static org.javarosa.core.util.XFormsElement.item;
-import static org.javarosa.core.util.XFormsElement.mainInstance;
-import static org.javarosa.core.util.XFormsElement.model;
-import static org.javarosa.core.util.XFormsElement.repeat;
-import static org.javarosa.core.util.XFormsElement.select1Dynamic;
-import static org.javarosa.core.util.XFormsElement.t;
-import static org.javarosa.core.util.XFormsElement.title;
+import static org.javarosa.test.XFormsElement.body;
+import static org.javarosa.test.XFormsElement.head;
+import static org.javarosa.test.XFormsElement.html;
+import static org.javarosa.test.XFormsElement.input;
+import static org.javarosa.test.XFormsElement.instance;
+import static org.javarosa.test.XFormsElement.item;
+import static org.javarosa.test.XFormsElement.mainInstance;
+import static org.javarosa.test.XFormsElement.model;
+import static org.javarosa.test.XFormsElement.repeat;
+import static org.javarosa.test.XFormsElement.select1Dynamic;
+import static org.javarosa.test.XFormsElement.t;
+import static org.javarosa.test.XFormsElement.title;
 
 import java.util.List;
-import org.javarosa.core.test.Scenario;
-import org.javarosa.core.util.XFormsElement;
+import org.javarosa.test.Scenario;
+import org.javarosa.test.XFormsElement;
 import org.junit.Test;
 
 /**