Nawigacja

← Previous Change
Next Change →

Zbiór zmian 896 dla trunk/eCard/eCardMVC

Data:

2009-11-24 12:24:57 (16 years ago)

Autor:

alina

Opis:

re #215 zmiana parametrow w konstruktorze PlatnosciController?, dostosowanie testow do zmiany

Lokalizacja:

trunk/eCard/eCardMVC

Pliki:

: 9 zmodyfikowane

Platnosci.Core/Interface/IDataContext.cs (zmodyfikowane) (1 diff)
Platnosci.Core/Interface/IRepository.cs (zmodyfikowane) (1 diff)
Platnosci.Core/Linq/Repository.cs (zmodyfikowane) (1 diff)
Platnosci.Tests/Web/FakeDataContext.cs (zmodyfikowane) (3 diffs)
Platnosci.Tests/Web/Function.cs (zmodyfikowane) (2 diffs)
Platnosci.Tests/Web/PlatnosciControllerTests.cs (zmodyfikowane) (9 diffs)
Platnosci.Tests/Web/TestMethods.cs (zmodyfikowane) (2 diffs)
Platnosci/Controllers/MerchantController.cs (zmodyfikowane) (3 diffs)
Platnosci/Controllers/PlatnoscController.cs (zmodyfikowane) (9 diffs)

Legenda:

: Bez zmian
: Dodane
: Usunięte

trunk/eCard/eCardMVC/Platnosci.Core/Interface/IDataContext.cs

r877	r896
14	14	void Insert<T>(T item) where T : class;
15	15	IQueryable<vPlatnosciEcard> FindInvoiceByNipNumber(string nip, string numer);
16		~~IQueryable<vPlatnosciEcard> FindInvoiceById(int id);~~
17	16	List<PotwierdzeniaEcard> FindItemsByIdFaktury(int idFaktury);
18		~~IQueryable<PlatnosciEcard> FindPaymentByOrdernumber(int ordernumber);~~
19	17	}
20	18	}

trunk/eCard/eCardMVC/Platnosci.Core/Interface/IRepository.cs

r888	r896
40	40	IQueryable<vPlatnosciEcard> FindInvoiceByNipNumber(string nip, string numer);
41	41
42		~~IQueryable<vPlatnosciEcard> FindInvoiceById(int id);~~
43
44	42	List<PotwierdzeniaEcard> FindItemsByIdFaktury(int idFaktury);
45
46		~~IQueryable<PlatnosciEcard> FindPaymentByOrdernumber(int ordernumber);~~
47	43	}
48	44	}

trunk/eCard/eCardMVC/Platnosci.Core/Linq/Repository.cs

r888	r896
88	88	return _dataContext.FindInvoiceByNipNumber(nip, numer);
89	89	}
90		~~public IQueryable<vPlatnosciEcard> FindInvoiceById(int id)~~
91		{
92		~~return _dataContext.FindInvoiceById(id);~~
93		}
94	90	public List<PotwierdzeniaEcard> FindItemsByIdFaktury(int idFaktury)
95	91	{
96	92	return _dataContext.FindItemsByIdFaktury(idFaktury);
97		}
98		public IQueryable<PlatnosciEcard> FindPaymentByOrdernumber(int ordernumber)
99		{
100		return _dataContext.FindPaymentByOrdernumber(ordernumber);
101		}
	93	}
102	94	}
103	95	}

trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs

r888	r896
4	4	using System.Web;
5	5	using Platnosci.Core.Interface;
	6	using Platnosci.Core.Linq;
6	7
7		namespace Platnosci.~~Core.Linq~~
	8	namespace Platnosci.Tests.Web
