Compare commits

...
23 Commits
Author SHA1 Message Date
blckxsepia 2f1a57144a .drone.yml befüllt mit Bedürftiger & Test neu
continuous-integration/drone/push Build is passing
2018-12-20 16:57:43 +01:00
esheteda67206 e5d3a789e6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/misc.xml
2018-12-20 16:52:13 +01:00
esheteda67206 5be306424a added TestAccount 2018-12-20 16:51:58 +01:00
amadoubahaa68134 b587d1a401 Spender Klasse fertig 2018-12-20 16:49:10 +01:00
esheteda67206 526e01a80f added Account, Person and TestAccount
continuous-integration/drone/push Build is failing
2018-12-20 16:48:53 +01:00
esheteda67206 ab99fae9f5 added account&person and account test
continuous-integration/drone/push Build is failing
2018-12-20 16:47:03 +01:00
blckxsepia d00817dcee .drone.yml befüllt mit Bedürftiger & Test
continuous-integration/drone/push Build is passing
2018-12-20 16:42:02 +01:00
blckxsepia a15373831e .drone.yml erstellt 2018-12-20 16:32:32 +01:00
gumbertja68144 de4d66bca7 Merge remote-tracking branch 'origin/master' 2018-12-20 15:32:25 +01:00
gumbertja68144 71906bd99c Klasse SpendenBetrag mit Testfällen 2018-12-20 15:31:26 +01:00
amadoubahaa68134 4c73ee72ea Spender Klasse fertig 2018-12-20 15:18:50 +01:00
esheteda67206 4e82a07929 Merge remote-tracking branch 'origin/master' 2018-12-20 14:54:36 +01:00
esheteda67206 a8cfd4fd56 Person commit 2018-12-20 14:54:31 +01:00
blckxsepia 10b1cad5ec Merge branch 'master' of https://git.efi.th-nuernberg.de/gitea/korndoerferpi67188/ChareSWE 2018-12-20 14:48:26 +01:00
blckxsepia f064d3835e Beduerftiger Class erstellt 2018-12-20 14:48:09 +01:00
esheteda67206 567ced3feb commit 2018-12-20 14:43:22 +01:00
korndoerferpi67188 6d88ba7850 Dateien hochladen nach „Diagramme“
Klassendiagramm_spender_account
2018-12-06 16:14:19 +00:00
esheteda67206 8292f11540 Dateien hochladen nach „Diagramme“ 2018-12-06 15:55:16 +00:00
korndoerferpi67188 4ab6ec6328 Diagramm für Spenden 2018-12-06 15:53:44 +00:00
amadoubahaa68134 cf90b62276 testOne 2018-11-22 17:16:11 +01:00
amadoubahaa68134 0821639d89 testOne 2018-11-22 17:15:58 +01:00
blckxsepia 558fecdac3 Merge remote-tracking branch 'origin/master' 2018-11-22 16:57:53 +01:00
blckxsepia 0045dce372 alle 4 Testfälle hinzugefügt 2018-11-22 16:57:24 +01:00
18 changed files with 257 additions and 35 deletions
+19
View File
@@ -0,0 +1,19 @@
pipeline:
build:
image: anapsix/alpine-java:8_jdk
commands:
- mkdir -p droneout
- javac -cp droneout:jars/hamcrest-core-1.3.jar:jars/junit-4.12.jar -d droneout src/Beduerftiger.java
- javac -cp droneout:jars/hamcrest-core-1.3.jar:jars/junit-4.12.jar -d droneout src/TestBeduerftiger.java
- javac -cp droneout:jars/hamcrest-core-1.3.jar:jars/junit-4.12.jar -d droneout src/Person.java
- javac -cp droneout:jars/hamcrest-core-1.3.jar:jars/junit-4.12.jar -d droneout src/Account.java
- javac -cp droneout:jars/hamcrest-core-1.3.jar:jars/junit-4.12.jar -d droneout src/TestAccount.java
test:
image: anapsix/alpine-java:8_jdk
commands:
- java -cp droneout:jars/hamcrest-core-1.3.jar:jars/junit-4.12.jar org.junit.runner.JUnitCore TestBeduerftiger
- java -cp droneout:jars/hamcrest-core-1.3.jar:jars/junit-4.12.jar org.junit.runner.JUnitCore TestAccount
-12
View File
@@ -1,12 +0,0 @@
<?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>
+1 -1
View File
@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/ChareSWE.iml" filepath="$PROJECT_DIR$/.idea/ChareSWE.iml" />
<module fileurl="file://$PROJECT_DIR$/ChareSWE.iml" filepath="$PROJECT_DIR$/ChareSWE.iml" />
</modules>
</component>
</project>
Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

