More stuff set up

1 files changed, 49 insertions, 49 deletions

diff --git a/test/test.ts b/test/test.ts
index ad6c96781..8c1740ba6 100644
--- a/test/test.ts
+++ b/test/test.ts
@@ -1,21 +1,21 @@
-import { NumberController } from "../src/controllers/NumberController";
+import { NumberField } from "../src/fields/NumberField";
 import { expect } from 'chai';
 import 'mocha'
-import { KeyController } from "../src/controllers/KeyController";
-import { DocumentController } from "../src/controllers/DocumentController";
+import { Key } from "../src/fields/Key";
+import { Document } from "../src/fields/Document";
 import { autorun, reaction } from "mobx";
-import { DocumentReferenceController } from "../src/controllers/DocumentReferenceController";
-import { TextController } from "../src/controllers/TextController";
-import { FieldController } from "../src/controllers/FieldController";
+import { DocumentReference } from "../src/fields/DocumentReference";
+import { TextField } from "../src/fields/TextField";
+import { Field } from "../src/fields/Field";
 
 describe('Number Controller', () => {
     it('Should be constructable', () => {
-        const numController = new NumberController(15);
+        const numController = new NumberField(15);
         expect(numController.Data).to.equal(15);
     });
 
     it('Should update', () => {
-        const numController = new NumberController(15);
+        const numController = new NumberField(15);
         let ran = false;
         reaction(() => numController.Data, (data) => {ran = true;})
         expect(ran).to.equal(false);
@@ -26,25 +26,25 @@ describe('Number Controller', () => {
 
 describe("Document", () =>{
     it('should hold fields', () => {
-        let key = new KeyController("Test");
-        let key2 = new KeyController("Test2");
-        let field = new NumberController(15);
-        let doc = new DocumentController();
+        let key = new Key("Test");
+        let key2 = new Key("Test2");
+        let field = new NumberField(15);
+        let doc = new Document();
         doc.SetField(key, field);
-        let getField = doc.GetFieldT(key, NumberController);
-        let getField2 = doc.GetFieldT(key2, NumberController);
+        let getField = doc.GetFieldT(key, NumberField);
+        let getField2 = doc.GetFieldT(key2, NumberField);
         expect(getField).to.equal(field);
         expect(getField2).to.equal(undefined);
     });
 
     it('should update', () => {
-        let doc = new DocumentController();
-        let key = new KeyController("Test");
+        let doc = new Document();
+        let key = new Key("Test");
         let ran = false;
         reaction(() => doc.GetField(key), (field) => {ran = true});
         expect(ran).to.equal(false);
 
-        doc.SetField(key, new NumberController(5));
+        doc.SetField(key, new NumberField(5));
 
         expect(ran).to.equal(true);
     });
@@ -52,19 +52,19 @@ describe("Document", () =>{
 
 describe("Reference", () => {
     it('should dereference', () => {
-        let doc = new DocumentController();
-        let doc2 = new DocumentController();
-        const key = new KeyController("test");
-        const key2 = new KeyController("test2");
+        let doc = new Document();
+        let doc2 = new Document();
+        const key = new Key("test");
+        const key2 = new Key("test2");
 
-        const numCont = new NumberController(55);
+        const numCont = new NumberField(55);
         doc.SetField(key, numCont);
-        let ref = new DocumentReferenceController(doc, key);
-        let ref2 = new DocumentReferenceController(doc, key2);
+        let ref = new DocumentReference(doc, key);
+        let ref2 = new DocumentReference(doc, key2);
         doc2.SetField(key2, ref);
 
-        let ref3 = new DocumentReferenceController(doc2, key2);
-        let ref4 = new DocumentReferenceController(doc2, key);
+        let ref3 = new DocumentReference(doc2, key2);
+        let ref4 = new DocumentReference(doc2, key);
         
         expect(ref.Dereference()).to.equal(numCont);
         expect(ref.DereferenceToRoot()).to.equal(numCont);
@@ -77,13 +77,13 @@ describe("Reference", () => {
     });
     
     it('should work with prototypes', () => {
-        let doc = new DocumentController;
+        let doc = new Document;
         let doc2 = doc.MakeDelegate();
-        let key = new KeyController("test");
+        let key = new Key("test");
         expect(doc.GetField(key)).to.equal(undefined);
         expect(doc2.GetField(key)).to.equal(undefined);
-        let num = new NumberController(55);
-        let num2 = new NumberController(56);
+        let num = new NumberField(55);
+        let num2 = new NumberField(56);
 
         doc.SetField(key, num);
         expect(doc.GetField(key)).to.equal(num);
@@ -95,23 +95,23 @@ describe("Reference", () => {
     });
 
     it('should update through layers', () => {
-        let doc = new DocumentController();
-        let doc2 = new DocumentController();
-        let doc3 = new DocumentController();
-        const key = new KeyController("test");
-        const key2 = new KeyController("test2");
-        const key3 = new KeyController("test3");
-
-        const numCont = new NumberController(55);
+        let doc = new Document();
+        let doc2 = new Document();
+        let doc3 = new Document();
+        const key = new Key("test");
+        const key2 = new Key("test2");
+        const key3 = new Key("test3");
+
+        const numCont = new NumberField(55);
         doc.SetField(key, numCont);
-        const ref = new DocumentReferenceController(doc, key);
+        const ref = new DocumentReference(doc, key);
         doc2.SetField(key2, ref);
-        const ref3 = new DocumentReferenceController(doc2, key2);
+        const ref3 = new DocumentReference(doc2, key2);
         doc3.SetField(key3, ref3);
 
         let ran = false;
         reaction(() => {
-            let field = (<FieldController>(<FieldController>doc3.GetField(key3)).DereferenceToRoot()).GetValue();
+            let field = (<Field>(<Field>doc3.GetField(key3)).DereferenceToRoot()).GetValue();
             return field;
         }, (field) => {
             ran = true;
@@ -122,32 +122,32 @@ describe("Reference", () => {
         expect(ran).to.equal(true);
         ran = false;
 
-        doc.SetField(key, new NumberController(33));
+        doc.SetField(key, new NumberField(33));
         expect(ran).to.equal(true);
         ran = false;
 
-        doc.SetField(key2, new NumberController(4));
+        doc.SetField(key2, new NumberField(4));
         expect(ran).to.equal(false);
 
-        doc2.SetField(key2, new TextController("hello"));
+        doc2.SetField(key2, new TextField("hello"));
         expect(ran).to.equal(true);
         ran = false;
 
-        doc3.SetField(key3, new TextController("world"));
+        doc3.SetField(key3, new TextField("world"));
         expect(ran).to.equal(true);
         ran = false;
     });
 
     it('should update with prototypes', () => {
-        let doc = new DocumentController();
+        let doc = new Document();
         let doc2 = doc.MakeDelegate();
-        const key = new KeyController("test");
+        const key = new Key("test");
 
-        const numCont = new NumberController(55);
+        const numCont = new NumberField(55);
 
         let ran = false;
         reaction(() => {
-            let field = doc2.GetFieldT(key, NumberController);
+            let field = doc2.GetFieldT(key, NumberField);
             if(field) {
                 return field.Data;
             }