Redo tests for IPR to cover all views, fix some bugs and add some

finishing touches
 - Legacy-Id: 6779

Author: OleLaursen

ietf/doc/tests_draft.py

@@ -1,7 +1,5 @@
-import unittest
 import StringIO
-import os, shutil
-from datetime import date, timedelta, time
+import os, shutil, datetime
 
 from django.core.urlresolvers import reverse as urlreverse
 from django.conf import settings
@@ -10,7 +8,7 @@
 import debug
 
 from ietf.doc.models import *
-from ietf.doc .utils import *
+from ietf.doc.utils import *
 from ietf.name.models import *
 from ietf.group.models import *
 from ietf.person.models import *
@@ -452,11 +450,11 @@ def test_in_draft_expire_freeze(self):
         second_cut_off = Meeting.get_second_cut_off()
         ietf_monday = Meeting.get_ietf_monday()
 
-        self.assertTrue(not in_draft_expire_freeze(datetime.datetime.combine(second_cut_off - datetime.timedelta(days=7), time(0, 0, 0))))
-        self.assertTrue(not in_draft_expire_freeze(datetime.datetime.combine(second_cut_off, time(0, 0, 0))))
-        self.assertTrue(in_draft_expire_freeze(datetime.datetime.combine(second_cut_off + datetime.timedelta(days=7), time(0, 0, 0))))
-        self.assertTrue(in_draft_expire_freeze(datetime.datetime.combine(ietf_monday - datetime.timedelta(days=1), time(0, 0, 0))))
-        self.assertTrue(not in_draft_expire_freeze(datetime.datetime.combine(ietf_monday, time(0, 0, 0))))
+        self.assertTrue(not in_draft_expire_freeze(datetime.datetime.combine(second_cut_off - datetime.timedelta(days=7), datetime.time(0, 0, 0))))
+        self.assertTrue(not in_draft_expire_freeze(datetime.datetime.combine(second_cut_off, datetime.time(0, 0, 0))))
+        self.assertTrue(in_draft_expire_freeze(datetime.datetime.combine(second_cut_off + datetime.timedelta(days=7), datetime.time(0, 0, 0))))
+        self.assertTrue(in_draft_expire_freeze(datetime.datetime.combine(ietf_monday - datetime.timedelta(days=1), datetime.time(0, 0, 0))))
+        self.assertTrue(not in_draft_expire_freeze(datetime.datetime.combine(ietf_monday, datetime.time(0, 0, 0))))
 
     def test_warn_expirable_drafts(self):
         from ietf.doc.expire import get_soon_to_expire_drafts, send_expire_warning_for_draft

ietf/ipr/admin.py

@@ -12,16 +12,8 @@ class IprDetailAdmin(admin.ModelAdmin):
     search_fields = ['title', 'legal_name']
 
     def docs(self, ipr):
-        res = []
-        for iprdocalias in IprDocAlias.objects.filter(ipr=ipr).order_by("id").select_related("doc_alias"):
-            if iprdocalias.doc_alias.name.startswith("rfc"):
-                n = iprdocalias.doc_alias.name.upper()
-            elif iprdocalias.rev:
-                n = iprdocalias.doc_alias.name + iprdocalias.rev
-            else:
-                n = iprdocalias.doc_alias.name
-            res.append(n)
-        return u", ".join(res)
+        return u", ".join(a.formatted_name() for a in IprDocAlias.objects.filter(ipr=ipr).order_by("id").select_related("doc_alias"))
+
 admin.site.register(IprDetail, IprDetailAdmin)
 
 class IprNotificationAdmin(admin.ModelAdmin):
@@ -32,4 +24,6 @@ class IprUpdateAdmin(admin.ModelAdmin):
     pass
 admin.site.register(IprUpdate, IprUpdateAdmin)
 
-admin.site.register(IprDocAlias)
+class IprDocAliasAdmin(admin.ModelAdmin):
+    raw_id_fields = ["ipr", "doc_alias"]
+admin.site.register(IprDocAlias, IprDocAliasAdmin)

