Skip to content

Commit 57faccf

Browse files
AdvencedJavaProgrammingAdvencedJavaProgramming
authored
Merge pull request #1 from TomekMenetAdvencedJavaProgramming/Develop
mainControlerDeploy
2 parents 48ba637 + 2c561c8 commit 57faccf

File tree

10 files changed

+76
-96
lines changed

10 files changed

+76
-96
lines changed

‎src/Grown-mainContext.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66

77
<!-- <context:annotation-config /> -->
88

9-
<bean id="IController" class="com.Polodz.controller.Controller" />
9+
<bean id="TelnetConnector" class="com.Polodz.service.TelnetConnector" />
10+
11+
<bean id="IController" class="com.Polodz.controller.Controller" >
12+
<constructor-arg ref="TelnetConnector" />
13+
</bean>
1014

1115
<!-- <bean id="MembersDAOPrimitive" class="com.Polodz.model.MembersDAO" scope="prototype" /> -->
1216

‎src/main/java/EasyMTC-contextTestB.xml

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎src/main/java/com/Polodz/View/MainWindow.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public MainWindow(IMainController mainController) {
5454
this.mainController = mainController;
5555
setNimbus();
5656
initComponents();
57-
this.setCentralText(((MainController) mainController).getLastMtcResponse() + "\n");
57+
this.setCentralText(((MainController) mainController).getLastServerResponse() + "\n");
5858
}
5959

