From 2e08c1a9c4a47e142b745f9ea8d6569590f0a5a9 Mon Sep 17 00:00:00 2001
From: Thomas Hess <thomas.hess@udo.edu>
Date: Tue, 17 Mar 2020 17:23:49 +0100
Subject: [PATCH] Test for NULL values in test_CreateRandomDeck().

Sometimes, building a random deck fails and returns NULL.
Properly handle this case by adding some assert statements that
verify that a Deck instance is actually returned, before checking the cards.
Prevents NPEs during test runs.
---
 .../src/test/java/org/mage/test/load/LoadTest.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Mage.Tests/src/test/java/org/mage/test/load/LoadTest.java b/Mage.Tests/src/test/java/org/mage/test/load/LoadTest.java
index 2cb55d3994d..d1e77dad433 100644
--- a/Mage.Tests/src/test/java/org/mage/test/load/LoadTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/load/LoadTest.java
@@ -59,46 +59,60 @@ public class LoadTest {
         Deck deck;
 
         deck = DeckTestUtils.buildRandomDeck("G", false);
+        Assert.assertNotNull(deck);
         for (Card card : deck.getCards()) {
+            Assert.assertNotNull(card);
             Assert.assertTrue("card " + card.getName() + " color " + card.getColorIdentity().toString() + " must be in G",
                     card.getColorIdentity().isGreen());
         }
 
         deck = DeckTestUtils.buildRandomDeck("U", false);
+        Assert.assertNotNull(deck);
         for (Card card : deck.getCards()) {
+            Assert.assertNotNull(card);
             Assert.assertTrue("card " + card.getName() + " color " + card.getColorIdentity().toString() + " must be in U",
                     card.getColorIdentity().isBlue());
         }
 
         deck = DeckTestUtils.buildRandomDeck("BR", false);
+        Assert.assertNotNull(deck);
         for (Card card : deck.getCards()) {
+            Assert.assertNotNull(card);
             Assert.assertTrue("card " + card.getName() + " color " + card.getColorIdentity().toString() + " must be in BR",
                     card.getColorIdentity().isBlack() || card.getColorIdentity().isRed());
         }
 
         deck = DeckTestUtils.buildRandomDeck("BUG", false);
+        Assert.assertNotNull(deck);
         for (Card card : deck.getCards()) {
+            Assert.assertNotNull(card);
             Assert.assertTrue("card " + card.getName() + " color " + card.getColorIdentity().toString() + " must be in BUG",
                     card.getColorIdentity().isBlack() || card.getColorIdentity().isBlue() || card.getColorIdentity().isGreen());
         }
 
         // lands
         deck = DeckTestUtils.buildRandomDeck("UR", true);
+        Assert.assertNotNull(deck);
         for (Card card : deck.getCards()) {
+            Assert.assertNotNull(card);
             Assert.assertTrue("card " + card.getName() + " color " + card.getColorIdentity().toString() + " must be in UR",
                     card.getColorIdentity().isBlue() || card.getColorIdentity().isRed());
             Assert.assertEquals("card " + card.getName() + " must be basic land ", Rarity.LAND, card.getRarity());
         }
 
         deck = DeckTestUtils.buildRandomDeck("B", true);
+        Assert.assertNotNull(deck);
         for (Card card : deck.getCards()) {
+            Assert.assertNotNull(card);
             Assert.assertTrue("card " + card.getName() + " color " + card.getColorIdentity().toString() + " must be in B", card.getColorIdentity().isBlack());
             Assert.assertEquals("card " + card.getName() + " must be basic land ", Rarity.LAND, card.getRarity());
         }
 
         // allowed sets
         deck = DeckTestUtils.buildRandomDeck("B", true, "GRN");
+        Assert.assertNotNull(deck);
         for (Card card : deck.getCards()) {
+            Assert.assertNotNull(card);
             Assert.assertTrue("card " + card.getName() + " color " + card.getColorIdentity().toString() + " must be in B", card.getColorIdentity().isBlack());
             Assert.assertEquals("card " + card.getName() + " have wrong set code " + card.getExpansionSetCode(), "GRN", card.getExpansionSetCode());
         }