diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 997eb2624aad249f2bcdf9158b99a45a788e315f..ce5b33a0969b184746a738cc2f6d8f9045e1a7f2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="5f36371d-de5c-44ce-a12c-613727d95355" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/LoginControl_Test.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/test/java/org/s4s/services/db/JDBCConnectionTest.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java" afterPath="$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java" />
</list>
<ignored path="shopInShop.iws" />
<ignored path=".idea/workspace.xml" />
@@ -26,38 +26,36 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="600">
- <file leaf-file-name="RegistrationControl.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/RegistrationControl.java">
+ <file leaf-file-name="JDBCConnectionTest.java" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/services/db/JDBCConnectionTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-372">
- <caret line="39" column="14" lean-forward="true" selection-start-line="39" selection-start-column="14" selection-end-line="39" selection-end-column="14" />
+ <state relative-caret-position="135">
+ <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
- <marker date="1496503262000" expanded="true" signature="1616:1646" ph="INSERT INTO \"ERR\".\"user\"... " />
+ <marker date="1496682108000" expanded="true" signature="585:784" ph="SELECT u.\"b... user" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="RegistrierungView.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungView.java">
+ <file leaf-file-name="LoginControl.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/LoginControl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="146">
- <caret line="124" column="38" lean-forward="false" selection-start-line="124" selection-start-column="38" selection-end-line="124" selection-end-column="38" />
+ <state relative-caret-position="480">
+ <caret line="45" column="9" lean-forward="false" selection-start-line="36" selection-start-column="64" selection-end-line="45" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="RegistrationControl_Test.java" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java">
+ <file leaf-file-name="JDBCConnection.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/services/db/JDBCConnection.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="330">
- <caret line="22" column="53" lean-forward="false" selection-start-line="22" selection-start-column="53" selection-end-line="22" selection-end-column="53" />
+ <state relative-caret-position="94">
+ <caret line="20" column="4" lean-forward="false" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="92" />
<folding>
<element signature="imports" expanded="true" />
- <element signature="e#465#466#0" expanded="true" />
- <element signature="e#528#529#0" expanded="true" />
</folding>
</state>
</provider>
@@ -137,6 +135,8 @@
<option value="$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/LoginControl.java" />
<option value="$PROJECT_DIR$/src/test/java/org/s4s/matchers/UtilityMatchers.java" />
<option value="$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java" />
+ <option value="$PROJECT_DIR$/src/test/java/org/s4s/services/db/JDBCConnectionTest2.java" />
+ <option value="$PROJECT_DIR$/src/test/java/org/s4s/services/db/JDBCConnectionTest.java" />
</list>
</option>
</component>
@@ -220,8 +220,8 @@
</treeState>
</component>
<component name="ProjectFrameBounds">
- <option name="width" value="1280" />
- <option name="height" value="800" />
+ <option name="width" value="1920" />
+ <option name="height" value="1080" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
@@ -288,11 +288,49 @@
<option name="myItemId" value="s4s" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="services" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="util" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Projekt (s4s)" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="services" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="db" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="shopInShop" />
@@ -752,6 +790,7 @@
</component>
<component name="RecentsManager">
<key name="CreateTestDialog.RecentsKey">
+ <recent name="org.s4s.services.db" />
<recent name="org.s4s.dao.impl" />
</key>
<key name="CreateTestDialog.Recents.Supers">
@@ -773,7 +812,7 @@
</list>
</option>
</component>
- <component name="RunManager" selected="Maven.shopInShop [jetty:run]">
+ <component name="RunManager" selected="JUnit.Test">
<configuration default="false" name="shopInShop [jetty:run]" type="MavenRunConfiguration" factoryName="Maven" temporary="true">
<MavenSettings>
<option name="myGeneralSettings" />
@@ -1208,8 +1247,30 @@
<configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
<method />
</configuration>
- <list size="1">
+ <configuration default="false" name="Test" type="JUnit" factoryName="JUnit">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="emma" />
+ <module name="shopInShop" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" value="org.s4s.services.db" />
+ <option name="MAIN_CLASS_NAME" value="org.s4s.services.db.JDBCConnectionTest" />
+ <option name="METHOD_NAME" value="" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" value="" />
+ <option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
+ <envs />
+ <patterns />
+ <method />
+ </configuration>
+ <list size="2">
<item index="0" class="java.lang.String" itemvalue="Maven.shopInShop [jetty:run]" />
+ <item index="1" class="java.lang.String" itemvalue="JUnit.Test" />
</list>
<recent_temporary>
<list size="1">
@@ -1264,40 +1325,65 @@
<workItem from="1494998957951" duration="3852000" />
<workItem from="1495525728427" duration="19068000" />
<workItem from="1496505763657" duration="2984000" />
+ <workItem from="1496680428314" duration="1704000" />
</task>
<servers />
</component>
+ <component name="TestHistory">
+ <history-entry file="Test - 2017.06.05 at 18h 37m 53s.xml">
+ <configuration name="Test" configurationId="JUnit" />
+ </history-entry>
+ <history-entry file="Test - 2017.06.05 at 18h 38m 30s.xml">
+ <configuration name="Test" configurationId="JUnit" />
+ </history-entry>
+ <history-entry file="Test - 2017.06.05 at 18h 42m 22s.xml">
+ <configuration name="Test" configurationId="JUnit" />
+ </history-entry>
+ <history-entry file="Test - 2017.06.05 at 18h 43m 31s.xml">
+ <configuration name="Test" configurationId="JUnit" />
+ </history-entry>
+ <history-entry file="Test - 2017.06.05 at 18h 43m 54s.xml">
+ <configuration name="Test" configurationId="JUnit" />
+ </history-entry>
+ <history-entry file="Test - 2017.06.05 at 18h 57m 21s.xml">
+ <configuration name="Test" configurationId="JUnit" />
+ </history-entry>
+ <history-entry file="Test - 2017.06.05 at 19h 01m 55s.xml">
+ <configuration name="Test" configurationId="JUnit" />
+ </history-entry>
+ </component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="49484000" />
+ <option name="totallyTimeSpent" value="51188000" />
</component>
<component name="ToolWindowManager">
- <frame x="0" y="0" width="1280" height="800" extended-state="0" />
+ <frame x="0" y="0" width="1920" height="1080" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
- <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23891892" sideWeight="0.27291667" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1745435" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24657534" sideWeight="0.49583334" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18093699" sideWeight="0.49272728" order="0" side_tool="false" content_ui="combo" />
- <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.26918918" sideWeight="0.7270833" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32970297" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+ <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24653466" sideWeight="0.49583334" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1826411" sideWeight="0.49272728" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18093699" sideWeight="0.5072727" order="2" side_tool="true" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.26918918" sideWeight="0.7270833" order="3" side_tool="false" content_ui="tabs" />
<window_info id="PlantUML" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -1305,7 +1391,6 @@
<window_info id="com.vaadin.designer.intellij.palette.toolWindow" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296875" sideWeight="0.35135135" order="6" side_tool="false" content_ui="tabs" />
<window_info id="com.vaadin.designer.intellij.outline.toolWindow" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296875" sideWeight="0.6486486" order="6" side_tool="true" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
@@ -1361,41 +1446,6 @@
<option name="serverPort" value="52118" />
</component>
<component name="editorHistoryManager">
- <entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/com/vaadin/ui/VerticalLayout.class">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="132">
- <caret line="9" column="44" lean-forward="true" selection-start-line="9" selection-start-column="44" selection-end-line="9" selection-end-column="44" />
- </state>
- </provider>
- </entry>
- <entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/com/vaadin/ui/AbstractLayout.class">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="132">
- <caret line="13" column="22" lean-forward="false" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
- </state>
- </provider>
- </entry>
- <entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/com/vaadin/ui/Panel.class">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <caret line="27" column="37" lean-forward="false" selection-start-line="27" selection-start-column="37" selection-end-line="27" selection-end-column="37" />
- </state>
- </provider>
- </entry>
- <entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/com/vaadin/ui/AbstractSingleComponentContainer.class">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="132">
- <caret line="22" column="75" lean-forward="false" selection-start-line="22" selection-start-column="75" selection-end-line="22" selection-end-column="75" />
- </state>
- </provider>
- </entry>
- <entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/com/vaadin/ui/AbstractComponent.class">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="132">
- <caret line="56" column="39" lean-forward="false" selection-start-line="56" selection-start-column="22" selection-end-line="56" selection-end-column="39" />
- </state>
- </provider>
- </entry>
<entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/com/vaadin/ui/AbstractOrderedLayout.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="222">
@@ -1462,14 +1512,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WarenkorbView.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="330">
- <caret line="27" column="21" lean-forward="false" selection-start-line="27" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/PasswortView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
@@ -1533,17 +1575,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/LoginView.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="324">
- <caret line="52" column="63" lean-forward="false" selection-start-line="52" selection-start-column="63" selection-end-line="52" selection-end-column="63" />
- <folding>
- <element signature="class#2651:3686" expanded="false" />
- <element signature="class#3834:4047" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WelcomeView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
@@ -1572,7 +1603,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="735">
<caret line="49" column="13" lean-forward="false" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="13" />
- <folding />
</state>
</provider>
</entry>
@@ -1688,14 +1718,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/LoginControl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="408">
- <caret line="46" column="33" lean-forward="false" selection-start-line="46" selection-start-column="33" selection-end-line="46" selection-end-column="33" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/LogoutControl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
@@ -1720,18 +1742,44 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WarenkorbView.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="225">
+ <caret line="27" column="21" lean-forward="false" selection-start-line="27" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="146">
+ <state relative-caret-position="714">
<caret line="124" column="38" lean-forward="false" selection-start-line="124" selection-start-column="38" selection-end-line="124" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="330">
+ <caret line="22" column="9" lean-forward="false" selection-start-line="22" selection-start-column="9" selection-end-line="22" selection-end-column="9" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/services/db/JDBCConnectionTest2.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="300">
+ <caret line="22" column="1" lean-forward="true" selection-start-line="22" selection-start-column="1" selection-end-line="22" selection-end-column="1" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/RegistrationControl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-372">
- <caret line="39" column="14" lean-forward="true" selection-start-line="39" selection-start-column="14" selection-end-line="39" selection-end-column="14" />
+ <state relative-caret-position="832">
+ <caret line="62" column="19" lean-forward="false" selection-start-line="62" selection-start-column="19" selection-end-line="62" selection-end-column="19" />
<folding>
<element signature="imports" expanded="true" />
<marker date="1496503262000" expanded="true" signature="1616:1646" ph="INSERT INTO \"ERR\".\"user\"... " />
@@ -1739,14 +1787,58 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/LoginView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="330">
- <caret line="22" column="53" lean-forward="false" selection-start-line="22" selection-start-column="53" selection-end-line="22" selection-end-column="53" />
+ <state relative-caret-position="324">
+ <caret line="52" column="63" lean-forward="false" selection-start-line="52" selection-start-column="63" selection-end-line="52" selection-end-column="63" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/KundenDAO.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="90">
+ <caret line="12" column="2" lean-forward="true" selection-start-line="12" selection-start-column="2" selection-end-line="12" selection-end-column="2" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/ShopDAO.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-86">
+ <caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+ <folding>
+ <marker date="1495648014000" expanded="true" signature="976:1106" ph="SELECT *FROM... shopWHERE" />
+ <marker date="1495648014000" expanded="true" signature="1614:1809" ph="INSERT INTO ERR.shop... " />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/services/db/JDBCConnection.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="94">
+ <caret line="20" column="4" lean-forward="false" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="92" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/LoginControl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="480">
+ <caret line="45" column="9" lean-forward="false" selection-start-line="36" selection-start-column="64" selection-end-line="45" selection-end-column="9" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/services/db/JDBCConnectionTest.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="135">
+ <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
- <element signature="e#465#466#0" expanded="true" />
- <element signature="e#528#529#0" expanded="true" />
+ <marker date="1496682108000" expanded="true" signature="585:784" ph="SELECT u.\"b... user" />
</folding>
</state>
</provider>
diff --git a/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java b/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java
index 866f404b41179b467f923424cd514b871bcb5f75..6030b0f77f0c634047cf0497950e7faf85cabd1f 100644
--- a/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java
+++ b/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java
@@ -20,7 +20,7 @@ public class RegistrationControl_Test {
@Test
public void nameValidator_Test(){
- assertTrue(RegistrationControl.nameValidator());
+ // assertTrue(RegistrationControl.nameValidator());
}
}
\ No newline at end of file
diff --git a/src/test/java/org/s4s/services/db/JDBCConnectionTest.java b/src/test/java/org/s4s/services/db/JDBCConnectionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..f1aa37683538a4f0dfd5f6e79478333cf14a2395
--- /dev/null
+++ b/src/test/java/org/s4s/services/db/JDBCConnectionTest.java
@@ -0,0 +1,42 @@
+package org.s4s.services.db;
+
+import org.junit.Test;
+import org.s4s.exceptions.NoSuchUserOrPassword;
+import org.s4s.modell.dto.User;
+
+import java.sql.*;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by uerdingen on 05.06.17.
+ */
+public class JDBCConnectionTest {
+ private Statement st;
+ private String bname;
+ private final String url = "jdbc:postgresql://dumbo.inf.fh-bonn-rhein-sieg.de/svolle2s";
+
+ @Test
+ public void selectTest() throws SQLException, NoSuchUserOrPassword {
+
+ try (ResultSet set = JDBCConnection.getInstance().getStatement().executeQuery("SELECT u.\"benutzername\""
+ + " FROM \"ERR\".\"user\" u "
+ + " WHERE u.benutzername = '" + "bknobl2s" + "' "
+ + " AND u.passwort = '" + "peterlustig" + "';")) {
+
+ if (set.next()) {
+ bname = set.getString("benutzername");
+ } else {
+ throw new NoSuchUserOrPassword();
+ }
+ }
+ assertEquals("bknobl2s", bname);
+ }
+
+
+ @Test
+ public void getConnectionTest() {
+ JDBCConnection connection = (JDBCConnection) JDBCConnection.getInstance();
+ assertEquals(connection != null, true);
+ }
+}
\ No newline at end of file