/ - Diff - Rozšíření nástroje IMiGEr (KIV) - HKMM - Redmine

     import net.sf.json.JSONArray;
     import net.sf.json.JSONObject;
     import org.apache.commons.io.IOUtils;
     import org.apache.logging.log4j.LogManager;
     import org.apache.logging.log4j.Logger;
     import java.io.File;
     import java.io.IOException;
-...
      * @author Stepan Baratta
      */
     public class JSONConfigLoader {
         private static final Logger logger = LogManager.getLogger();
         private GraphManager graphManager;
         private JSONObject json;
-...
                 createEdgeAttributeFilters(filter, edgeAttributeFilterStrings);
             } catch (IOException | NullPointerException e) {
                 e.printStackTrace();
                 logger.warn("Can not load file with configuration. No configuration will be used. Exception: ", e);
+            }
             return filter;

sources/src/main/java/cz/zcu/kiv/offscreen/storage/FileLoader.java
51	51	}
52	52
53	53	} catch (Exception ex) {
54		ex.printStackTrace();
	54	logger.error("Can not load file from request: ", ex);
55	55	}
56	56	return resultMap;
57	57	}

     package cz.zcu.kiv.offscreen.user;
     import org.apache.logging.log4j.LogManager;
     import org.apache.logging.log4j.Logger;
     import javax.servlet.ServletContext;
     import java.sql.*;
-...
      */
     public class DB {
     	private static final Logger logger = LogManager.getLogger();
     	private Connection connection;
     	/**
-...
     			connection = DriverManager.getConnection(url, username, password);
     			connection.setAutoCommit(true);
     		} catch (ClassNotFoundException | SQLException e) {
     			e.printStackTrace();
     			logger.error("Can not open database connection: ", e);
+    		}
+    	}
-...
     			preparedStatement.execute();
     			return preparedStatement.getResultSet();
     		} catch (SQLException e) {
     			e.printStackTrace();
     			logger.error("Can not execute database query: ", e);
+    		}
     		return null;
+    	}
-...
     			preparedStatement.executeUpdate();
     			return preparedStatement.getGeneratedKeys();
     		} catch (SQLException e) {
     			e.printStackTrace();
     			logger.error("Can not execute database query: ", e);
+    		}
     		return null;
+    	}
-...
     			return stat.getResultSet();
     		} catch(SQLException | NullPointerException e) {
     			e.printStackTrace();
     			logger.error("Can not execute database query: ", e);
+    		}
     		return null;
+    	}
-...
     		try {
     			return preparedStatement.executeUpdate();
     		} catch(SQLException e) {
     			e.printStackTrace();
     			logger.error("Can not execute database query: ", e);
     			return -1;
     		} catch (NullPointerException e) {
     			e.printStackTrace();
     			logger.error("Can not execute database query: ", e);
     			return -2;
+    		}
+    	}

sources/src/main/java/cz/zcu/kiv/offscreen/user/Diagram.java
1	1	package cz.zcu.kiv.offscreen.user;
2	2
	3	import org.apache.logging.log4j.LogManager;
	4	import org.apache.logging.log4j.Logger;
	5
3	6	import java.sql.PreparedStatement;
4	7	import java.sql.ResultSet;
5	8	import java.sql.SQLException;
...	...
15	18	* @author Tomáš Šimandl
16	19	*/
17	20	public class Diagram {
	21	private static final Logger logger = LogManager.getLogger();
	22
18	23	private DB db = null;
19	24	private int id = 0;
20	25
...	...
52	57	return rs.getInt("user_id");
53	58	}
54	59	} catch (SQLException e){
55		e.printStackTrace();
	60	logger.error("Can not get owner id: ", e);
56	61	}
57	62	return -1;
58	63	}
...	...
72	77	return rs.getString("public").equals("1");
73	78	}
74	79	} catch (SQLException e){
75		e.printStackTrace();
	80	logger.error("Can not check if diagram is public: ", e);
76	81	}
77	82	return false;
78	83	}
...	...
91	96	return rs.getString("graph_json");
92	97	}
93	98	} catch (SQLException e){
94		e.printStackTrace();
	99	logger.error("Can not get json of diagram: ", e);
95	100	}
96	101	return "";
97	102	}
...	...
114	119	}
115	120
116	121	} catch (SQLException e) {
117		e.printStackTrace();
	122	logger.error("Can not get diagram: ", e);
118	123	}
119	124
120	125	return Collections.emptyMap();
...	...
166	171	db.executeStatement(pst);
167	172	}
168	173	} catch (SQLException e) {
169		e.printStackTrace();
	174	logger.error("Can not update diagram: ", e);
170	175	}
171	176	}
172	177
...	...
184	189	db.executeStatement(pst);
185	190
186	191	} catch (SQLException e) {
187		e.printStackTrace();
	192	logger.error("Can not delete diagram: ", e);
188	193	}
189	194	}
190	195
...	...
229	234	return diagram_list;
230	235
231	236	} catch (SQLException e){
232		e.printStackTrace();
	237	logger.error("Can not create map from input result set: ", e);
233	238	}
234	239
235	240	return new ArrayList<>();