6060
/**
@@ -63,7 +63,7 @@ public MainWindow(IMainController mainController) {
6363
@SuppressWarnings("unchecked")
6464
private void initComponents() {
6565
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
66-
setTitle("EasyMTC");
66+
setTitle("Grown");
6767
getContentPane().setLayout(new MigLayout("", "[4px:6px:11px][100px:150px:180px,grow][8px:18:25px][grow][61px]",
6868
"[2px:6px:11px][25px:25:25px][][2px:6px:11px][100px:386px,grow][25px:40:60]"));
6969

@@ -109,7 +109,7 @@ public void mouseClicked(MouseEvent e) {
109109
//rootNode.remove(0);
110110
//node.removeAllChildren();
111111
//node.remove(0);
112-
String reply=((MainController) mainController).getMtcResponse((String)node.getUserObject());
112+
String reply=((MainController) mainController).getServerResponse((String)node.getUserObject());
113113
setCentralText(reply);
114114
}
115115
}
@@ -149,7 +149,7 @@ public void keyPressed(KeyEvent e) {
149149
int start = jTextArea1.getLineStartOffset(line);
150150
int end = jTextArea1.getLineEndOffset(line);
151151
String text = jTextArea1.getDocument().getText(start, end - (start));
152-
setCentralText("\n" + ((MainController) mainController).getMtcResponse(text));
152+
setCentralText("\n" + ((MainController) mainController).getServerResponse(text));
153153

154154
} catch (BadLocationException e1) {
155155
// TODO Auto-generated catch block

‎src/main/java/com/Polodz/controller/Controller.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.Polodz.controller;
22

3+
import org.springframework.beans.factory.annotation.Autowired;
34
import org.springframework.stereotype.Component;
45

56
import com.Polodz.service.ITelnet;
@@ -8,9 +9,10 @@
89
//@Component
910
public class Controller implements IController {
1011
private String lastListing;
11-
private ITelnet connector= new TelnetConnector();
12+
private ITelnet connector;//= new TelnetConnector();
1213
public Controller() {
1314
}
15+
@Autowired
1416
public Controller(ITelnet connector) {
1517
this.connector=connector;
1618
}

‎src/main/java/com/Polodz/controller/MainController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public MainWindow frame() {
6464
}
6565

6666
@Bean
67-
public MainWindow getMtcView() {
67+
public MainWindow getView() {
6868
if (mainView==null) {
6969
this.mainView=new MainWindow(this);
7070
if (membersDAO.getMembersAudience()!=null)
@@ -83,11 +83,11 @@ public MainWindow getMtcView() {
8383
log.info(membersDAO.getALL().length);
8484
return this.mainView;
8585
}
86-
public String getMtcResponse(String input) {
86+
public String getServerResponse(String input) {
8787
return telentController.execute(input);
8888
}
8989

90-
public String getLastMtcResponse() {
90+
public String getLastServerResponse() {
9191
return ((Controller) telentController).getLastListing();
9292
}
9393
public List<IMember> listAll() {
@@ -97,7 +97,7 @@ public List<IMember> listAll() {
9797

9898
@Override
9999
public void deleteMembersProduct(Long memberId,Integer index) {
100-
this.membersDAO.getMembersAudience().get(memberId.intValue()).addItems().remove(index);
100+
this.membersDAO.getMembersAudience().get(memberId.intValue()).addItems().remove((int)index);
101101

102102
}
103103

‎src/main/java/com/Polodz/model/MembersFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ public IDao create(IController arg) {
4949
String memmbersName = memberNameSrcLine[i].split(" ")[0];
5050
//log.info(memmbersName);
5151
Member memberToAdd= new Member();
52-
String itemsMemeber = arg.execute(memmbersName+" items");
53-
//log.info(itemsMemeber);
52+
String itemsMemeber = arg.execute(memmbersName);
53+
//log.info(memmbersName+itemsMemeber);
5454
List<IItem> newMemebersBasket= new ArrayList<>();
5555
memberToAdd.setItems(newMemebersBasket);
5656
if (itemsMemeber!=null) {
5757
Arrays.stream(itemsMemeber.split("\\r?\\n")).forEach( itemName -> {
5858
Movie toAdd = new Movie();
5959
toAdd.setName(itemName);
6060
memberToAdd.addItems().add(toAdd);
61-
log.info(itemName);
61+
//log.info(itemName);
6262
});
6363
}
6464
//memberToAdd.getItems().forEach(action);

‎src/main/java/com/Polodz/service/ITelnet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package com.Polodz.service;
22

33
public interface ITelnet {
4-
4+
public String get(String input);
55
}

‎src/main/java/com/Polodz/service/TelnetConnector.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.Polodz.service;
22
import org.springframework.context.support.ClassPathXmlApplicationContext;
3-
import org.springframework.stereotype.Component;
43

54
//@Component("TelnetConnector")
65
public class TelnetConnector implements ITelnet {
@@ -10,6 +9,8 @@ public class TelnetConnector implements ITelnet {
109
public TelnetConnector() {
1110
// TODO Auto-generated constructor stub
1211
}
12+
13+
@Override
1314
public String get(String input) {
1415
return gateway.send(input);
1516
}

‎src/test/java/com/Polodz/GrownApplicationTests.java

Lines changed: 47 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -3,101 +3,94 @@
33
import org.junit.Before;
44
import org.junit.Test;
55
import org.junit.runner.RunWith;
6-
import org.mockito.InjectMocks;
76
import org.mockito.Mock;
87
import org.mockito.MockitoAnnotations;
98
import org.springframework.beans.factory.annotation.Autowired;
10-
import org.springframework.beans.factory.annotation.Qualifier;
119
import org.springframework.boot.test.context.SpringBootTest;
1210
import org.springframework.context.annotation.Bean;
1311
import org.springframework.context.annotation.Configuration;
1412
import org.springframework.context.annotation.Primary;
15-
import org.springframework.context.support.ClassPathXmlApplicationContext;
16-
import org.springframework.dao.support.DaoSupport;
17-
import org.springframework.test.context.ActiveProfiles;
1813
import org.springframework.test.context.ContextConfiguration;
1914
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
20-
import org.springframework.test.context.junit4.SpringRunner;
21-
2215
import com.Polodz.View.MainWindow;
23-
import com.Polodz.controller.Controller;
24-
import com.Polodz.controller.IController;
2516
import com.Polodz.controller.MainController;
26-
import com.Polodz.model.MembersBeanFactory;
27-
import com.Polodz.model.MembersDAO;
17+
import com.Polodz.model.IItem;
18+
import com.Polodz.service.ITelnet;
19+
import com.Polodz.service.TelnetConnector;
2820

29-
import junit.framework.Assert;
21+
import org.junit.Assert;
3022
import static org.mockito.Mockito.*;
3123

32-
import org.mockito.runners.MockitoJUnitRunner;
33-
34-
@SuppressWarnings("deprecation")
35-
//@RunWith(MockitoJUnitRunner.class)
24+
import java.util.List;
3625

37-
@RunWith(SpringJUnit4ClassRunner.class)//(SpringJUnit4ClassRunner.class)//(SpringRunner.class)
26+
@RunWith(SpringJUnit4ClassRunner.class)
3827
@ContextConfiguration(locations={"file:src/test/resources/Grown-mainContext.xml"}, loader=CustomSpringApplicationContextLoader.class)
3928
@SpringBootTest
40-
//@ActiveProfiles("test")
41-
//@ContextConfiguration(locations = {"classpath*:spring/mocksContext.xml"})
42-
//@ContextConfiguration
43-
//@ActiveProfiles("test")
4429
@Configuration
30+
//@ActiveProfiles("test")
4531
public class GrownApplicationTests {
46-
private ClassPathXmlApplicationContext context;
47-
//@InjectMocks
32+
4833
@Autowired
4934
private MainController mainControler;
50-
//@InjectMocks
51-
@Autowired
52-
private MembersDAO mtcDAO;
53-
// private BtcsBeanFactory btcsBeanFactory;
35+
36+
// @Autowired
37+
// private MembersDAO mtcDAO;
38+
// private BeanFactory BeanFactory;
5439
@Mock
55-
private IController IController;
40+
private ITelnet telnetHandler;
5641

5742
@Mock
5843
private MainWindow disableWindow;
5944

6045
@Before
6146
public void setup(){
62-
MockitoAnnotations.initMocks(this); //@RunWith(MockitoJUnitRunner.class).
63-
//context= new ClassPathXmlApplicationContext("file:src/EasyMTC-contextTestBF.xml");//file:classpath*
64-
//mtcDAO= context.getBean("mtcDAOF",MtcDAO.class);
65-
//mainControler= context.getBean("mainController",MainController.class);
66-
//mtcDAO= (MtcDAO)context.getBean("mtcDAO");
67-
68-
when(IController.execute("list")).thenReturn("test\ntest\ntest\ntest\ntest\ntest");
69-
when(IController.execute("test items")).thenReturn("mtest\nmtest\nmtest\nmtest\nmtest\nmtest");
70-
reset(IController);
71-
//btcsBeanFactory= context.getBean(BtcsBeanFactory.class);
47+
MockitoAnnotations.initMocks(this);
48+
when(telnetHandler.get("list")).thenReturn("test\ntest1\ntest2\ntest3\ntest4\ntest5");
49+
when(telnetHandler.get("test")).thenReturn("mtest\nmtest1\nmtest2\nmtest3\nmtest4\nmtest5");
50+
reset(telnetHandler);
51+
//BeanFactory= context.getBean(BeanFactory.class);
7252
}
73-
@SuppressWarnings("deprecation")
53+
7454
@Test
75-
public void contextLoads() {
55+
public void membersLoad() {
56+
this.serverResponse();
57+
Assert.assertNotNull(mainControler.getMembersDAO().getMembersAudience());
7658
Assert.assertEquals(mainControler.listAll().size(), 6);
77-
Assert.assertEquals(mainControler.listAll().get(1).getName(), "test");
78-
Assert.assertEquals(mainControler.getMtcResponse("list"), "test\ntest\ntest\ntest\ntest\ntest");
79-
//Assert.assertEquals(mtcDAO.getALL().length, 86);
80-
//Assert.assertEquals(mtcDAO.getALL()[85].getName(), "bsc183"); //Aware of spaces!
81-
//Assert.assertEquals(btcsBeanFactory.getObjectType(), MtcDAO.class);
59+
Assert.assertEquals(mainControler.listAll().get(1).getName(), "test1");
60+
Assert.assertEquals(mainControler.listAll().get(1).getItems().get(1).getName(),"mtest1");
61+
//Assert.assertEquals(BeanFactory.getObjectType(), DAO.class);
62+
}
63+
64+
65+
public void serverResponse() {
66+
Assert.assertEquals(mainControler.getServerResponse("list"), "test\ntest1\ntest2\ntest3\ntest4\ntest5");
67+
}
68+
69+
@Test
70+
public void deleteMemberProduct() {
71+
Integer idOfFiredMember= mainControler.listAll().size()-1;
72+
List<? extends IItem> basket = mainControler.getMembersDAO().getMembersAudience().get(idOfFiredMember).getItems();
73+
Integer lastBasketSize = basket.size() - 2;
74+
mainControler.deleteMembersProduct (new Long(idOfFiredMember),0);
75+
mainControler.deleteMembersProduct (new Long(idOfFiredMember),4);
76+
Assert.assertEquals(lastBasketSize,new Integer(basket.size()));
8277
}
8378

8479
@Bean
8580
@Primary
86-
public IController iController() {
87-
if (IController==null) {
88-
IController=mock(Controller.class);
89-
when(IController.execute("list")).thenReturn("test\ntest\ntest\ntest\ntest\ntest"
90-
+ "");
91-
81+
public ITelnet TelnetConnector() {
82+
if (telnetHandler==null) {
83+
telnetHandler=mock(TelnetConnector.class);
84+
when(telnetHandler.get("list")).thenReturn("test\ntest1\ntest2\ntest3\ntest4\ntest5");
85+
when(telnetHandler.get(startsWith("test"))).thenReturn("mtest\nmtest1\nmtest2\nmtest3\nmtest4\nmtest5");
9286
}
93-
94-
return IController;
87+
return telnetHandler;
9588
}
9689

9790
@Bean
9891
@Primary
9992
public MainWindow iMainWindow() {
100-
if (IController==null) {
93+
if (telnetHandler==null) {
10194
disableWindow=mock(MainWindow.class);
10295
}
10396

‎src/test/resources/Grown-mainContext.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
<bean class="com.Polodz.GrownApplicationTests"/>
88
<!-- <context:annotation-config /> -->
99

10-
<!-- <bean id="IController" class="com.Polodz.controller.Controller" /> -->
10+
<!-- <bean id="TelnetConnector" class="com.Polodz.service.TelnetConnector" /> -->
11+
12+
<bean id="IController" class="com.Polodz.controller.Controller" >
13+
<constructor-arg ref="TelnetConnector" />
14+
</bean>
1115

1216
<!-- <bean id="MembersDAOPrimitive" class="com.Polodz.model.MembersDAO" scope="prototype" /> -->
1317

@@ -21,12 +25,12 @@
2125

2226
<bean id="MembersDAOF" class="com.Polodz.model.MembersBeanFactory" name="PersonalDAO">
2327
<property name="membersDaosFactory" ref="MembersFactory" />
24-
<constructor-arg ref="iController" />
28+
<constructor-arg ref="IController" />
2529
</bean>
2630

2731
<bean id="mainController" class="com.Polodz.controller.MainController">
2832
<property name="membersDAO" ref="MembersDAOF" />
29-
<property name="telentController" ref="iController" />
33+
<property name="telentController" ref="IController" />
3034
</bean>
3135

3236

0 commit comments

Comments
 (0)