From baa3398dcba50e564a68bd16239590ff4b7db050 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 4 Nov 2022 17:00:39 +0100
Subject: [PATCH] Continued: - moved test classes to same package as the tested
 classes are - also compare flag

---
 src/org/mxchange/jcountry/model/data/CountryData.java         | 4 +++-
 test/org/mxchange/jcountry/CountryCoreTestSuite.xml           | 2 +-
 .../jcountry/{test => }/model/data/CountryDataObjectTest.java | 4 +---
 .../jcountry/{test => }/model/utils/CountryUtilsTest.java     | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename test/org/mxchange/jcountry/{test => }/model/data/CountryDataObjectTest.java (98%)
 rename test/org/mxchange/jcountry/{test => }/model/utils/CountryUtilsTest.java (98%)

diff --git a/src/org/mxchange/jcountry/model/data/CountryData.java b/src/org/mxchange/jcountry/model/data/CountryData.java
index 8dce48e..886c370 100644
--- a/src/org/mxchange/jcountry/model/data/CountryData.java
+++ b/src/org/mxchange/jcountry/model/data/CountryData.java
@@ -214,7 +214,9 @@ public class CountryData implements Country {
 			// ... abroad dial prefix
 			StringUtils.compare(this.getCountryAbroadDialPrefix(), country.getCountryAbroadDialPrefix()),
 			// ... external dial prefix
-			StringUtils.compare(this.getCountryExternalDialPrefix(), country.getCountryExternalDialPrefix())
+			StringUtils.compare(this.getCountryExternalDialPrefix(), country.getCountryExternalDialPrefix()),
+			// ... "is required" flag
+			Boolean.compare(this.getCountryIsLocalPrefixRequired(), country.getCountryIsLocalPrefixRequired())
 		};
 
 		// Check all values
diff --git a/test/org/mxchange/jcountry/CountryCoreTestSuite.xml b/test/org/mxchange/jcountry/CountryCoreTestSuite.xml
index 17380ed..11f58d3 100644
--- a/test/org/mxchange/jcountry/CountryCoreTestSuite.xml
+++ b/test/org/mxchange/jcountry/CountryCoreTestSuite.xml
@@ -18,7 +18,7 @@
 	-->
 	<test name="org.mxchange.jcountry.test suite">
 		<packages>
-			<package name="org.mxchange.jcountry.test"/>
+			<package name="org.mxchange.jcountry"/>
 		</packages>
 	</test>
 </suite>
diff --git a/test/org/mxchange/jcountry/test/model/data/CountryDataObjectTest.java b/test/org/mxchange/jcountry/model/data/CountryDataObjectTest.java
similarity index 98%
rename from test/org/mxchange/jcountry/test/model/data/CountryDataObjectTest.java
rename to test/org/mxchange/jcountry/model/data/CountryDataObjectTest.java
index 1c5c526..9ecb754 100644
--- a/test/org/mxchange/jcountry/test/model/data/CountryDataObjectTest.java
+++ b/test/org/mxchange/jcountry/model/data/CountryDataObjectTest.java
@@ -14,11 +14,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.mxchange.jcountry.test.model.data;
+package org.mxchange.jcountry.model.data;
 
 import java.util.Date;
-import org.mxchange.jcountry.model.data.Country;
-import org.mxchange.jcountry.model.data.CountryData;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
diff --git a/test/org/mxchange/jcountry/test/model/utils/CountryUtilsTest.java b/test/org/mxchange/jcountry/model/utils/CountryUtilsTest.java
similarity index 98%
rename from test/org/mxchange/jcountry/test/model/utils/CountryUtilsTest.java
rename to test/org/mxchange/jcountry/model/utils/CountryUtilsTest.java
index 6cf6fa2..8aae34f 100644
--- a/test/org/mxchange/jcountry/test/model/utils/CountryUtilsTest.java
+++ b/test/org/mxchange/jcountry/model/utils/CountryUtilsTest.java
@@ -14,11 +14,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.mxchange.jcountry.test.model.utils;
+package org.mxchange.jcountry.model.utils;
 
 import org.mxchange.jcountry.model.data.Country;
 import org.mxchange.jcountry.model.data.CountryData;
-import org.mxchange.jcountry.model.utils.CountryUtils;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
-- 
2.39.5