8	9	{
9	10	public class FakeDataContext : IDataContext
10	11	{
11		private List<vPlatnosciEcard> listaPlatnosci = new List<vPlatnosciEcard>();
12		private List<PotwierdzeniaEcard> listaPotwierdzenia = new List<PotwierdzeniaEcard>();
13		private List<PlatnosciEcard> listaPl = new List<PlatnosciEcard>();
14		private List<object> lista = new List<object>();
	12	private List<PlatnosciEcard> listaPayment = new List<PlatnosciEcard>();
	13
15	14	private string code_Ok = "payment_deposited"; //transakcja potwierdzona do rozliczenia
16		private string code_Bad = "payment_declined"; //transakcja odrzucona
17
18		public vPlatnosciEcard DodajPlatnosc(int id, string numer, string nip)
19		{
20		vPlatnosciEcard p = new vPlatnosciEcard();
21		p.ID_faktury = id;
22		p.Faktura_Numer = numer;
23		p.nip = nip;
24
25		return p;
26		}
27		public PotwierdzeniaEcard DodajPotwierdzenie(string code, int ordernumber)
28		{
29		PotwierdzeniaEcard potwierdzenie = new PotwierdzeniaEcard();
30		potwierdzenie.CURRENTSTATE = code;
31		potwierdzenie.ORDERNUMBER = ordernumber;
32
33		return potwierdzenie;
34		}
35		public PlatnosciEcard createNewPayment(int ordernumber, bool status, DateTime data, int id_faktury)
36		{
37		PlatnosciEcard platnosc = new PlatnosciEcard();
38		platnosc.ORDERNUMBER = ordernumber;
39		platnosc.Status = status;
40		platnosc.Status_data = data;
41		platnosc.IDFaktury = id_faktury;
42
43		return platnosc;
44		}
45		public FakeDataContext()
46		{
47		listaPlatnosci.Add(DodajPlatnosc(1,"1","123"));
48		listaPlatnosci.Add(DodajPlatnosc(2, "2", "aaa"));
49		}
50		//public FakeDataContext(int fake)
51		//{
52		// if (fake == 1)
53		// {
54		// listaPlatnosci.Add(DodajPlatnosc(1000, "abcd", "12345"));
55		// listaPl.Add(createNewPayment(9999, true, DateTime.Now, 1000));
56		// listaPotwierdzenia.Add(DodajPotwierdzenie(code_Ok, 9999));
57		// }
58		// else if (fake == 2)
59		// {
60		// listaPl.Add(createNewPayment(9999, false, DateTime.Now, 1000));
61		// }
62		//}
63
64
65		private readonly List<object> _dataStore = new List<object>();
	15
	16	private readonly List<object> lista = new List<object>();
	17	private Function _f = new Function();
	18
66	19
67	20	public IQueryable<T> GetTable<T>() where T : class
68	21	{
69		var query = ~~_dataStore~~.Where(objects => typeof(T).IsAssignableFrom(objects.GetType()));
	22	var query = lista.Where(objects => typeof(T).IsAssignableFrom(objects.GetType()));
70	23	return query.Select(o => (T)o).AsQueryable();
71	24	}
…	…
73	26	public void Insert<T>(T item) where T : class
74	27	{
75		~~_dataStore~~.Add(item);
	28	lista.Add(item);
76	29	}
77	30
78	31	public void Delete<T>(T item) where T : class
79	32	{
80		~~_dataStore~~.Remove(item);
	33	lista.Remove(item);
81	34	}
82	35
…	…
97	50	{
98	51	}
99
100		~~public IQueryable<vPlatnosciEcard> FindInvoiceById(int id)~~
101		{
102		~~List<object> lp = lista;~~
103		~~for (int i = 0; i < lp.Count(); i++)~~
104		{
105		~~if (lp[i].GetType() == typeof(vPlatnosciEcard))~~
106		{
107		~~listaPlatnosci.Add((vPlatnosciEcard)lp[i]);~~
108		}
109		}
110		~~lista.Clear();~~
111
112		~~var query = from l in listaPlatnosci~~
113		~~where l.ID_faktury == id~~
114		~~select l;~~
115
116		~~return query.AsQueryable();~~
117		}
118	52	public IQueryable<vPlatnosciEcard> FindInvoiceByNipNumber(string nip, string numer)
119	53	{
120		List<object> lp = lista;
121		for (int i = 0; i < lp.Count(); i++)
122		{
123		if (lp[i].GetType() == typeof(vPlatnosciEcard))
124		{
125		listaPlatnosci.Add((vPlatnosciEcard)lp[i]);
126		}
127		}
128		lista.Clear();
129
130		var query = from l in listaPlatnosci
131		where l.nip == nip && l.Faktura_Numer == numer
132		select l;
133
134		return query.AsQueryable();
	54	throw new NotImplementedException();
135	55	}
136	56	public List<PotwierdzeniaEcard> FindItemsByIdFaktury(int idFaktury)
137	57	{
138		List<PotwierdzeniaEcard> listazaplaconych = new List<PotwierdzeniaEcard>();
139		for (int j = 0; j < listaPl.Count(); j++)
	58
	59	PlatnosciEcard platnosc = _f.createNewPayment(123456, true, DateTime.Now, 123);
	60	List<PlatnosciEcard> payment = new List<PlatnosciEcard>();
	61	List<PotwierdzeniaEcard> listaConfirm = new List<PotwierdzeniaEcard>();
	62	listaConfirm.Add((PotwierdzeniaEcard)lista[0]);
	63	payment.Add(platnosc);
	64
	65	List<PotwierdzeniaEcard> new_confirm = new List<PotwierdzeniaEcard>();
	66
	67	if (platnosc.IDFaktury == idFaktury)
140	68	{
141		for (int i = 0; i < listaPotwierdzenia.Count(); i++)
142		{
143		if (listaPl[j].IDFaktury == idFaktury && listaPl[j].ORDERNUMBER == listaPotwierdzenia[i].ORDERNUMBER && listaPotwierdzenia[i].CURRENTSTATE == code_Ok) listazaplaconych.Add(listaPotwierdzenia[i]);
144		}
	69	if (listaConfirm[0].ORDERNUMBER == platnosc.ORDERNUMBER && listaConfirm[0].CURRENTSTATE == code_Ok)
	70	new_confirm.Add(listaConfirm[0]);
145	71	}
146		return listazaplaconych;
147		}
148		public IQueryable<PlatnosciEcard> FindPaymentByOrdernumber(int ordernumber)
149		{
150		var query = from l in listaPl
151		where l.ORDERNUMBER == ordernumber
152		select l;
153
154		return query.AsQueryable();
	72	System.Diagnostics.Debug.WriteLine("lista" + new_confirm.Count());
	73	return new_confirm;
155	74	}
156	75	}

trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs

r888	r896
11	11	public class Function
12	12	{
13		public vPlatnosciEcard create~~Payment~~(int id, string nip, string fak_numer, decimal brutto, byte SystemKsiegowy)
	13	public vPlatnosciEcard createInvoice(int id, string nip, string fak_numer, decimal brutto, byte SystemKsiegowy)
14	14	{
15	15
…	…
33	33	return platnosc;
34	34	}
	35	public PotwierdzeniaEcard createConfirm(string code, int ordernumber)
	36	{
	37	PotwierdzeniaEcard potwierdzenie = new PotwierdzeniaEcard();
	38	potwierdzenie.CURRENTSTATE = code;
	39	potwierdzenie.ORDERNUMBER = ordernumber;
	40
	41	return potwierdzenie;
	42	}
35	43	public Payer createPayer(int id, string name, string surname)
36	44	{

trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs

r888	r896
26	26	private string code_Bad = "payment_declined"; //transakcja odrzucona
27	27	private DateTime data = DateTime.Now;
28		private string testNip1 = "12345";
29		private string testNip2 = "01234";
30		private int testIdFaktury = 1000;
31		private string testNumerFaktury = "abcd";
32		private decimal testBrutto = 200;
	28
33	29	private int test = 1; //oznacza, ze nie ustawiamy tlumaczen poprzez funkcje ustawTlumaczenia()
34	30	//w controllerze Platnosci, tylko poprzez funkcje setXXXXXXX()
35	31
36	32	private Function _f = new Function();
37		private FunkcjePlatnosci _func = new FunkcjePlatnosci();
38
	33
39	34	[Test]
40	35	[Category("Unit")]
41	36	public void Status_Saves_Correct_Transaction()
42	37	{
43		// //IDataContext fake = new FakeDataContext();
44		// var repository = new Repository<PlatnosciEcard>(new FakeDataContext());
45		// var platnosci = _f.createNewPayment(orderNumber, false, DateTime.Now, 12345); //new PlatnosciEcard();
46		// repository.Insert(platnosci);
47		// repository.SubmitChanges();
48
49
50		// DateTime datka = DateTime.Now;
51		// var builder = new TestControllerBuilder();
52		// var controller = new PlatnoscController(fake,test);
53		// builder.InitializeController(controller);
54		// builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString());
55		// builder.Form.Add("AUTHTIME", DateTime.Now.ToString());
56		// builder.Form.Add("DATATRANSMISJI", DateTime.Now.ToString());
57		// builder.Form.Add("ORDERNUMBER", orderNumber.ToString());
58		// builder.Form.Add("CURRENTSTATE", code_Ok);
59
60		// var result = controller.Status();
61
62		// IRepository<PotwierdzeniaEcard> _rep = new Repository<PotwierdzeniaEcard>(new FakeDataContext());
63
64
65		// System.Diagnostics.Debug.WriteLine("" + _rep.Count());
66
67		// //var potwierdzeniaEcard = _rep.Find(p => p.ORDERNUMBER == orderNumber).First();
68		//// Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(merchantNumber));
69		// PlatnosciEcard payment_after_update = _rep.FindPaymentByOrdernumber(orderNumber).SingleOrDefault();
70		// System.Diagnostics.Debug.WriteLine(payment_after_update.Status_data + " > " + datka);
71		// Assert.That(payment_after_update.Status, Is.EqualTo(true));
72
	38	var repository = new Repository<PlatnosciEcard>(new FakeDataContext());
	39	var platnosci = _f.createNewPayment(orderNumber, false, DateTime.Now, 12345);
	40	repository.Insert(platnosci);
	41	repository.SubmitChanges();
	42
	43	IRepository<PotwierdzeniaEcard> rep = new Repository<PotwierdzeniaEcard>(new FakeDataContext());
	44
	45	var builder = new TestControllerBuilder();
	46	var controller = new PlatnoscController(null, repository, rep, test);
	47	builder.InitializeController(controller);
	48	builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString());
	49	builder.Form.Add("AUTHTIME", DateTime.Now.ToString());
	50	builder.Form.Add("DATATRANSMISJI", DateTime.Now.ToString());
	51	builder.Form.Add("ORDERNUMBER", orderNumber.ToString());
	52	builder.Form.Add("CURRENTSTATE", code_Ok);
	53
	54	var result = controller.Status();
	55
	56	System.Diagnostics.Debug.WriteLine("rep:" + rep.Count() + " repPl: " + repository.Count() );
	57
	58	var potwierdzeniaEcard = rep.Find(o => o.ORDERNUMBER == orderNumber).SingleOrDefault();
	59	Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(merchantNumber));
	60	PlatnosciEcard payment_after_update = repository.FindOne(orderNumber);
	61	System.Diagnostics.Debug.WriteLine("Status musi byc 'true'. Jest " + payment_after_update.Status);
	62	Assert.That(payment_after_update.Status, Is.EqualTo(true));
73	63	}
74	64	[Test]
…	…
76	66	public void Status_Saves_Correct_Transaction_IncorrectUpdate()
77	67	{
78		FakeDataContext fake = new FakeDataContext(2);
79		DateTime datka = DateTime.Now;
	68	var repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
	69	var platnosci = _f.createNewPayment(orderNumber, false, DateTime.Now, 12345);
	70	repPayment.Insert(platnosci);
	71	repPayment.SubmitChanges();
	72	IRepository<PotwierdzeniaEcard> repConfirm = new Repository<PotwierdzeniaEcard>(new FakeDataContext());
	73
80	74	var builder = new TestControllerBuilder();
81		var controller = new PlatnoscController(~~fake,~~test);
	75	var controller = new PlatnoscController(null, repPayment, repConfirm, test);
82	76	builder.InitializeController(controller);
83	77	builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString());
…	…
87	81	builder.Form.Add("CURRENTSTATE", code_Bad);
88	82
89		var result = controller.Status();
90
91		IRepository<PotwierdzeniaEcard> _rep = new Repository<PotwierdzeniaEcard>(fake);
92		var potwierdzeniaEcard = _rep.Find(p => p.ORDERNUMBER == orderNumber).First();
	83	var result = controller.Status();
	84
	85	var potwierdzeniaEcard = repConfirm.Find(o => o.ORDERNUMBER == orderNumber).SingleOrDefault();
93	86	Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(merchantNumber));
94
95	87
96		PlatnosciEcard payment_after_update = _rep.FindPaymentByOrdernumber(orderNumber).SingleOrDefault();
97		System.Diagnostics.Debug.WriteLine(payment_after_update.Status_data + " <= " + datka );
98		Assert.That(payment_after_update.Status_data, Is.LessThanOrEqualTo(datka));
99		}
	88	PlatnosciEcard payment_after_update = repPayment.FindOne(orderNumber);
	89	System.Diagnostics.Debug.WriteLine("Status musi byc 'false'. Jest " + payment_after_update.Status);
	90	Assert.That(payment_after_update.Status, Is.EqualTo(false));
	91	}
	92