sources/src/main/java/cz/zcu/kiv/offscreen/user/User.java
1	1	package cz.zcu.kiv.offscreen.user;
	2	import org.apache.logging.log4j.LogManager;
	3	import org.apache.logging.log4j.Logger;
	4
2	5	import java.sql.PreparedStatement;
3	6	import java.sql.ResultSet;
4	7	import java.sql.SQLException;
...	...
13	16	*
14	17	*/
15	18	public class User {
	19
	20	private static final Logger logger = LogManager.getLogger();
	21
16	22	private DB db = null;
17	23	private int id = 0;
18	24
...	...
55	61	}
56	62	}
57	63	} catch (SQLException e) {
58		e.printStackTrace();
	64	logger.error("Can not login user: ", e);
59	65	}
60	66
61	67	return false;
...	...
91	97	}
92	98
93	99	} catch (SQLException e) {
94		e.printStackTrace();
	100	logger.error("Can not register user: ", e);
95	101	}
96	102	}
97	103
...	...
123	129	this.id = 0;
124	130	}
125	131	} catch (SQLException e) {
126		e.printStackTrace();
	132	logger.error("Can not get user: ", e);
127	133	}
128	134
129	135	return Collections.emptyMap();
...	...
152	158	db.executeStatement(pst);
153	159
154	160	} catch (SQLException e) {
155		e.printStackTrace();
	161	logger.error("Can not get user session: ", e);
156	162	}
157	163	}
158	164	}
...	...
174	180
175	181	db.executeStatement(pst);
176	182	} catch (SQLException e) {
177		e.printStackTrace();
	183	logger.error("Can not update user: ", e);
178	184	}
179	185	}
180	186	}
...	...
192	198	return rs.getString("nick");
193	199	}
194	200	} catch (SQLException e){
195		e.printStackTrace();
	201	logger.error("Can not get users nick name: ", e);
196	202	}
197	203	}
198	204
...	...
234	240	return true;
235	241	}
236	242	} catch (SQLException e) {
237		e.printStackTrace();
	243	logger.error("Can not check if user exits: ", e);
238	244	}
239	245
240	246	return false;

     package cz.zcu.kiv.imiger.tests.frontend;
     import org.apache.logging.log4j.LogManager;
     import org.apache.logging.log4j.Logger;
     import org.junit.jupiter.api.AfterAll;
     import org.junit.jupiter.api.Assertions;
     import org.junit.jupiter.api.BeforeAll;
-...
     import org.openqa.selenium.WebElement;
     class ArchetypeIconConfigTest {
         private static final Logger logger = LogManager.getLogger();
         private static WebDriver browser;
         @BeforeAll
-...
         void SpecifiedValueDefinition(){
             WebElement iconDef = browser.findElement(By.id("vertexArchetypeIcon-SpecifiedIcon"));
             System.out.println("Trying to locate an element with class 'testingArchetypeIcon'");
             logger.debug("Trying to locate an element with class 'testingArchetypeIcon'");
             iconDef.findElement(By.className("testingArchetypeIcon"));
             System.out.println("Element found.");
             logger.debug("Element found.");
+        }
         @Test
-...
             WebElement iconDef = browser.findElement(By.id("vertexArchetypeIcon-" + iconName))
                     .findElement(By.tagName("text"));
             System.out.println("Testing if icon contains specific text");
             logger.debug("Testing if icon contains specific text");
             Assertions.assertEquals(iconName.substring(0,1), iconDef.getText());
+        }

     package cz.zcu.kiv.imiger.tests.frontend;
     import org.apache.logging.log4j.LogManager;
     import org.apache.logging.log4j.Logger;
     import org.junit.jupiter.api.AfterAll;
     import org.junit.jupiter.api.Assertions;
     import org.junit.jupiter.api.BeforeAll;
