Merged regressiontests and modeltests into the test root.

2 files changed, 0 insertions, 68 deletions

diff --git a/tests/regressiontests/comment_tests/fixtures/comment_tests.json b/tests/regressiontests/comment_tests/fixtures/comment_tests.json
deleted file mode 100644
index 55e2161a4c..0000000000
--- a/tests/regressiontests/comment_tests/fixtures/comment_tests.json
+++ /dev/null
@@ -1,53 +0,0 @@
-[
-  {
-    "model" : "comment_tests.book",
-    "pk" : 1,
-    "fields" : {
-        "dewey_decimal" : "12.34"
-    }
-  },
-  {
-    "model" : "comment_tests.author",
-    "pk" : 1,
-    "fields" : {
-        "first_name" : "John",
-        "last_name" : "Smith"
-    }
-  },
-  {
-    "model" : "comment_tests.author",
-    "pk" : 2,
-    "fields" : {
-        "first_name" : "Peter",
-        "last_name" : "Jones"
-    }
-  },
-  {
-    "model" : "comment_tests.article",
-    "pk" : 1,
-    "fields" : {
-        "author" : 1,
-        "headline" : "Man Bites Dog"
-    }
-  },
-  {
-    "model" : "comment_tests.article",
-    "pk" : 2,
-    "fields" : {
-        "author" : 2,
-        "headline" : "Dog Bites Man"
-    }
-  },
-
-  {
-    "model" : "auth.user",
-    "pk" : 100,
-    "fields" : {
-        "username" : "normaluser",
-        "password" : "34ea4aaaf24efcbb4b30d27302f8657f",
-        "first_name": "Joe",
-        "last_name": "Normal",
-        "email": "joe.normal@example.com"
-    }
-  }
-]
diff --git a/tests/regressiontests/comment_tests/fixtures/comment_utils.xml b/tests/regressiontests/comment_tests/fixtures/comment_utils.xml
deleted file mode 100644
index a39bbf63e1..0000000000
--- a/tests/regressiontests/comment_tests/fixtures/comment_utils.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<django-objects version="1.0">
-  <object pk="1" model="comment_tests.entry">
-      <field type="CharField" name="title">ABC</field>
-      <field type="TextField" name="body">This is the body</field>
-      <field type="DateField" name="pub_date">2008-01-01</field>
-      <field type="BooleanField" name="enable_comments">True</field>
-  </object>
-  <object pk="2" model="comment_tests.entry">
-      <field type="CharField" name="title">XYZ</field>
-      <field type="TextField" name="body">Text here</field>
-      <field type="DateField" name="pub_date">2008-01-02</field>
-      <field type="BooleanField" name="enable_comments">False</field>
-  </object>
-</django-objects>