+16
View File
@@ -0,0 +1,16 @@
public class Account {
public Person owner;
public String email;
Account(Person owner, String email){
this.owner = owner;
this.email = email;
}
public void accountErstellen(Person p, String e_email){
this.owner = p;
this.email = e_email;
}
}
+15
View File
@@ -0,0 +1,15 @@
public class Beduerftiger {
public String bFirstName;
public String bLastName;
public String bNeed;
public Beduerftiger(){
}
public Beduerftiger(String theFirstName, String theLastName, String theNeed ){
this.bFirstName = theFirstName;
this.bLastName = theLastName;
this.bNeed = theNeed;
}
}
+17 -21
View File
@@ -1,8 +1,4 @@
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import assets.Helpers;
public class Credentials {
@@ -19,29 +15,29 @@ public class Credentials {
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();
String[] lines = Helpers.readTextdatei("src/assets/passwd");
String tmp = "";
String name = "";
String pw = "";
for(int i=0; i<lines.length; i++) {
if(i % 2 == 0){
name = lines[i];
System.out.println( "NAME: " + name);
}else {
pw= lines[i];
System.out.println(pw);
}
}
catch (IOException e) {
e.printStackTrace();
}
return result.toArray(new String[]{});
*/
return false;
}
}
+19 -1
View File
@@ -10,10 +10,28 @@ public class CredentialsTest{
public void testOne(){
Credentials c = new Credentials("", "");
assertNotNull(c);
}
@Test
public void testTwo(){
}
Credentials c = new Credentials("hofmannol", "GERONIMO");
assertEquals("hofmannol", c.login);
}
@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());
}
}
+16
View File
@@ -0,0 +1,16 @@
public class Person {
public String name;
public String vname;
public int age;
Person(String name, String vname, int age){
this.name = name;
this.vname = vname;
this.age = age;
}
}
+23
View File
@@ -0,0 +1,23 @@
public class Spender extends Person{
private int amount;
public Spender (String fname, String lname, int age, int summe){
super(fname, lname, age);
this.amount = summe;
}
public void betragSetzen(int summe){
if(summe > 0){
amount = summe;
}
}
public int getAmount(){
return amount;
}
}
+52
View File
@@ -0,0 +1,52 @@
import org.junit.Test;
import static org.junit.Assert.*;
public class TestAccount {
@Test
public void test1(){
// Arrange
Person p = new Person("Hans","Georg", 12);
// Act
Account a = new Account(p, "fdfdf");
// Assert
assertEquals("Georg", a.owner.vname);
}
@Test
public void testM2(){
// Arrange
Person p = new Person("Hans","Georg", 12);
// Act
Account a = new Account(p, "fdfdf");
// Assert
assertEquals("Georg", a.owner.vname);
}
@Test
public void test3(){
// Arrange
Person p = new Person("Hans","Georg", 12);
// Act
Account a = new Account(p, "fdfdf");
// Assert
assertEquals(12, a.owner.age);
}
}
+27
View File
@@ -0,0 +1,27 @@
import org.junit.Test;
import static org.junit.Assert.*;
public class TestBeduerftiger {
@Test
public void firstNameChange(){
String bfirstName= "Jesus";
String result ="Jesus";
assertEquals(bfirstName, result);
}
@Test
public void lastNameChange(){
String bLastName= "Gottessohn";
String result ="Gottessohn";
assertEquals(bLastName, result);
}
@Test
public void NeedChange(){
String bNeed= "Abendmahl";
String result ="Abendmahl";
assertEquals(bNeed, result);
}
}
+19
View File
@@ -0,0 +1,19 @@
import org.junit.Test;
import static org.junit.Assert.*;
public class TestClass {
@Test
public void test1(){
// arrange
Person p = new Person("Dani", "Estade", 18);
Spender s = new Spender( "titi", "nase", 22 , 33);
//act
assertEquals("titi", s.name);
}
}
+1
View File
@@ -12,4 +12,5 @@ public class TestKorndoerfer {
}
}
+32
View File
@@ -0,0 +1,32 @@
import org.junit.Test;
import static org.junit.Assert.*;
public class TestSpendenBetrag {
@Test
public void spendenhoeheChange(){
SpendenBetrag s = new SpendenBetrag(2000,"Pia", "Korn", "Aarif","Amablabla", "blalba@mail.de");
assertEquals("Pia", s.firstnameSpender);
}
@Test
public void spendenhoeheChange2(){
SpendenBetrag t = new SpendenBetrag(2000,"Pia", "Korn", "Aarif","Amablabla", "blalba@mail.de");
assertEquals(2000, t.spendenhoehe);
}
@Test
public void spendenhoeheChange3(){
SpendenBetrag u = new SpendenBetrag(50,"Lien", "Tra", "Jay","Bay", "Test");
assertEquals("Jay", u.firstnameBeduerftiger);
}
}