Рейдман Павел, 495, Threads

.gitignore

@@ -19,4 +19,3 @@ workbench.xmi
 *.swp
 .settings
 .checkstyle
-twitter4j.properties

akormushin/pom.xml

@@ -23,13 +23,6 @@
             <artifactId>jcommander</artifactId>
             <version>1.48</version>
         </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.4</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <developers>

akormushin/src/main/java/ru/fizteh/fivt/students/akormushin/annotations/xml/Group.java

@@ -5,16 +5,14 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static java.util.stream.Collectors.toCollection;
-
 /**
  * Created by kormushin on 22.09.15.
  */
 @XmlRootElement
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
 @DatabaseTable
-public class Group implements Cloneable {
+public class Group {
 
     @PrimaryKey
     @XmlAttribute
@@ -55,16 +53,4 @@ public String toString() {
                 + '}';
     }
 
-    @Override
-    public Group clone() {
-        try {
-            Group clone = (Group) super.clone();
-            clone.setStudents(students.stream()
-                    .map(Student::clone)
-                    .collect(toCollection(ArrayList::new)));
-            return clone;
-        } catch (CloneNotSupportedException e) {
-            throw new IllegalStateException(e);
-        }
-    }
 }

akormushin/src/main/java/ru/fizteh/fivt/students/akormushin/annotations/xml/Student.java

@@ -8,7 +8,7 @@
 @XmlRootElement
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
-public class Student implements Cloneable {
+public class Student {
 
     @XmlAttribute
     private String firstName;
@@ -47,13 +47,4 @@ public String toString() {
                 + ", secondName='" + getSecondName() + '\''
                 + '}';
     }
-
-    @Override
-    public Student clone() {
-        try {
-            return (Student) super.clone();
-        } catch (CloneNotSupportedException e) {
-            throw new IllegalStateException(e);
-        }
-    }
 }

akormushin/src/test/java/ru/fizteh/fivt/students/akormushin/annotations/junit/GroupStatisticsTest.java

@@ -1,71 +1,34 @@
 package ru.fizteh.fivt.students.akormushin.annotations.junit;
 
-import org.junit.After;
+import junit.framework.TestCase;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
-import ru.fizteh.fivt.students.akormushin.annotations.xml.Group;
-import ru.fizteh.fivt.students.akormushin.annotations.xml.Student;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Mockito.when;
+import java.security.acl.Group;
 
 /**
  * Created by kormushin on 22.09.15.
  */
 @RunWith(MockitoJUnitRunner.class)
-public class GroupStatisticsTest {
+public class GroupStatisticsTest extends TestCase {
 
     @InjectMocks
     private GroupStatistics groupStatistics;
 
     @Mock
-    private Database<String, Group> database;// = mock(Database.class);
-
-    @BeforeClass
-    public static void beforeAll() {
-        System.out.println("before all");
-    }
+    private Database<String, Group> database;
 
     @Before
-    public void setUp1() throws IllegalAccessException {
-        Student student1 = new Student("Ivan", "Ivanov");
-        Student student2 = new Student("Petr", "Petrov");
+    public void setUp(){
 
-        Group group1 = new Group("494", student1, student2);
-        Group group2 = new Group("495", student1, student2);
-
-        when(database.select()).thenReturn(Arrays.asList(group1, group2));
-        when(database.select(anyObject())).thenReturn(group1);
-        when(database.select(any())).thenAnswer(i -> {
-            if (i.getArguments()[0].equals("494")) {
-                return group1;
-            }
-            return null;
-        });
     }
 
-    @After
-    public void afterTest() {
-        System.out.println("after test");
-    }
-
-
     @Test
     public void testGetStudentsByGroup() throws Exception {
-        assertThat(groupStatistics.getStudentsByGroup().get("494"), is(2));
-
-        assertThat(groupStatistics.getStudentsByGroup().get("495"), is(2));
+        System.out.println(groupStatistics.getStudentsByGroup());
     }
-
 }