From 566e21e0e0395f50aab23f10e73ad00aceee7ec9 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 26 Nov 2021 19:27:24 -0500
Subject: [PATCH] Fix test for compatability with auto-weights

---
 tests/phpunit/CRM/Utils/Migrate/ImportExportTest.php            | 2 --
 tests/phpunit/CRM/Utils/Migrate/fixtures/Activity-text.xml      | 2 +-
 .../phpunit/CRM/Utils/Migrate/fixtures/ActivityMeeting-text.xml | 2 +-
 tests/phpunit/CRM/Utils/Migrate/fixtures/Contact-text.xml       | 2 +-
 tests/phpunit/CRM/Utils/Migrate/fixtures/Individual-text.xml    | 2 +-
 .../CRM/Utils/Migrate/fixtures/IndividualStudent-text.xml       | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/tests/phpunit/CRM/Utils/Migrate/ImportExportTest.php b/tests/phpunit/CRM/Utils/Migrate/ImportExportTest.php
index 8458593386..6d001e3735 100644
--- a/tests/phpunit/CRM/Utils/Migrate/ImportExportTest.php
+++ b/tests/phpunit/CRM/Utils/Migrate/ImportExportTest.php
@@ -31,7 +31,6 @@ class CRM_Utils_Migrate_ImportExportTest extends CiviUnitTestCase {
       'html_type' => 'Text',
       'data_type' => 'String',
       'default_value' => 'abc',
-      'weight' => 4,
       'is_required' => 1,
       'is_searchable' => 0,
       'is_active' => 1,
@@ -41,7 +40,6 @@ class CRM_Utils_Migrate_ImportExportTest extends CiviUnitTestCase {
       'label' => 'Our select field',
       'html_type' => 'Select',
       'data_type' => 'String',
-      'weight' => 4,
       'is_required' => 1,
       'is_searchable' => 0,
       'is_active' => 1,
diff --git a/tests/phpunit/CRM/Utils/Migrate/fixtures/Activity-text.xml b/tests/phpunit/CRM/Utils/Migrate/fixtures/Activity-text.xml
index 20a73caf24..6279b28bc6 100644
--- a/tests/phpunit/CRM/Utils/Migrate/fixtures/Activity-text.xml
+++ b/tests/phpunit/CRM/Utils/Migrate/fixtures/Activity-text.xml
@@ -27,7 +27,7 @@
       <is_required>1</is_required>
       <is_searchable>0</is_searchable>
       <is_search_range>0</is_search_range>
-      <weight>4</weight>
+      <weight>1</weight>
       <is_active>1</is_active>
       <is_view>0</is_view>
       <column_name>name1_1</column_name>
diff --git a/tests/phpunit/CRM/Utils/Migrate/fixtures/ActivityMeeting-text.xml b/tests/phpunit/CRM/Utils/Migrate/fixtures/ActivityMeeting-text.xml
index 58a45e824b..2768b529ed 100644
--- a/tests/phpunit/CRM/Utils/Migrate/fixtures/ActivityMeeting-text.xml
+++ b/tests/phpunit/CRM/Utils/Migrate/fixtures/ActivityMeeting-text.xml
@@ -29,7 +29,7 @@
       <is_required>1</is_required>
       <is_searchable>0</is_searchable>
       <is_search_range>0</is_search_range>
-      <weight>4</weight>
+      <weight>1</weight>
       <is_active>1</is_active>
       <is_view>0</is_view>
       <column_name>name1_1</column_name>
diff --git a/tests/phpunit/CRM/Utils/Migrate/fixtures/Contact-text.xml b/tests/phpunit/CRM/Utils/Migrate/fixtures/Contact-text.xml
index 22cb829ad8..a2408b5613 100644
--- a/tests/phpunit/CRM/Utils/Migrate/fixtures/Contact-text.xml
+++ b/tests/phpunit/CRM/Utils/Migrate/fixtures/Contact-text.xml
@@ -27,7 +27,7 @@
       <is_required>1</is_required>
       <is_searchable>0</is_searchable>
       <is_search_range>0</is_search_range>
-      <weight>4</weight>
+      <weight>1</weight>
       <is_active>1</is_active>
       <is_view>0</is_view>
       <column_name>name1_1</column_name>
diff --git a/tests/phpunit/CRM/Utils/Migrate/fixtures/Individual-text.xml b/tests/phpunit/CRM/Utils/Migrate/fixtures/Individual-text.xml
index ffdd76a9ef..e8d04683be 100644
--- a/tests/phpunit/CRM/Utils/Migrate/fixtures/Individual-text.xml
+++ b/tests/phpunit/CRM/Utils/Migrate/fixtures/Individual-text.xml
@@ -27,7 +27,7 @@
       <is_required>1</is_required>
       <is_searchable>0</is_searchable>
       <is_search_range>0</is_search_range>
-      <weight>4</weight>
+      <weight>1</weight>
       <is_active>1</is_active>
       <is_view>0</is_view>
       <column_name>name1_1</column_name>
diff --git a/tests/phpunit/CRM/Utils/Migrate/fixtures/IndividualStudent-text.xml b/tests/phpunit/CRM/Utils/Migrate/fixtures/IndividualStudent-text.xml
index 6c7e06e692..102642acb7 100644
--- a/tests/phpunit/CRM/Utils/Migrate/fixtures/IndividualStudent-text.xml
+++ b/tests/phpunit/CRM/Utils/Migrate/fixtures/IndividualStudent-text.xml
@@ -29,7 +29,7 @@
       <is_required>1</is_required>
       <is_searchable>0</is_searchable>
       <is_search_range>0</is_search_range>
-      <weight>4</weight>
+      <weight>1</weight>
       <is_active>1</is_active>
       <is_view>0</is_view>
       <column_name>name1_1</column_name>
-- 
2.25.1