100	93	[Test]
101	94	[Category("Unit")]
102	95	public void StatusIsUpdated()
103	96	{
104		FakeDataContext fake = new FakeDataContext(3);
105		IRepository<PlatnosciEcard> _rep = new Repository<PlatnosciEcard>(fake);
106
107		PlatnosciEcard platnosc = _f.createNewPayment(orderNumber, false, data.AddDays(-1), 1);
108		_rep.Insert(platnosc);
109
110		DateTime datka = DateTime.Now;
111		var controller = new PlatnoscController(fake,test);
	97	IRepository<PlatnosciEcard> repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
	98	PlatnosciEcard platnosc = _f.createNewPayment(orderNumber, false, data, 1);
	99	repPayment.Insert(platnosc);
	100
	101	var controller = new PlatnoscController(null, repPayment, null, test);
112	102	controller.UpdateStatus(orderNumber, code_Ok);
113	103
114	104	PlatnosciEcard payment_after_update = new PlatnosciEcard();
115		payment_after_update = ~~_rep~~.FindOne(orderNumber);
116
	105	payment_after_update = repPayment.FindOne(orderNumber);
	106	System.Diagnostics.Debug.WriteLine("Status musi byc 'true'. Jest " + payment_after_update.Status);
117	107	Assert.That(payment_after_update.Status, Is.EqualTo(true));
118	108	}
…	…
121	111	public void StatusIsNotUpdated()
122	112	{
123		FakeDataContext fake = new FakeDataContext();
124		IRepository<PlatnosciEcard> _rep = new Repository<PlatnosciEcard>(fake);
125
126		PlatnosciEcard platnosc = _f.createNewPayment(orderNumber, true, data, 1);
127		_rep.Insert(platnosc);
128
129		var controller = new PlatnoscController(fake,test);
	113	IRepository<PlatnosciEcard> repPayment = new Repository<PlatnosciEcard>(new FakeDataContext());
	114
	115	PlatnosciEcard platnosc = _f.createNewPayment(orderNumber, false, data, 1);
	116	repPayment.Insert(platnosc);
	117
	118	var controller = new PlatnoscController(null, repPayment, null, test);
130	119	controller.UpdateStatus(orderNumber, code_Bad);
131	120
132	121	PlatnosciEcard payment_after_update = new PlatnosciEcard();
133		payment_after_update = _rep.FindOne(i => i.ORDERNUMBER == orderNumber);
134		Assert.That(payment_after_update.Status_data, Is.EqualTo(data));
	122	payment_after_update = repPayment.FindOne(i => i.ORDERNUMBER == orderNumber);
	123	System.Diagnostics.Debug.WriteLine("Status musi byc 'false'. Jest " + payment_after_update.Status);
	124	Assert.That(payment_after_update.Status, Is.EqualTo(false));
135	125	}
136	126	[Test]
…	…
138	128	public void ActionShowPayment_IncorrectUserIdentity_ReturnErrorView()
139	129	{
140		FakeDataContext fake = new FakeDataContext();
141		IRepository<vPlatnosciEcard> _rep = new Repository<vPlatnosciEcard>(fake);
142
143		vPlatnosciEcard platnosc = _f.createPayment(testIdFaktury, testNip1, testNumerFaktury, 0, 0);
144		_rep.Insert(platnosc);
145
146		var controller = new PlatnoscController(fake,test);
147		controller.ControllerContext = _f.createControllerContext(testNip2);
	130	IRepository<vPlatnosciEcard> repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext());
	131	vPlatnosciEcard platnosc = _f.createInvoice(123, "nip1", "", 0, 0);
	132	repVPayment.Insert(platnosc);
	133
	134	var controller = new PlatnoscController(repVPayment, null, null, test);
	135	controller.ControllerContext = _f.createControllerContext("nip2");
