Skip to content

Add default level and components values when parsing #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Carifio24 merged 3 commits into from
Apr 25, 2026
Merged

Add default level and components values when parsing #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8884926
Catch null pointer exceptions as well when parsing spell list.
Carifio24 Mar 24, 2026
5c22632
If no level is specified, make spell a cantrip. Have all components f…
Carifio24 Mar 24, 2026
2356864
Add tests of default level and components for spell parsing.
Carifio24 Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions app/src/main/java/dnd/jon/spellbook/SpellCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Spell parseSpell(JSONObject json, SpellBuilder b, boolean useInternal) throws JS
.setName(json.getString(NAME_KEY))
.setRange(rangeGetter.apply(json.getString(RANGE_KEY)))
.setRitual(json.optBoolean(RITUAL_KEY, false))
.setLevel(json.getInt(LEVEL_KEY))
.setLevel(json.optInt(LEVEL_KEY, 0))
.setMaterial(json.optString(MATERIAL_KEY, ""))
.setRoyalty(json.optString(ROYALTY_KEY, ""))
.setDescription(json.getString(DESCRIPTION_KEY))
Expand Down Expand Up @@ -126,21 +126,23 @@ Spell parseSpell(JSONObject json, SpellBuilder b, boolean useInternal) throws JS

// Components
boolean[] components = { false, false, false, false };
JSONArray componentsArray = json.getJSONArray(COMPONENTS_KEY);
for (int i = 0; i < componentsArray.length(); ++i) {
final char c = componentsArray.getString(i).charAt(0);
switch (c) {
case 'V':
components[0] = true;
break;
case 'S':
components[1] = true;
break;
case 'M':
components[2] = true;
break;
case 'R':
components[3] = true;
final JSONArray componentsArray = json.optJSONArray(COMPONENTS_KEY);
if (componentsArray != null) {
for (int i = 0; i < componentsArray.length(); ++i) {
final char c = componentsArray.getString(i).charAt(0);
switch (c) {
case 'V':
components[0] = true;
break;
case 'S':
components[1] = true;
break;
case 'M':
components[2] = true;
break;
case 'R':
components[3] = true;
}
}
}
b.setComponents(components);
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/dnd/jon/spellbook/SpellbookViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1183,7 +1183,7 @@ boolean loadCreatedContent(JSONObject json) {
try {
final Spell spell = codec.parseSpell(spellJSON, builder, false);
addCreatedSpell(spell);
} catch (JSONException e) {
} catch (JSONException | NullPointerException e) {
Log.e(LOGGING_TAG, e.getMessage());
anyFailures = true;
}
Expand Down
83 changes: 83 additions & 0 deletions app/src/test/java/dnd/jon/spellbook/SpellTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;

import java.util.Arrays;
import java.util.Locale;
import java.util.stream.IntStream;
import java.util.stream.Stream;


@RunWith(RobolectricTestRunner.class)
Expand Down Expand Up @@ -108,4 +111,84 @@ public void spellParsePtTest() {
Assert.fail();
}
}

@Test
@Config(sdk = 34)
public void spellParseNoLevel() {
final String jsonString = "{ \"id\": 100000, \"name\": \"Test Spell\", \"desc\": \"abcde\", \"higher_level\": \"fghij\", \"range\": \"2 foot\", \"material\": \"\", \"royalty\": \"\", \"ritual\": true, \"duration\": \"3 minute\", \"concentration\": false, \"casting_time\": \"action\", \"school\": \"Evocation\", \"locations\": [], \"components\": [ \"V\", \"S\" ], \"classes\": [ \"Artificer\", \"Paladin\" ], \"subclasses\": [], \"tce_expanded_classes\": [] }";
try {
final JSONObject json = new JSONObject(jsonString);
final Context context = InstrumentationRegistry.getInstrumentation().getContext();
final SpellCodec codec = new SpellCodec(context);
final SpellBuilder builder = new SpellBuilder(context);
final Spell spell = codec.parseSpell(json, builder, true);

Truth.assertThat(spell.getLevel()).isEqualTo(0);
} catch (JSONException e) {
e.printStackTrace();
Assert.fail();
}
}

@Test
@Config(sdk = 34)
public void spellParseNoLevelPt() {
final String jsonString = "{ \"id\": 100000, \"name\": \"Test Spell\", \"desc\": \"abcde\", \"higher_level\": \"fghij\", \"range\": \"2 foot\", \"material\": \"\", \"royalty\": \"\", \"ritual\": true, \"duration\": \"3 minute\", \"concentration\": false, \"casting_time\": \"action\", \"school\": \"Evocation\", \"locations\": [], \"components\": [ \"V\", \"S\" ], \"classes\": [ \"Artificer\", \"Paladin\" ], \"subclasses\": [], \"tce_expanded_classes\": [] }";
try {
final JSONObject json = new JSONObject(jsonString);
final Context instrumentationContext = InstrumentationRegistry.getInstrumentation().getContext();
final Context context = LocalizationUtils.getLocalizedContext(instrumentationContext, new Locale("pt"));
final SpellCodec codec = new SpellCodec(context);
final SpellBuilder builder = new SpellBuilder(context);
final Spell spell = codec.parseSpell(json, builder, true);

Truth.assertThat(spell.getLevel()).isEqualTo(0);
} catch (JSONException e) {
e.printStackTrace();
Assert.fail();
}
}

@Test
@Config(sdk = 34)
public void spellParseNoComponents() {
final String jsonString = "{ \"id\": 100000, \"name\": \"Test Spell\", \"desc\": \"abcde\", \"higher_level\": \"fghij\", \"range\": \"2 foot\", \"material\": \"\", \"royalty\": \"\", \"ritual\": true, \"duration\": \"3 minute\", \"concentration\": false, \"casting_time\": \"action\", \"level\": 2, \"school\": \"Evocation\", \"locations\": [], \"classes\": [ \"Artificer\", \"Paladin\" ], \"subclasses\": [], \"tce_expanded_classes\": [] }";
try {
final JSONObject json = new JSONObject(jsonString);
final Context context = InstrumentationRegistry.getInstrumentation().getContext();
final SpellCodec codec = new SpellCodec(context);
final SpellBuilder builder = new SpellBuilder(context);
final Spell spell = codec.parseSpell(json, builder, true);

final boolean[] components = spell.getComponents();
Truth.assertThat(IntStream.range(0, components.length)
.mapToObj(i -> components[i])
.noneMatch(b -> b)).isTrue();
} catch (JSONException e) {
e.printStackTrace();
Assert.fail();
}
}

@Test
@Config(sdk = 34)
public void spellParseNoComponentsPt() {
final String jsonString = "{ \"id\": 100000, \"name\": \"Test Spell\", \"desc\": \"abcde\", \"higher_level\": \"fghij\", \"range\": \"2 foot\", \"material\": \"\", \"royalty\": \"\", \"ritual\": true, \"duration\": \"3 minute\", \"concentration\": false, \"casting_time\": \"action\", \"level\": 2, \"school\": \"Evocation\", \"locations\": [], \"classes\": [ \"Artificer\", \"Paladin\" ], \"subclasses\": [], \"tce_expanded_classes\": [] }";
try {
final JSONObject json = new JSONObject(jsonString);
final Context instrumentationContext = InstrumentationRegistry.getInstrumentation().getContext();
final Context context = LocalizationUtils.getLocalizedContext(instrumentationContext, new Locale("pt"));
final SpellCodec codec = new SpellCodec(context);
final SpellBuilder builder = new SpellBuilder(context);
final Spell spell = codec.parseSpell(json, builder, true);

final boolean[] components = spell.getComponents();
Truth.assertThat(IntStream.range(0, components.length)
.mapToObj(i -> components[i])
.noneMatch(b -> b)).isTrue();
} catch (JSONException e) {
e.printStackTrace();
Assert.fail();
}
}
}
Loading