Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/HelloWorld.java

.gitignore

@@ -61,6 +61,7 @@ fabric.properties
 
 # Package Files #
 *.jar
+!jar/*.jar
 *.war
 *.ear
 *.zip

.idea/ChareSWE.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="jars" level="project" />
+  </component>
+</module>

.idea/misc.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="true" project-jdk-name="10" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/../gitchareswe" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/ChareSWE.iml" filepath="$PROJECT_DIR$/.idea/ChareSWE.iml" />
+    </modules>
+  </component>
+</project>

README.md

@@ -29,3 +29,4 @@ Pia Korndörfer, Danial Eshete, Jana Gumbert, Amadou-Bah Aarif
 * **Homer Simpson** - *Qualitätssicherung* - [Profil](https://de.wikipedia.org/wiki/Homer_Simpson) 
 * ...
 
+¥≤

src/Credentials.java

@@ -0,0 +1,47 @@
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+
+
+public class Credentials {
+
+    String login;
+    String hash;
+
+    Credentials(String lg, String pw){
+
+        login = lg;
+        hash = pw;
+
+    }
+
+
+    public boolean valid(){
+
+    /*    String line;
+        ArrayList<String> result = new ArrayList<String>();
+        try {
+            FileReader fr = new FileReader(passwd.txt);
+            BufferedReader br = new BufferedReader(fr);
+            while ((line = br.readLine()) != null)
+                result.add(line);
+            br.close();
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+        }
+        return result.toArray(new String[]{});
+      */
+
+        return false;
+
+
+
+
+    }
+
+
+
+}
+

src/CredentialsTest.java

@@ -0,0 +1,37 @@
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+
+public class CredentialsTest{
+
+
+
+@Test
+    public void testOne(){
+    Credentials c = new Credentials("", "");
+    assertNotNull(c);
+}
+
+@Test
+    public void testTwo(){
+
+        Credentials c = new Credentials("hofmannol", "GERONIMO");
+        assertTrue(c.valid());
+    }
+
+    @Test
+    public void testThree(){
+
+        Credentials c = new Credentials("hofmannolli", "GERONIMOil");
+        assertFalse(c.valid());
+    }
+
+    @Test
+    public void testFour(){
+
+        Credentials c = new Credentials("hofmannoll", "GERONIMOil");
+        assertFalse(c.valid());
+    }
+
+
+}

src/TestEshete.java

@@ -0,0 +1,2 @@
+public class TestEshete {
+}

src/TestGumbert.java

@@ -0,0 +1,4 @@
+package PACKAGE_NAME;
+
+public class TestGumbert {
+}

src/TestKorndoerfer.java

@@ -0,0 +1,15 @@
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+
+public class TestKorndoerfer {
+    @Test
+    public void testMulitply(){
+        int i =2;
+        int result =i*2;
+        assertEquals(4, result);
+
+
+    }
+
+}

src/TestKorndoerferPi.java

@@ -0,0 +1,4 @@
+package PACKAGE_NAME;
+
+public class TestKorndoerferPi {
+}

src/Testamadoubahaa.java

@@ -0,0 +1,42 @@
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class Testamadoubahaa {
+
+    @Test
+    public void testTrue(){
+        assertTrue(1==1);
+        assertEquals(4, 2*2);
+
+    }
+
+    @Test
+    public void testMultiply(){
+
+        // Arrange
+        int i = 2;
+
+        // Act
+        int result = i * 2;
+
+        // Assert
+        assertEquals(4, result);
+    }
+
+    @Test
+
+    public void testOne(){
+
+        // Arrange
+        int j = 23 ;
+        int a = 38;
+
+        // Act
+        int res = j + a;
+
+        // Assert
+
+        assertEquals(100, res);
+
+    }
+}

src/assets/Helpers.java

@@ -0,0 +1,58 @@
+package assets;
+
+import java.io.*;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+
+public class Helpers {
+
+    // Lesen einer Textdatei in ein Stringarray
+    public static String[] readTextdatei(String name) {
+        String line;
+        ArrayList<String> result = new ArrayList<String>();
+        try {
+            FileReader fr = new FileReader(name);
+            BufferedReader br = new BufferedReader(fr);
+            while ((line = br.readLine()) != null)
+                result.add(line);
+            br.close();
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+        }
+        return result.toArray(new String[]{});
+    }
+
+    // Schreiben eines Stringarray in eine Textdatei
+    public static void writeTextdatei(String name, String[] lines) {
+
+        try {
+            FileWriter fw = new FileWriter(name);
+            BufferedWriter bw = new BufferedWriter(fw);
+            PrintWriter pw = new PrintWriter(bw);
+            for (int i = 0; i < lines.length; i++)
+                pw.println(lines[i]);
+            pw.close();
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    // Berechnen des Hashwerts zu einem String und
+    // Rückgabe als Hex-Zeichenkette
+    public static String getHash(String w) {
+        try {
+            byte[] bytesOfMessage = w.getBytes("UTF-8");
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            byte[] thedigest = md.digest(bytesOfMessage);
+            return String.format("%032x", new BigInteger(1, thedigest));
+        } catch (UnsupportedEncodingException | NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+}

src/assets/passwd

@@ -0,0 +1,4 @@
+hofmannol
+2df372ddeafdf65908ddda48799d6f21
+wimmerma
+eb9b41a390c3a252aff0454e8df16f75