148	136	controller.setWeryfikacja("Niepoprawny nip");
149	137
150		var result = controller.Show(~~testIdFaktury.ToString()~~,"pl") as ViewResult;
	138	var result = controller.Show("123","pl") as ViewResult;
151	139	var error = (ErrorViewData)result.ViewData.Model;
152
	140
153	141	Assert.That(error.error, Is.EqualTo("Niepoprawny nip"));
154	142	Assert.That(result.ViewName, Is.EqualTo("Error1"));
…	…
158	146	public void ActionShowPayment_PaymentNotFound_ReturnErrorView()
159	147	{
160		FakeDataContext fake = new FakeDataContext();
161		// IRepository<vPlatnosciEcard> _rep = new Repository<vPlatnosciEcard>(fake);
162
163		var controller = new PlatnoscController(fake,test);
164
165		controller.ControllerContext = _f.createControllerContext(testNip1);
	148	IRepository<vPlatnosciEcard> repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext());
	149	vPlatnosciEcard platnosc = _f.createInvoice(123, "", "", 0, 0);
	150	repVPayment.Insert(platnosc);
	151
	152	var controller = new PlatnoscController(repVPayment, null, null, test);
166	153	controller.setBrakDanych("Platnosc o takim id nie istnieje");
167	154
168		var result = controller.Show(~~testIdFaktury.ToString()~~, "pl") as ViewResult;
	155	var result = controller.Show("1234", "pl") as ViewResult;