-...
     class AssociatedArchetypeTest {
         private static final Logger logger = LogManager.getLogger();
         private static WebDriver browser;
         @BeforeAll
-...
          * @param expectedArchetypeIconTexts Texts of all the associated archetype icons that are expected to occur
          */
         private void checkVisibilityOfIcons(String elementId, List<String> expectedArchetypes, List<String> expectedArchetypeIconTexts) {
             System.out.println("Checking element " + elementId);
             logger.debug("Checking element " + elementId);
             WebElement vertex = browser.findElement(By.cssSelector("[data-id='vertices']"))
                     .findElement(By.cssSelector("[data-id='" + elementId + "']"));
             List<WebElement> associatedArchetypeIcons = vertex.findElement(By.tagName("g")).
                     findElements(By.className("archetype-icon"));
             System.out.println("Associated archetypes: \n");
             logger.debug("Associated archetypes: \n");
             Assertions.assertEquals(associatedArchetypeIcons.size(), expectedArchetypeIconTexts.size());
             for (int i = 0; i < expectedArchetypeIconTexts.size(); i++) {
                 WebElement icon = associatedArchetypeIcons.get(i);
                 String iconHref = icon.getAttribute("href");
                 System.out.println("Icon href: " + iconHref+"\n");
                 logger.debug("Icon href: " + iconHref+"\n");
                 Assertions.assertEquals("#vertexArchetypeIcon-" + expectedArchetypes.get(i), iconHref);
                 WebElement iconDef = browser.findElement(By.id("vertexArchetypeIcon-" + expectedArchetypes.get(i)));
                 System.out.println("Testing if icon contains specific text");
                 logger.debug("Testing if icon contains specific text");
                 Assertions.assertEquals(expectedArchetypeIconTexts.get(i), iconDef.getText());
+            }
+        }
-...
          * @param expectedHighlightedVertexIds Ids of all the vertices that are expected to be highlighted
          */
         private void checkHighlightedVertices(String vertexId, String archetypeName, List<String> expectedHighlightedVertexIds) {
             System.out.println("\nChecking associated vertices of vertex: " + vertexId + " for archetype icon with : " + archetypeName);
             logger.debug("\nChecking associated vertices of vertex: " + vertexId + " for archetype icon with : " + archetypeName);
             WebElement vertex = browser.findElement(By.cssSelector("[data-id='vertices']"))
                     .findElement(By.cssSelector("[data-id='" + vertexId + "']"));
-...
             List<WebElement> highlightedVertices = browser.findElements(By.className("node--highlighted-archetype"));
             System.out.println("Number of highlighted vertices: " + highlightedVertices.size());
             logger.debug("Number of highlighted vertices: " + highlightedVertices.size());
             Assertions.assertEquals(expectedHighlightedVertexIds.size(), highlightedVertices.size());
             for(int i = 0; i < highlightedVertices.size(); i++) {
                 String id = highlightedVertices.get(i).getAttribute("data-id");
                 System.out.println(id);
                 logger.debug(id);
                 Assertions.assertEquals(expectedHighlightedVertexIds.get(i), id);
+            }

     package cz.zcu.kiv.imiger.tests.frontend;
     import org.apache.logging.log4j.LogManager;
     import org.apache.logging.log4j.Logger;
     import org.junit.jupiter.api.AfterAll;
     import org.junit.jupiter.api.Assertions;
     import org.junit.jupiter.api.BeforeAll;
-...
     import java.util.*;
     class GroupStatsChangingTest {
         private static final Logger logger = LogManager.getLogger();
         private static WebDriver browser;
         @BeforeAll
-...
                     .findElement(By.cssSelector("[data-id='3']"));
             SeleniumUtil.svgRectClick(firstExcludedVertex);
             System.out.println("Exclude vertex3 to group as first vertex of group");
             logger.debug("Exclude vertex3 to group as first vertex of group");
             excludeToExistingGroup("2");
             System.out.println("Exclude vertex2 to group");
             logger.debug("Exclude vertex2 to group");
             //get data-id of fgroup
             groupId = browser.findElement(By.id("excludedNodeListComponent"))
-...
     //        EXCLUDING VERTICES FROM GROUPS IS NOT SUPPORTED YET
     //        excludeToExistingGroup("1");
     //        compareExpectedValues(groupId, new ArrayList<String>(Arrays.asList("2","2","0","2")));
     //        System.out.println("Exclude vertex1 to group");
     //        logger.debug("Exclude vertex1 to group");
     //
     //        System.out.println("Remove vertex2 to group");
     //        logger.debug("Remove vertex2 to group");
     //        removeVertexFromGroup("li2");
     //        compareExpectedValues(groupId, new ArrayList<String>(Arrays.asList("1","2","0","2")));
     //
     //        System.out.println("Switch off stats for vertex1");
     //        logger.debug("Switch off stats for vertex1");
     //        toogleVertexInGroup("li1");
     //        compareExpectedValues(groupId, new ArrayList<String>(Arrays.asList("1","0","0","0")));
     //
     //        System.out.println("Switch off stats for vertex3");
     //        logger.debug("Switch off stats for vertex3");
     //        toogleVertexInGroup("li3");
     //        compareExpectedValues(groupId, new ArrayList<String>(Arrays.asList("0","0","0","0")));
     //
     //        System.out.println("Switch on stats for vertex1");
     //        logger.debug("Switch on stats for vertex1");
     //        toogleVertexInGroup("li3");
     //        excludeToExistingGroup("vertex2");
     //        compareExpectedValues(groupId, new ArrayList<String>(Arrays.asList("2","0","0","0")));
-...
     //        String archetypePrefix = "v_archetype_4_";
     //        SeleniumUtil.switchToExcludeMode();
     //        WebElement singleEcludedVertex = browser.findElement(By.id("vertex4"));
     //        System.out.println("Exclude vertex4 to group as first vertex of group");
     //        logger.debug("Exclude vertex4 to group as first vertex of group");
     //        SeleniumUtil.svgClick(singleEcludedVertex);
     //
     //        System.out.println("Checking group statistics");
     //        logger.debug("Checking group statistics");
     //        String actualValue1 = browser.findElement(By.id(archetypePrefix + "0")).findElement(By.tagName("text")).getText();
     //        String actualValue2 = browser.findElement(By.id(archetypePrefix + "2")).findElement(By.tagName("text")).getText();
     //        Assertions.assertEquals(actualValue1, "2");
     //        Assertions.assertEquals(actualValue2, "1");
     //
     //        System.out.println("Expected: 2 - Real: " + actualValue1);
     //        System.out.println("Expected: 1 - Real: " + actualValue2);
     //        logger.debug("Expected: 2 - Real: " + actualValue1);
     //        logger.debug("Expected: 1 - Real: " + actualValue2);
+        }
-...
          * @param expectedValues list of expected values
          */
         private void compareExpectedValues(String groupId, Map<String, String> expectedValues){
             System.out.println("Checking group statistics");
             logger.debug("Checking group statistics");
             String archetypePrefix = "#vertexArchetypeIcon-";
             WebElement nodeList = browser.findElement(By.id("excludedNodeListComponent"))

sources/src/test/java/cz/zcu/kiv/imiger/tests/frontend/SeleniumUtil.java
1	1	package cz.zcu.kiv.imiger.tests.frontend;
2	2
	3	import org.apache.logging.log4j.LogManager;
	4	import org.apache.logging.log4j.Logger;
3	5	import org.openqa.selenium.By;
4	6	import org.openqa.selenium.WebDriver;
5	7	import org.openqa.selenium.WebElement;
...	...
13	15	import java.nio.file.Paths;
14	16
15	17	class SeleniumUtil {
16
	18	private static final Logger logger = LogManager.getLogger();
17	19	private static final String TEST_DIRECTORY = System.getProperty("user.dir") + "\\src\\test\\resources";
18	20
19	21	/**
...	...
49	51	try {
50	52	Thread.sleep(1000);
51	53	} catch (InterruptedException e) {
52		e.printStackTrace();
	54	logger.warn("Thread.sleep caused exception: ", e);
53	55	}
54	56	}
55	57
...	...
59	61	Files.createLink(Paths.get(APP_CONFIG_LOCATION + "\\config.json"),
60	62	Paths.get(TEST_DIRECTORY + "\\config\\" + configFile));
61	63	} catch (IOException e) {
62		e.printStackTrace();
	64	logger.error("Can not prepare configuration file: ", e);
63	65	}
64	66	}
65	67
...	...
76	78	try {
77	79	Thread.sleep(1000);
78	80	} catch (InterruptedException e) {
79		e.printStackTrace();
	81	logger.warn("Thread.sleep caused exception: ", e);
80	82	}
81	83	}
82	84
...	...
86	88	try {
87	89	Thread.sleep(1000);
88	90	} catch (InterruptedException e) {
89		e.printStackTrace();
	91	logger.warn("Thread.sleep caused exception: ", e);
90	92	}
91	93	}
92	94
...	...
97	99	try {
98	100	Thread.sleep(1000);
99	101	} catch (InterruptedException e) {
100		e.printStackTrace();
	102	logger.warn("Thread.sleep caused exception: ", e);
101	103	}
102	104	}
103	105
...	...
112	114	try {
113	115	Thread.sleep(1000);
114	116	} catch (InterruptedException e) {
115		e.printStackTrace();
	117	logger.warn("Thread.sleep caused exception: ", e);
116	118	}
117	119	}
118	120
...	...
127	129	try {
128	130	Thread.sleep(1000);
129	131	} catch (InterruptedException e) {
130		e.printStackTrace();
	132	logger.warn("Thread.sleep caused exception: ", e);
131	133	}
132	134	}
133	135

Projekt

Obecné

Profil

ASWI - Pokročilé softwarové inženýrství » ASWI 2019 » Rozšíření nástroje IMiGEr (KIV) - HKMM

Revize faddc9d1

Přidáno uživatelem Tomáš Šimandl před více než 6 roky(ů)