diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ce5b33a0969b184746a738cc2f6d8f9045e1a7f2..3ec765a7e1cfc9c0062ac73a56b522ff9ca35742 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,8 @@
<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/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/LoginControl_Test.java" afterPath="$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/LoginControl_Test.java" />
<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" />
@@ -26,34 +26,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="600">
- <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">
+ <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">
<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" />
- <marker date="1496682108000" expanded="true" signature="585:784" ph="SELECT u.\"b... user" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <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="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="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="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" />
+ <state relative-caret-position="270">
+ <caret line="18" column="9" lean-forward="false" selection-start-line="18" selection-start-column="9" selection-end-line="18" selection-end-column="9" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -131,12 +108,12 @@
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungsBestaetigung.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungView.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/TemplateView.java" />
- <option value="$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/LoginControl_Test.java" />
- <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" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/LoginControl.java" />
+ <option value="$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/LoginControl_Test.java" />
+ <option value="$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java" />
</list>
</option>
</component>
@@ -238,7 +215,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="PackagesPane" />
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane">
@@ -486,104 +462,6 @@
<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="main" />
- <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" />
- <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="main" />
- <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>
- <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="main" />
- <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="Control" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -775,6 +653,7 @@
</PATH>
</subPane>
</pane>
+ <pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -812,7 +691,7 @@
</list>
</option>
</component>
- <component name="RunManager" selected="JUnit.Test">
+ <component name="RunManager" selected="JUnit.RegistrationControl_Test">
<configuration default="false" name="shopInShop [jetty:run]" type="MavenRunConfiguration" factoryName="Maven" temporary="true">
<MavenSettings>
<option name="myGeneralSettings" />
@@ -837,6 +716,84 @@
</MavenSettings>
<method />
</configuration>
+ <configuration default="false" name="RegistrationControl_Test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+ <pattern>
+ <option name="PATTERN" value="org.s4s.dao.impl.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
+ <module name="shopInShop" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" value="org.s4s.dao.impl" />
+ <option name="MAIN_CLASS_NAME" value="org.s4s.dao.impl.RegistrationControl_Test" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$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>
+ <configuration default="false" name="LoginControl_Test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+ <pattern>
+ <option name="PATTERN" value="org.s4s.dao.impl.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
+ <module name="shopInShop" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" value="org.s4s.dao.impl" />
+ <option name="MAIN_CLASS_NAME" value="org.s4s.dao.impl.LoginControl_Test" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$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>
+ <configuration default="false" name="LoginControl_Test.login_Test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" track_test_folders="true" runner="emma">
+ <pattern>
+ <option name="PATTERN" value="org.s4s.dao.impl.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
+ <module name="shopInShop" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" value="org.s4s.dao.impl" />
+ <option name="MAIN_CLASS_NAME" value="org.s4s.dao.impl.LoginControl_Test" />
+ <option name="METHOD_NAME" value="login_Test" />
+ <option name="TEST_OBJECT" value="method" />
+ <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>
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="" />
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
@@ -1268,13 +1225,19 @@
<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 size="5">
+ <item index="0" class="java.lang.String" itemvalue="JUnit.Test" />
+ <item index="1" class="java.lang.String" itemvalue="Maven.shopInShop [jetty:run]" />
+ <item index="2" class="java.lang.String" itemvalue="JUnit.RegistrationControl_Test" />
+ <item index="3" class="java.lang.String" itemvalue="JUnit.LoginControl_Test" />
+ <item index="4" class="java.lang.String" itemvalue="JUnit.LoginControl_Test.login_Test" />
</list>
<recent_temporary>
- <list size="1">
- <item index="0" class="java.lang.String" itemvalue="Maven.shopInShop [jetty:run]" />
+ <list size="4">
+ <item index="0" class="java.lang.String" itemvalue="JUnit.RegistrationControl_Test" />
+ <item index="1" class="java.lang.String" itemvalue="JUnit.LoginControl_Test.login_Test" />
+ <item index="2" class="java.lang.String" itemvalue="Maven.shopInShop [jetty:run]" />
+ <item index="3" class="java.lang.String" itemvalue="JUnit.LoginControl_Test" />
</list>
</recent_temporary>
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
@@ -1325,35 +1288,45 @@
<workItem from="1494998957951" duration="3852000" />
<workItem from="1495525728427" duration="19068000" />
<workItem from="1496505763657" duration="2984000" />
- <workItem from="1496680428314" duration="1704000" />
+ <workItem from="1496680428314" duration="1810000" />
+ <workItem from="1496742832611" duration="6144000" />
</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 file="LoginControl_Test_login_Test - 2017.06.06 at 13h 17m 24s.xml">
+ <configuration name="LoginControl_Test.login_Test" configurationId="JUnit" />
+ </history-entry>
+ <history-entry file="LoginControl_Test_login_Test - 2017.06.06 at 13h 26m 29s.xml">
+ <configuration name="LoginControl_Test.login_Test" configurationId="JUnit" />
+ </history-entry>
+ <history-entry file="LoginControl_Test_login_Test - 2017.06.06 at 13h 27m 23s.xml">
+ <configuration name="LoginControl_Test.login_Test" configurationId="JUnit" />
</history-entry>
- <history-entry file="Test - 2017.06.05 at 18h 38m 30s.xml">
- <configuration name="Test" configurationId="JUnit" />
+ <history-entry file="LoginControl_Test_login_Test - 2017.06.06 at 13h 28m 08s.xml">
+ <configuration name="LoginControl_Test.login_Test" configurationId="JUnit" />
</history-entry>
- <history-entry file="Test - 2017.06.05 at 18h 42m 22s.xml">
- <configuration name="Test" configurationId="JUnit" />
+ <history-entry file="LoginControl_Test_login_Test - 2017.06.06 at 13h 28m 50s.xml">
+ <configuration name="LoginControl_Test.login_Test" configurationId="JUnit" />
</history-entry>
- <history-entry file="Test - 2017.06.05 at 18h 43m 31s.xml">
- <configuration name="Test" configurationId="JUnit" />
+ <history-entry file="LoginControl_Test_login_Test - 2017.06.06 at 13h 29m 26s.xml">
+ <configuration name="LoginControl_Test.login_Test" configurationId="JUnit" />
</history-entry>
- <history-entry file="Test - 2017.06.05 at 18h 43m 54s.xml">
- <configuration name="Test" configurationId="JUnit" />
+ <history-entry file="RegistrationControl_Test - 2017.06.06 at 13h 39m 41s.xml">
+ <configuration name="RegistrationControl_Test" configurationId="JUnit" />
</history-entry>
- <history-entry file="Test - 2017.06.05 at 18h 57m 21s.xml">
- <configuration name="Test" configurationId="JUnit" />
+ <history-entry file="RegistrationControl_Test - 2017.06.06 at 13h 42m 31s.xml">
+ <configuration name="RegistrationControl_Test" configurationId="JUnit" />
</history-entry>
- <history-entry file="Test - 2017.06.05 at 19h 01m 55s.xml">
- <configuration name="Test" configurationId="JUnit" />
+ <history-entry file="RegistrationControl_Test - 2017.06.06 at 13h 45m 13s.xml">
+ <configuration name="RegistrationControl_Test" configurationId="JUnit" />
+ </history-entry>
+ <history-entry file="RegistrationControl_Test - 2017.06.06 at 13h 45m 39s.xml">
+ <configuration name="RegistrationControl_Test" configurationId="JUnit" />
</history-entry>
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="51188000" />
+ <option name="totallyTimeSpent" value="57438000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="1920" height="1080" extended-state="0" />
@@ -1377,10 +1350,10 @@
<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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24653466" sideWeight="0.49583334" order="2" 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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18423855" 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" />
@@ -1446,13 +1419,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/AbstractOrderedLayout.class">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="222">
- <caret line="186" column="16" lean-forward="false" selection-start-line="186" selection-start-column="16" selection-end-line="186" selection-end-column="16" />
- </state>
- </provider>
- </entry>
<entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/com/vaadin/navigator/Navigator.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
@@ -1666,14 +1632,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/services/util/ViewsTest.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="135">
- <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/modell/dto/Product.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-351">
@@ -1692,24 +1650,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/LoginControl_Test.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="180">
- <caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/modell/dto/User.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="105">
- <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/exceptions/DAOException.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
@@ -1726,14 +1666,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/ProductSearch.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-357">
- <caret line="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/matchers/UtilityMatchers.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="349">
@@ -1750,74 +1682,88 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungView.java">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/services/db/JDBCConnectionTest2.java" />
+ <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="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 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/test/java/org/s4s/dao/impl/RegistrationControl_Test.java">
+ <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="9" lean-forward="false" selection-start-line="22" selection-start-column="9" selection-end-line="22" selection-end-column="9" />
+ <state relative-caret-position="195">
+ <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="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/services/db/JDBCConnectionTest2.java">
+ <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="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" />
+ <state relative-caret-position="492">
+ <caret line="122" column="38" lean-forward="true" selection-start-line="122" selection-start-column="38" selection-end-line="122" selection-end-column="120" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/RegistrationControl.java">
+ <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="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\"... " />
- </folding>
+ <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/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" />
+ <state relative-caret-position="199">
+ <caret line="83" column="36" lean-forward="false" selection-start-line="83" selection-start-column="36" selection-end-line="83" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/KundenDAO.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/ProductSearch.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" />
+ <state relative-caret-position="130">
+ <caret line="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/ShopDAO.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/exceptions/NoSuchUserOrPassword.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 relative-caret-position="105">
+ <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/services/db/JDBCConnection.java">
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/services/util/ViewsTest.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" />
+ <state relative-caret-position="135">
+ <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/modell/dto/User.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="105">
+ <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/LoginControl_Test.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="315">
+ <caret line="21" column="0" lean-forward="true" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -1826,16 +1772,16 @@
</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" />
+ <state relative-caret-position="112">
+ <caret line="23" column="0" lean-forward="true" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
<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" />
+ <state relative-caret-position="315">
+ <caret line="21" column="8" lean-forward="false" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
<folding>
<element signature="imports" expanded="true" />
<marker date="1496682108000" expanded="true" signature="585:784" ph="SELECT u.\"b... user" />
@@ -1843,5 +1789,26 @@
</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="-281">
+ <caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ <marker date="1496503262000" expanded="true" signature="1616:1646" ph="INSERT INTO \"ERR\".\"user\"... " />
+ </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="270">
+ <caret line="18" column="9" lean-forward="false" selection-start-line="18" selection-start-column="9" selection-end-line="18" selection-end-column="9" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/src/test/java/org/s4s/dao/impl/LoginControl_Test.java b/src/test/java/org/s4s/dao/impl/LoginControl_Test.java
index 858271eac13a3691fa59fbb8faa77e72cc526ad2..5d25a2039b0fe431fb6a1d001623aa389a9994cb 100644
--- a/src/test/java/org/s4s/dao/impl/LoginControl_Test.java
+++ b/src/test/java/org/s4s/dao/impl/LoginControl_Test.java
@@ -1,6 +1,10 @@
package org.s4s.dao.impl;
import org.junit.Test;
+import org.s4s.dao.KundenDAO;
+import org.s4s.exceptions.DAOException;
+import org.s4s.exceptions.NoSuchUserOrPassword;
+import org.s4s.modell.dto.User;
import static org.junit.Assert.*;
@@ -8,9 +12,12 @@ import static org.junit.Assert.*;
* Created by uerdingen on 03.06.17.
*/
public class LoginControl_Test {
- @Test
- public void getUserByCredentials_Test(){
-}
+ private final KundenDAO kundenDAO = new LoginControl();
+
+ @Test(expected = NoSuchUserOrPassword.class)
+ public void login_Test() throws NoSuchUserOrPassword, DAOException {
+ kundenDAO.getUserByCredentials("testuser", "54321");
+ }
}
\ No newline at end of file
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 6030b0f77f0c634047cf0497950e7faf85cabd1f..e19d70fe071c82cb3245b39d682112b319392fc7 100644
--- a/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java
+++ b/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java
@@ -9,18 +9,24 @@ import static org.junit.Assert.*;
* Created by uerdingen on 03.06.17.
*/
public class RegistrationControl_Test {
- @Before
- public void setUp(){
- String[] data1 = new String[4];
+
+ private String[] data1 = new String[7];
+
+ @Test
+ public void nameValidator_Test(){
+ assertTrue(RegistrationControl.nameValidator("Uerdingen"));
+ assertFalse(RegistrationControl.nameValidator("fs2df3"));
+ }
+
+
+//unfinished
+ @Test
+ public void Registration_Test(){
data1[0] = "Uerdingen";
data1[1] = "Simon";
data1[2] = "simon.uerdingen@inf.h-brs.de";
- data1[3] = "12345";
- }
-
- @Test
- public void nameValidator_Test(){
- // assertTrue(RegistrationControl.nameValidator());
+ data1[4] = "12345";
+ assertTrue(RegistrationControl.init(data1));
}
}
\ No newline at end of file