169	156	var error = (ErrorViewData)result.ViewData.Model;
170	157
…	…
174	161	[Test]
175	162	[Category("Unit")]
176		public void ActionShowPayment_PaymentIsPaid(){
	163	public void ActionShowPayment_PaymentIsPaid()
	164	{
177	165	//Tworzymy takie dane aby platnosc o danym id byla juz zaplacona
178		FakeDataContext fake = new FakeDataContext(1);
179		var controller = new PlatnoscController(fake,test);
180
181		controller.ControllerContext = _f.createControllerContext(testNip1);
	166	var repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext());
	167	var invoice = _f.createInvoice(123, "nip1", "aaa", 0, 0);
	168	repVPayment.Insert(invoice);
	169	repVPayment.SubmitChanges();
	170
	171	var repConfirm = new Repository<PotwierdzeniaEcard>(new FakeDataContext());
	172	var confirm = _f.createConfirm(code_Ok, 123456);
	173	repConfirm.Insert(confirm);
	174	repConfirm.SubmitChanges();
	175
	176	var controller = new PlatnoscController(repVPayment, null, repConfirm, test);
	177	controller.ControllerContext = _f.createControllerContext("nip1");
182	178	controller.setZaplacono("Platnosc zostala uregulowana");
183	179
184		var result = controller.Show(~~testIdFaktury.ToString()~~, "pl") as ViewResult;
	180	var result = controller.Show("123", "pl") as ViewResult;
185	181	var view = (InvoiceDetailsViewData)result.ViewData.Model;
186	182
…	…
192	188	public void ActionShowPayment_CorrectData_ReturnViewForPayment()
193	189	{
194		FakeDataContext fake = new FakeDataContext();
195		IRepository<vPlatnosciEcard> _rep = new Repository<vPlatnosciEcard>(fake);
196
197		vPlatnosciEcard platnosc = _f.createPayment(testIdFaktury, testNip1, testNumerFaktury, testBrutto, 0);
198		_rep.Insert(platnosc);
199
200		var controller = new PlatnoscController(fake,test);
201		controller.ControllerContext = _f.createControllerContext(testNip1);
202
203		var result = controller.Show(testIdFaktury.ToString(), "pl") as ViewResult;
204		Assert.IsInstanceOfType(typeof(InvoiceDetailsViewData), result.ViewData.Model);
	190	IRepository<vPlatnosciEcard> repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext());
	191	vPlatnosciEcard platnosc = _f.createInvoice(123, "nip1", "numer", 200, 0);
	192	repVPayment.Insert(platnosc);
	193
	194	var repConfirm = new Repository<PotwierdzeniaEcard>(new FakeDataContext());
	195	var confirm = _f.createConfirm(code_Ok, 1);
	196	repConfirm.Insert(confirm);
	197	repConfirm.SubmitChanges();
	198
	199	var controller = new PlatnoscController(repVPayment, null, repConfirm, test);
	200	controller.ControllerContext = _f.createControllerContext("nip1");
	201
	202	var result = controller.Show("123", "pl") as ViewResult;
	203
	204	var view = (InvoiceDetailsViewData)result.ViewData.Model;
	205	System.Diagnostics.Debug.WriteLine("Brutto 200: " + view.vPlatnosciEcard.Brutto);
	206	System.Diagnostics.Debug.WriteLine("Nr Faktury musi byc 'numer'. Jest " + view.vPlatnosciEcard.Faktura_Numer);
	207	Assert.That(view.vPlatnosciEcard.Brutto, Is.EqualTo(200));
	208	Assert.That(view.vPlatnosciEcard.Faktura_Numer, Is.EqualTo("numer"));
	209	}
	210	[Test]
	211	[Category("Unit")]
	212	public void AfterPay_PaymentIsNotValid()
	213	{
	214	IRepository<vPlatnosciEcard> repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext());
	215	vPlatnosciEcard platnosc = _f.createInvoice(123, "nip1", "numer", 200, 0);
	216	repVPayment.Insert(platnosc);
	217
	218	var controller = new PlatnoscController(repVPayment, null, null, test);
	219	controller.ControllerContext = _f.createControllerContext("nip1");