ietf/ipr/models.py

@@ -90,9 +90,11 @@ class IprDetail(models.Model):
 
     def __unicode__(self):
         return self.title
+
     @models.permalink
     def get_absolute_url(self):
         return ('ietf.ipr.views.show', [str(self.ipr_id)])
+
     def get_submitter(self):
 	try:
 	    return self.contact.get(contact_type=3)
@@ -101,6 +103,9 @@ def get_submitter(self):
         except IprContact.MultipleObjectsReturned:
             return self.contact.filter(contact_type=3)[0]
 
+    def docs(self):
+        return self.iprdocalias_set.select_related("doc_alias", "doc_alias__document").order_by("id")
+
 class IprContact(models.Model):
     TYPE_CHOICES = (
 	(1, 'Patent Holder Contact'),
@@ -138,9 +143,19 @@ class IprUpdate(models.Model):
 
 
 class IprDocAlias(models.Model):
-    ipr = models.ForeignKey(IprDetail, related_name='documents')
+    ipr = models.ForeignKey(IprDetail)
     doc_alias = models.ForeignKey(DocAlias)
     rev = models.CharField(max_length=2, blank=True)
+
+    def formatted_name(self):
+        name = self.doc_alias.name
+        if name.startswith("rfc"):
+            return name.upper()
+        elif self.rev:
+            return "%s-%s" % (name, self.rev)
+        else:
+            return name
+
     def __unicode__(self):
         if self.rev:
             return u"%s which applies to %s-%s" % (self.ipr, self.doc_alias.name, self.rev)

ietf/ipr/new.py

@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-import re
+import re, datetime
 
 from django.shortcuts import render_to_response as render, get_object_or_404
 from django.template import RequestContext
@@ -10,6 +10,7 @@
 
 from ietf.utils import log
 from ietf.utils.mail import send_mail
+from ietf.doc.models import Document, DocAlias
 from ietf.ipr.models import IprDetail, IprDocAlias, IprContact, LICENSE_CHOICES, IprUpdate
 from ietf.ipr.view_sections import section_table
 
@@ -61,8 +62,6 @@ def new(request, type, update=None, submitter=None):
     one form containing fields from 4 tables -- don't build something like this again...
 
     """
-    debug = ""
-
     section_list = section_table[type].copy()
     section_list.update({"title":False, "new_intro":False, "form_intro":True,
         "form_submit":True, "form_legend": True, })
@@ -131,7 +130,7 @@ def clean_rfclist(self):
                 for rfc in rfclist:
                     try:
                         DocAlias.objects.get(name="rfc%s" % int(rfc))
-                    except:
+                    except (DocAlias.DoesNotExist, DocAlias.MultipleObjectsReturned, ValueError):
                         raise forms.ValidationError("Unknown RFC number: %s - please correct this." % rfc)
                 rfclist = " ".join(rfclist)
             return rfclist
@@ -145,19 +144,19 @@ def clean_draftlist(self):
                     if draft.endswith(".txt"):
                         draft = draft[:-4]
                     if re.search("-[0-9][0-9]$", draft):
-                        filename = draft[:-3]
+                        name = draft[:-3]
                         rev = draft[-2:]
                     else:
-                        filename = draft
+                        name = draft
                         rev = None
                     try:
-                        doc = Document.objects.get(docalias__name=filename)
-                    except Exception as e:
+                        doc = Document.objects.get(docalias__name=name)
+                    except (Document.DoesNotExist, Document.MultipleObjectsReturned) as e:
                         log("Exception: %s" % e)
-                        raise forms.ValidationError("Unknown Internet-Draft: %s - please correct this." % filename)
+                        raise forms.ValidationError("Unknown Internet-Draft: %s - please correct this." % name)
                     if rev and doc.rev != rev:
-                        raise forms.ValidationError("Unexpected revision '%s' for draft %s - the current revision is %s.  Please check this." % (rev, filename, id.revision))
-                    drafts.append("%s-%s" % (filename, doc.rev))
+                        raise forms.ValidationError("Unexpected revision '%s' for draft %s - the current revision is %s.  Please check this." % (rev, name, doc.rev))
+                    drafts.append("%s-%s" % (name, doc.rev))
                 return " ".join(drafts)
             return ""
         def clean_licensing_option(self):
@@ -178,11 +177,8 @@ def is_valid(self):
     # POST of the "get updater" form, so we don't want to validate
     # this one.  When we're posting *this* form, submitter is None,
     # even when updating.
-    if (request.method == 'POST' or '_testpost' in request.REQUEST) and not submitter:
-        if request.method == 'POST':
-            data = request.POST.copy()
-        else:
-            data = request.GET.copy()
+    if request.method == 'POST' and not submitter:
+        data = request.POST.copy()
         data["submitted_date"] = datetime.datetime.now().strftime("%Y-%m-%d")
         data["third_party"] = section_list["third_party"]
         data["generic"] = section_list["generic"]
@@ -205,13 +201,13 @@ def is_valid(self):
             # Save IprDetail
             instance = form.save(commit=False)
 
-	    legal_name_genitive = data['legal_name'] + "'" if data['legal_name'].endswith('s') else data['legal_name'] + "'s"
+            legal_name_genitive = data['legal_name'] + "'" if data['legal_name'].endswith('s') else data['legal_name'] + "'s"
             if type == "generic":
                 instance.title = legal_name_genitive + " General License Statement" 
-            if type == "specific":
+            elif type == "specific":
                 data["ipr_summary"] = get_ipr_summary(form.cleaned_data)
                 instance.title = legal_name_genitive + """ Statement about IPR related to %(ipr_summary)s""" % data
-            if type == "third-party":
+            elif type == "third-party":
                 data["ipr_summary"] = get_ipr_summary(form.cleaned_data)
 		ietf_name_genitive = data['ietf_name'] + "'" if data['ietf_name'].endswith('s') else data['ietf_name'] + "'s"
                 instance.title = ietf_name_genitive + """ Statement about IPR related to %(ipr_summary)s belonging to %(legal_name)s""" % data
@@ -294,7 +290,7 @@ def is_valid(self):
         form.unbound_form = True
 
     # log(dir(form.ietf_contact_is_submitter))
-    return render("ipr/details_edit.html", {"ipr": form, "section_list":section_list, "debug": debug}, context_instance=RequestContext(request))
+    return render("ipr/details_edit.html", {"ipr": form, "section_list":section_list}, context_instance=RequestContext(request))
 
 def update(request, ipr_id=None):
     """Update a specific IPR disclosure"""
@@ -320,9 +316,7 @@ def __init__(self, *args, **kwargs):
 
 	if request.method == 'POST':
 	    form = UpdateForm(request.POST)
-        elif '_testpost' in request.REQUEST:
-            form = UpdateForm(request.GET)
-	else:
+        else:
 	    form = UpdateForm()
 
 	if not(form.is_valid()):

ietf/ipr/search.py

@@ -85,12 +85,12 @@ def search(request):
             # IPR list with documents
             elif search_type == "patent_search":
                 iprs = IprDetail.objects.filter(legal_name__icontains=q, status__in=[1,3]).order_by("-submitted_date", "-ipr_id")
-                count = iprs.count()
+                count = len(iprs)
                 iprs = [ ipr for ipr in iprs if not ipr.updated_by.all() ]
                 return render("ipr/search_holder_result.html", {"q": q, "iprs": iprs, "count": count },
                                   context_instance=RequestContext(request) )
 
-            # Search by content of email or pagent_info field
+            # Search by patents field or content of emails for patent numbers
             # IPR list with documents
             elif search_type == "patent_info_search":
                 if len(q) < 3: