Compare commits

...
25 Commits
Author SHA1 Message Date
amadoubahaa68134 d9d17d11a3 testOne 2018-11-22 16:57:11 +01:00
amadoubahaa68134 f73bd53cc0 testOne 2018-11-22 16:39:50 +01:00
blckxsepia bd397d5bd1 Testfall 1 2018-11-22 16:24:50 +01:00
amadoubahaa68134 547b9ea3c9 Merge remote-tracking branch 'origin/master' 2018-11-22 16:12:29 +01:00
amadoubahaa68134 5fe24de1d2 testOne 2018-11-22 16:12:12 +01:00
blckxsepia b049a50fb1 added chareswe.iml 2018-11-22 15:53:46 +01:00
blckxsepia 86606a868e added chareswe.iml 2018-11-22 15:52:54 +01:00
blckxsepia 9911b91a30 added credentials and helpers 2018-11-22 15:52:00 +01:00
amadoubahaa68134 becdc0e088 bring TestOne zum laufem amk! 2018-11-22 15:48:55 +01:00
amadoubahaa68134 1b02d17585 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/HelloWorld.java
2018-11-22 15:43:44 +01:00
amadoubahaa68134 2f1561939b bring TestOne zum laufem amk! 2018-11-22 15:43:02 +01:00
blckxsepia 9a7642a516 added testkondoerfer 2018-11-22 15:38:16 +01:00
blckxsepia 18137f3430 passwd und Herlpers.java hinzugefügt 2018-11-22 15:35:21 +01:00
gumbertja68144 eaaa2ee6dc Merge remote-tracking branch 'origin/master' 2018-11-22 15:19:23 +01:00
gumbertja68144 7f2aabf19d TestGumbert 2018-11-22 15:19:11 +01:00
blckxsepia 4a1a66eeec passwd und Herlpers.java hinzugefügt 2018-11-22 15:18:27 +01:00
blckxsepia 3b1643850c 1. Testfall 2018-11-22 15:14:33 +01:00
amadoubahaa68134 d4398ff5e9 Merge branch 'master' of https://git.efi.th-nuernberg.de/gitea/korndoerferpi67188/ChareSWE
# Conflicts:
#	.idea/misc.xml
#	.idea/modules.xml
2018-11-22 15:05:27 +01:00
gumbertja68144 2e5f1ae832 update 2018-11-22 15:04:59 +01:00
amadoubahaa68134 334c45e723 Namenänderung 2018-11-22 15:04:55 +01:00
gumbertja68144 ab44bea76a Gumbert Class 2018-11-22 15:02:49 +01:00
esheteda67206 f112e10987 Test Eshete 2018-11-22 14:56:29 +01:00
blckxsepia ac0a6afa22 readme aktualisiert 2018-11-22 14:49:10 +01:00
blckxsepia 5d4e53dd27 Merge branch 'master' of https://git.efi.th-nuernberg.de/gitea/korndoerferpi67188/ChareSWE 2018-11-22 14:45:28 +01:00
blckxsepia acaf56c88c jar verzeichnis 2018-11-22 14:45:01 +01:00
16 changed files with 226 additions and 0 deletions
+1
View File
@@ -61,6 +61,7 @@ fabric.properties
# Package Files #
*.jar
!jar/*.jar
*.war
*.ear
*.zip
+12
View File
@@ -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>
+9
View File
@@ -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>
+8
View File
@@ -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>
+1
View File
@@ -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)
* ...
¥≤
Binary file not shown.
Binary file not shown.
+47
View File
@@ -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;
}
}
+19
View File
@@ -0,0 +1,19 @@
import org.junit.Test;
import static org.junit.Assert.*;
public class CredentialsTest{
@Test
public void testOne(){
Credentials c = new Credentials("", "");
assertNotNull(c);
}
}
+2
View File
@@ -0,0 +1,2 @@
public class TestEshete {
}
+4
View File
@@ -0,0 +1,4 @@
package PACKAGE_NAME;
public class TestGumbert {
}
+15
View File
@@ -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);
}
}
+4
View File
@@ -0,0 +1,4 @@
package PACKAGE_NAME;
public class TestKorndoerferPi {
}
+42
View File
@@ -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);
}
}
+58
View File
@@ -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;
}
}
+4
View File
@@ -0,0 +1,4 @@
hofmannol
2df372ddeafdf65908ddda48799d6f21
wimmerma
eb9b41a390c3a252aff0454e8df16f75