205	220
206		var view = (InvoiceDetailsViewData)result.ViewData.Model;
207		Assert.That(view.vPlatnosciEcard.Brutto, Is.EqualTo(testBrutto));
208		Assert.That(view.vPlatnosciEcard.Faktura_Numer, Is.EqualTo(testNumerFaktury));
209		}
210		[Test]
211		[Category("Unit")]
212		public void AfterPay_PaymentIsNotValid()
213		{
214		FakeDataContext fake = new FakeDataContext();
215		IRepository<vPlatnosciEcard> _rep = new Repository<vPlatnosciEcard>(fake);
216
217		vPlatnosciEcard platnosc = _f.createPayment(testIdFaktury, testNip1, testNumerFaktury, testBrutto, 2);
218		_rep.Insert(platnosc);
219
220		var controller = new PlatnoscController(fake,1);
221		controller.ControllerContext = _f.createControllerContext(testNip1);
222
223		Payer payer = _f.createPayer(testIdFaktury, "", "test"); //Brak imienia
	221	Payer payer = _f.createPayer(123, "", "test"); //Brak imienia
224	222	controller.Show(payer, "pl");
225
226	223	Assert.That(controller.ModelState.IsValid, Is.False);
227	224	}
…	…
230	227	public void AfterPay_PaymentIsValid()
231	228	{
232		FakeDataContext fake = new FakeDataContext();
233		IRepository<vPlatnosciEcard> _rep = new Repository<vPlatnosciEcard>(fake);
234
235		vPlatnosciEcard platnosc = _f.createPayment(testIdFaktury, testNip1, testNumerFaktury, testBrutto, 2);
236		_rep.Insert(platnosc);
237
238		var controller = new PlatnoscController(fake,test);
239		controller.ControllerContext = _f.createControllerContext(testNip1);
240
241		Payer payer = _f.createPayer(testIdFaktury, "test", "test");
	229	IRepository<vPlatnosciEcard> repVPayment = new Repository<vPlatnosciEcard>(new FakeDataContext());
	230	vPlatnosciEcard platnosc = _f.createInvoice(123, "nip1", "numer", 200, 0);
	231	repVPayment.Insert(platnosc);
	232
	233	var controller = new PlatnoscController(repVPayment, null, null, test);
	234	controller.ControllerContext = _f.createControllerContext("nip1");
	235
	236	Payer payer = _f.createPayer(123, "test", "test");
242	237	var result = controller.Show(payer, "pl") as ViewResult;
243	238
244		System.Diagnostics.Debug.WriteLine("~~AfterPay_PaymentIsValid_Test"~~);
245		Assert.That(controller.ModelState.IsValid, Is.True~~, "Model powinien byc true"~~);
	239	System.Diagnostics.Debug.WriteLine("Model powinien byc 'true'. Jest " + controller.ModelState.IsValid);
	240	Assert.That(controller.ModelState.IsValid, Is.True);
246	241	}
247	242	}

