From f65288eb485e555a4535aac87bba29aa8905b2e1 Mon Sep 17 00:00:00 2001
From: asankov <a.sankov96@gmail.com>
Date: Sat, 23 Nov 2019 16:18:06 +0200
Subject: [PATCH] Remove `XMLRPC` from form names. Refs #682

- `XMLRPCUpdateCaseForm` -> `UpdateForm`
- `XMLRPCNewRunForm` -> `NewForm`
- `XMLRPCUpdateRunForm` -> `UpdateForm`
- `XMLRPCNewExecutionForm` -> `NewExecutionForm`
- `XMLRPCUpdateExecutionForm` -> `UpdateExecutionForm`
---
 tcms/rpc/api/forms/testcase.py | 2 +-
 tcms/rpc/api/forms/testrun.py  | 8 ++++----
 tcms/rpc/api/testcase.py       | 4 ++--
 tcms/rpc/api/testexecution.py  | 4 ++--
 tcms/rpc/api/testrun.py        | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tcms/rpc/api/forms/testcase.py b/tcms/rpc/api/forms/testcase.py
index 72b6c5fd2d..9034e29257 100644
--- a/tcms/rpc/api/forms/testcase.py
+++ b/tcms/rpc/api/forms/testcase.py
@@ -5,7 +5,7 @@
 from tcms.testcases.models import Category
 
 
-class XMLRPCUpdateCaseForm(BaseCaseForm):
+class UpdateForm(BaseCaseForm):
     summary = forms.CharField(
         required=False,
     )
diff --git a/tcms/rpc/api/forms/testrun.py b/tcms/rpc/api/forms/testrun.py
index 9b468867e0..6671d492e2 100644
--- a/tcms/rpc/api/forms/testrun.py
+++ b/tcms/rpc/api/forms/testrun.py
@@ -14,7 +14,7 @@
 User = get_user_model()  # pylint: disable=invalid-name
 
 
-class XMLRPCNewRunForm(BaseRunForm):
+class NewForm(BaseRunForm):
     plan = forms.ModelChoiceField(
         queryset=TestPlan.objects.none(),
     )
@@ -24,7 +24,7 @@ def assign_plan(self, plan_id):
         self.populate(self.fields['plan'].queryset.first().product_id)
 
 
-class XMLRPCUpdateRunForm(XMLRPCNewRunForm):
+class UpdateForm(NewForm):
     plan = forms.ModelChoiceField(
         queryset=TestPlan.objects.all(),
         required=False,
@@ -59,7 +59,7 @@ def clean_status(self):
         return self.cleaned_data.get('status')
 
 
-class XMLRPCNewExecutionForm(BaseCaseRunForm):
+class NewExecutionForm(BaseCaseRunForm):
     assignee = forms.ModelChoiceField(queryset=User.objects.all(), required=False)
     run = forms.ModelChoiceField(queryset=TestRun.objects.all())
     case = forms.ModelChoiceField(queryset=TestCase.objects.all())
@@ -91,6 +91,6 @@ def clean_status(self):
         return data
 
 
-class XMLRPCUpdateExecutionForm(BaseCaseRunForm):
+class UpdateExecutionForm(BaseCaseRunForm):
     assignee = forms.ModelChoiceField(queryset=User.objects.all(), required=False)
     build = forms.ModelChoiceField(queryset=Build.objects.all(), required=False)
diff --git a/tcms/rpc/api/testcase.py b/tcms/rpc/api/testcase.py
index aed6ff31f8..494d009275 100644
--- a/tcms/rpc/api/testcase.py
+++ b/tcms/rpc/api/testcase.py
@@ -9,7 +9,7 @@
 from tcms.management.models import Component
 from tcms.testcases.models import TestCase
 from tcms.testcases.forms import NewCaseForm
-from tcms.rpc.api.forms.testcase import XMLRPCUpdateCaseForm
+from tcms.rpc.api.forms.testcase import UpdateForm
 
 from tcms.rpc import utils
 from tcms.rpc.decorators import permissions_required
@@ -320,7 +320,7 @@ def update(case_id, values):
         :raises: TestCase.DoesNotExist if object specified by PK doesn't exist
         :raises: PermissionDenied if missing *testcases.change_testcase* permission
     """
-    form = XMLRPCUpdateCaseForm(values)
+    form = UpdateForm(values)
 
     if values.get('category') and not values.get('product'):
         raise ValueError('Product ID is required for category')
diff --git a/tcms/rpc/api/testexecution.py b/tcms/rpc/api/testexecution.py
index 598b655162..7d1cdf0d01 100644
--- a/tcms/rpc/api/testexecution.py
+++ b/tcms/rpc/api/testexecution.py
@@ -71,7 +71,7 @@ def create(values):
             >>> TestExecution.create(values)
     """
 
-    form = XMLRPCNewExecutionForm(values)
+    form = NewExecutionForm(values)
 
     if not isinstance(values, dict):
         raise TypeError('Argument values must be in dict type.')
@@ -127,7 +127,7 @@ def update(case_run_id, values, **kwargs):
     """
 
     tcr = TestExecution.objects.get(pk=case_run_id)
-    form = XMLRPCUpdateExecutionForm(values)
+    form = UpdateExecutionForm(values)
 
     if form.is_valid():
         if form.cleaned_data['build']:
diff --git a/tcms/rpc/api/testrun.py b/tcms/rpc/api/testrun.py
index e3afb46049..09bdccb4a4 100644
--- a/tcms/rpc/api/testrun.py
+++ b/tcms/rpc/api/testrun.py
@@ -7,7 +7,7 @@
 from tcms.testruns.models import TestExecution
 from tcms.testruns.models import TestRun
 from tcms.rpc.decorators import permissions_required
-from tcms.rpc.api.forms.testrun import XMLRPCUpdateRunForm, XMLRPCNewRunForm
+from tcms.rpc.api.forms.testrun import UpdateForm, NewForm
 
 
 __all__ = (
@@ -161,7 +161,7 @@ def create(values):
             }
             >>> TestRun.create(values)
     """
-    form = XMLRPCNewRunForm(values)
+    form = NewForm(values)
     form.assign_plan(values.get('plan'))
 
     if form.is_valid():
@@ -218,7 +218,7 @@ def update(run_id, values):
     if values.get('product_version') and not values.get('product'):
         raise ValueError('Field "product" is required by product_version')
 
-    form = XMLRPCUpdateRunForm(values)
+    form = UpdateForm(values)
     if values.get('product_version'):
         form.populate(product_id=values['product'])