trunk/eCard/eCardMVC/Platnosci.Tests/Web/TestMethods.cs

r882	r896
12	12	class TestMethods
13	13	{
14		~~private string testNip1 = "12345";~~
15		~~private int testIdFaktury = 1000;~~
16
17	14	private Function _f = new Function();
18	15
19		~~[Test]~~
20		~~[Category("Unit")]~~
21		~~public void TestFindInvoiceByNumber()~~
22		{
23		~~FakeDataContext fake = new FakeDataContext();~~
24		~~IRepository<vPlatnosciEcard> _rep = new Repository<vPlatnosciEcard>(fake);~~
25
26		~~vPlatnosciEcard platnosc = new vPlatnosciEcard();~~
27		~~platnosc = _rep.FindInvoiceById(1).SingleOrDefault();~~
28		~~Assert.That(platnosc.Faktura_Numer, Is.EqualTo("1"));~~
29		}
30	16	[Test]
31	17	[Category("Unit")]
…	…
33	19	{
34	20	FakeDataContext fake = new FakeDataContext();
35		~~IRepository<vPlatnosciEcard>~~ _rep = new Repository<vPlatnosciEcard>(fake);
	21	var _rep = new Repository<vPlatnosciEcard>(fake);
36	22
37		vPlatnosciEcard platnosc = _f.create~~Payment(testIdFaktury, testNip1~~, "", 0, 0);
	23	vPlatnosciEcard platnosc = _f.createInvoice(123, "nip", "", 0, 0);
38	24	_rep.Insert(platnosc);
39	25
40		vPlatnosciEcard pl = _rep.FindInvoiceById(testIdFaktury).SingleOrDefault();
41		Assert.That(pl.nip, Is.EqualTo(testNip1));
	26	System.Diagnostics.Debug.WriteLine("rep.Count: " + _rep.Count());
	27	vPlatnosciEcard pl = _rep.FindOne(123);
	28	System.Diagnostics.Debug.WriteLine("Wartosc nip ma byc 'nip'. Jest " + pl.nip);
	29	Assert.That(pl.nip, Is.EqualTo("nip"));
42	30	}
43	31	}

trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs

r881	r896
30	30	public const string KODOWANIE = "ISO-8859-2";
31	31	private int ORDERNUMBER = 122;
	32	private string merchantId;
32	33
33		private string merchantId;
34		private readonly PlatnosciDataContext _context;
35		private readonly IRepository<PlatnosciEcard> _rep;
	34	private readonly IRepository<vPlatnosciEcard> _repVPayment;
	35	private readonly IRepository<PlatnosciEcard> _repPayment;
36	36	private FunkcjePlatnosci _func;
37	37
38	38	public MerchantController()
39		{
40		_rep ~~= new Repository<~~PlatnosciEcard>(new DataContext1());
41		_~~context = new PlatnosciDataContext(~~);
	39	{
	40	_repVPayment = new Repository<vPlatnosciEcard>(new DataContext1());
	41	_repPayment = new Repository<PlatnosciEcard>(new DataContext1());
42	42	_func = new FunkcjePlatnosci();
43	43	}
…	…
48	48
49	49	int id1 = Convert.ToInt32(payer.Id_faktury);
50		vPlatnosciEcard platnosc = _rep~~.FindInvoiceById(~~id1).SingleOrDefault();
	50	vPlatnosciEcard platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
51	51
52	52	if (platnosc == null)
…	…
115	115	if (platnosc != null)
116	116	{
117		~~// _rep~~.Insert(platnosc);
	117	//_repPayment.Insert(platnosc);
118	118	return true;
119	119	}

trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs

r888	r896
23	23	{
24	24	public const string ISPAID = "payment_deposited"; //transakcja potwierdzona do rozliczenia
25		private readonly PlatnosciDataContext _context;
26		private readonly IDataContext _context1;
27		private readonly IRepository<PotwierdzeniaEcard> _rep;
28		private readonly IRepository<PlatnosciEcard> _repPl;
	25	private readonly IRepository<vPlatnosciEcard> _repVPayment;
	26	private readonly IRepository<PlatnosciEcard> _repPayment;
	27	private readonly IRepository<PotwierdzeniaEcard> _repConfirm;
29	28	private FunkcjePlatnosci _func;
30	29	private string weryfikacja;
…	…
37	36	public PlatnoscController()
38	37	{
39		_context = new PlatnosciDataContext();
40		_rep = new Repository<PotwierdzeniaEcard>(new DataContext1());
41		_repPl = new Repository<PlatnosciEcard>(new DataContext1());
42		_func = new FunkcjePlatnosci();
43
44		}
45		public PlatnoscController(IDataContext datacontext, int czy_test)
46		{
47		_rep = new Repository<PotwierdzeniaEcard>(datacontext);
48		_repPl = new Repository<PlatnosciEcard>(datacontext);
49		_context1 = datacontext;
	38	_repVPayment = new Repository<vPlatnosciEcard>(new DataContext1());
	39	_repPayment = new Repository<PlatnosciEcard>(new DataContext1());
	40	_repConfirm = new Repository<PotwierdzeniaEcard>(new DataContext1());
	41	_func = new FunkcjePlatnosci();
	42	}
	43	public PlatnoscController(IRepository<vPlatnosciEcard> repVPayment, IRepository<PlatnosciEcard> repPayment, IRepository<PotwierdzeniaEcard> repConfirm, int czy_test)
	44	{
	45	_repVPayment = repVPayment;
	46	_repPayment = repPayment;
	47	_repConfirm = repConfirm;
50	48	_func = new FunkcjePlatnosci();
51	49	test = czy_test;
…	…
57	55	int id1 = ConvertId(id);
58	56
59		vPlatnosciEcard platnosc = _rep~~.FindInvoiceById(~~id1).SingleOrDefault();
	57	vPlatnosciEcard platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
60	58	if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc));
61	59
…	…
65	63	var invoiceDeatailsViewData = InitInvoiceDetailsViewData(platnosc, payer, "", kwota);
66	64
67		var tablica_potwierdzenia = _rep.FindItemsByIdFaktury(id1);
	65	var tablica_potwierdzenia = _repConfirm.FindItemsByIdFaktury(id1);
68	66	if (tablica_potwierdzenia.Count > 0) //platnosc za fakture zostala uregulowana
69	67	{
…	…
81	79	language = _func.setLanguage(language);
82	80	ustawTlumaczenia(test);
83		vPlatnosciEcard platnosc = _rep~~.FindInvoiceById(~~payer.Id_faktury).SingleOrDefault();
	81	vPlatnosciEcard platnosc = _repVPayment.Find(p => p.ID_faktury == payer.Id_faktury).SingleOrDefault();
84	82	if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc));
85	83
…	…
111	109	ustawTlumaczenia(test);
112	110	int id1 = ConvertId(id);
113		vPlatnosciEcard platnosc = _rep~~.FindInvoiceById(~~id1).SingleOrDefault();
	111	vPlatnosciEcard platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
114	112	if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc));
115	113
…	…
122	120	ustawTlumaczenia(test);
123	121	int id1 = ConvertId(id);
124		vPlatnosciEcard platnosc = _rep~~.FindInvoiceById(~~id1).SingleOrDefault();
	122	vPlatnosciEcard platnosc = _repVPayment.Find(p => p.ID_faktury == id1).SingleOrDefault();
125	123	if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc));
126	124
…	…
163	161	potwierdzenie.WITHCVC = WITHCVC;
164	162
165		_rep.Insert(potwierdzenie);
	163	_repConfirm.Insert(potwierdzenie);
166	164	UpdateStatus(ORDERNUMBER, CURRENTSTATE);
167	165	return View();
…	…
229	227	public void UpdateStatus(int ordernumber, string currentstate)
230	228	{
231		PlatnosciEcard platnosc = _repP~~l.FindOne(ordernumber~~);
	229	PlatnosciEcard platnosc = _repPayment.Find(p => p.ORDERNUMBER == ordernumber).SingleOrDefault();
232	230	if (platnosc != null && currentstate == ISPAID)
233	231	{
234	232	platnosc.Status = true;
235	233	platnosc.Status_data = DateTime.Now;
236		_repPl.SubmitChanges();
	234	_repPayment.SubmitChanges();
237	235
238	236	System.Diagnostics.Debug.WriteLine("IsUpdate");

Pobierz w innym formacie: