mpierse пре 6 година
родитељ
комит
c62b4afde9
5 измењених фајлова са 282 додато и 136 уклоњено
  1. 192
    136
      .idea/workspace.xml
  2. 8
    0
      src/main/java/ArrayList.java
  3. 26
    0
      src/main/java/MySet.java
  4. 8
    0
      src/test/java/ArrayListTest.java
  5. 48
    0
      src/test/java/MySetTest.java

+ 192
- 136
.idea/workspace.xml Прегледај датотеку

2
 <project version="4">
2
 <project version="4">
3
   <component name="ChangeListManager">
3
   <component name="ChangeListManager">
4
     <list default="true" id="4722a4ca-84fe-4509-a5b7-de0cc14e62a2" name="Default Changelist" comment="">
4
     <list default="true" id="4722a4ca-84fe-4509-a5b7-de0cc14e62a2" name="Default Changelist" comment="">
5
+      <change afterPath="$PROJECT_DIR$/src/main/java/MySet.java" afterDir="false" />
6
+      <change afterPath="$PROJECT_DIR$/src/test/java/MySetTest.java" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
5
       <change beforePath="$PROJECT_DIR$/src/main/java/ArrayList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ArrayList.java" afterDir="false" />
8
       <change beforePath="$PROJECT_DIR$/src/main/java/ArrayList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ArrayList.java" afterDir="false" />
6
       <change beforePath="$PROJECT_DIR$/src/test/java/ArrayListTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/ArrayListTest.java" afterDir="false" />
9
       <change beforePath="$PROJECT_DIR$/src/test/java/ArrayListTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/ArrayListTest.java" afterDir="false" />
7
     </list>
10
     </list>
12
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
15
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
13
     <option name="LAST_RESOLUTION" value="IGNORE" />
16
     <option name="LAST_RESOLUTION" value="IGNORE" />
14
   </component>
17
   </component>
18
+  <component name="CoverageDataManager">
19
+    <SUITE FILE_PATH="coverage/generics$ArrayListTest.ic" NAME="ArrayListTest Coverage Results" MODIFIED="1542224311433" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
20
+  </component>
21
+  <component name="CoverageViewManager">
22
+    <option name="myElementSize" value="201" />
23
+  </component>
15
   <component name="FUSProjectUsageTrigger">
24
   <component name="FUSProjectUsageTrigger">
16
     <session id="344243851">
25
     <session id="344243851">
17
       <usages-collector id="statistics.lifecycle.project">
26
       <usages-collector id="statistics.lifecycle.project">
18
         <counts>
27
         <counts>
28
+          <entry key="project.closed" value="2" />
19
           <entry key="project.open.time.0" value="1" />
29
           <entry key="project.open.time.0" value="1" />
20
-          <entry key="project.opened" value="1" />
30
+          <entry key="project.open.time.1" value="1" />
31
+          <entry key="project.open.time.2" value="1" />
32
+          <entry key="project.opened" value="3" />
21
         </counts>
33
         </counts>
22
       </usages-collector>
34
       </usages-collector>
23
       <usages-collector id="statistics.file.extensions.open">
35
       <usages-collector id="statistics.file.extensions.open">
24
         <counts>
36
         <counts>
25
           <entry key="class" value="5" />
37
           <entry key="class" value="5" />
26
           <entry key="iml" value="1" />
38
           <entry key="iml" value="1" />
27
-          <entry key="java" value="2" />
39
+          <entry key="java" value="4" />
28
           <entry key="md" value="1" />
40
           <entry key="md" value="1" />
29
         </counts>
41
         </counts>
30
       </usages-collector>
42
       </usages-collector>
32
         <counts>
44
         <counts>
33
           <entry key="CLASS" value="5" />
45
           <entry key="CLASS" value="5" />
34
           <entry key="IDEA_MODULE" value="1" />
46
           <entry key="IDEA_MODULE" value="1" />
35
-          <entry key="JAVA" value="2" />
47
+          <entry key="JAVA" value="4" />
36
           <entry key="Markdown" value="1" />
48
           <entry key="Markdown" value="1" />
37
         </counts>
49
         </counts>
38
       </usages-collector>
50
       </usages-collector>
39
       <usages-collector id="statistics.file.types.edit">
51
       <usages-collector id="statistics.file.types.edit">
40
         <counts>
52
         <counts>
41
-          <entry key="JAVA" value="2308" />
53
+          <entry key="JAVA" value="2825" />
42
         </counts>
54
         </counts>
43
       </usages-collector>
55
       </usages-collector>
44
       <usages-collector id="statistics.js.language.service.starts" />
56
       <usages-collector id="statistics.js.language.service.starts" />
47
       <usages-collector id="statistics.spring.boot.run.usages" />
59
       <usages-collector id="statistics.spring.boot.run.usages" />
48
       <usages-collector id="statistics.file.extensions.edit">
60
       <usages-collector id="statistics.file.extensions.edit">
49
         <counts>
61
         <counts>
50
-          <entry key="java" value="2308" />
62
+          <entry key="java" value="2825" />
51
         </counts>
63
         </counts>
52
       </usages-collector>
64
       </usages-collector>
53
     </session>
65
     </session>
54
   </component>
66
   </component>
55
   <component name="FileEditorManager">
67
   <component name="FileEditorManager">
56
-    <leaf>
68
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
57
       <file pinned="false" current-in-tab="false">
69
       <file pinned="false" current-in-tab="false">
58
         <entry file="file://$PROJECT_DIR$/README.md">
70
         <entry file="file://$PROJECT_DIR$/README.md">
59
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
71
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
60
             <state split_layout="SPLIT">
72
             <state split_layout="SPLIT">
61
-              <first_editor relative-caret-position="450">
62
-                <caret line="30" column="6" lean-forward="true" selection-start-line="30" selection-start-column="6" selection-end-line="30" selection-end-column="6" />
73
+              <first_editor relative-caret-position="400">
74
+                <caret line="30" column="6" selection-start-line="30" selection-start-column="6" selection-end-line="30" selection-end-column="6" />
63
               </first_editor>
75
               </first_editor>
64
               <second_editor />
76
               <second_editor />
65
             </state>
77
             </state>
67
         </entry>
79
         </entry>
68
       </file>
80
       </file>
69
       <file pinned="false" current-in-tab="false">
81
       <file pinned="false" current-in-tab="false">
82
+        <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
83
+          <provider selected="true" editor-type-id="text-editor">
84
+            <state relative-caret-position="210">
85
+              <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
86
+              <folding>
87
+                <element signature="e#125#126#0" expanded="true" />
88
+                <element signature="e#153#154#0" expanded="true" />
89
+                <element signature="e#187#188#0" expanded="true" />
90
+                <element signature="e#228#229#0" expanded="true" />
91
+              </folding>
92
+            </state>
93
+          </provider>
94
+        </entry>
95
+      </file>
96
+      <file pinned="false" current-in-tab="true">
97
+        <entry file="file://$PROJECT_DIR$/src/test/java/MySetTest.java">
98
+          <provider selected="true" editor-type-id="text-editor">
99
+            <state relative-caret-position="123">
100
+              <caret line="12" selection-start-line="12" selection-end-line="12" />
101
+              <folding>
102
+                <element signature="imports" expanded="true" />
103
+              </folding>
104
+            </state>
105
+          </provider>
106
+        </entry>
107
+      </file>
108
+      <file pinned="false" current-in-tab="false">
70
         <entry file="file://$PROJECT_DIR$/src/main/java/ArrayList.java">
109
         <entry file="file://$PROJECT_DIR$/src/main/java/ArrayList.java">
71
           <provider selected="true" editor-type-id="text-editor">
110
           <provider selected="true" editor-type-id="text-editor">
72
-            <state relative-caret-position="757">
73
-              <caret line="56" column="32" lean-forward="true" selection-start-line="56" selection-start-column="32" selection-end-line="56" selection-end-column="32" />
111
+            <state relative-caret-position="174">
112
+              <caret line="14" column="38" selection-start-line="14" selection-start-column="38" selection-end-line="14" selection-end-column="38" />
74
               <folding>
113
               <folding>
75
-                <element signature="e#71#72#0" expanded="true" />
76
-                <element signature="e#100#101#0" expanded="true" />
114
+                <element signature="e#163#164#0" expanded="true" />
115
+                <element signature="e#189#190#0" expanded="true" />
116
+                <element signature="e#259#260#0" expanded="true" />
77
                 <element signature="e#165#166#0" expanded="true" />
117
                 <element signature="e#165#166#0" expanded="true" />
78
                 <element signature="e#201#202#0" expanded="true" />
118
                 <element signature="e#201#202#0" expanded="true" />
79
-                <element signature="e#201#202#0" expanded="true" />
80
-                <element signature="e#226#227#0" expanded="true" />
81
-                <element signature="e#480#481#0" expanded="true" />
82
-                <element signature="e#513#514#0" expanded="true" />
83
-                <element signature="e#1187#1188#0" expanded="true" />
84
-                <element signature="e#1218#1219#0" expanded="true" />
85
-                <element signature="e#1238#1239#0" expanded="true" />
86
-                <element signature="e#1271#1272#0" expanded="true" />
87
               </folding>
119
               </folding>
88
             </state>
120
             </state>
89
           </provider>
121
           </provider>
90
         </entry>
122
         </entry>
91
       </file>
123
       </file>
92
-      <file pinned="false" current-in-tab="true">
124
+      <file pinned="false" current-in-tab="false">
93
         <entry file="file://$PROJECT_DIR$/src/test/java/ArrayListTest.java">
125
         <entry file="file://$PROJECT_DIR$/src/test/java/ArrayListTest.java">
94
           <provider selected="true" editor-type-id="text-editor">
126
           <provider selected="true" editor-type-id="text-editor">
95
-            <state relative-caret-position="506">
96
-              <caret line="36" column="9" lean-forward="true" selection-start-line="36" selection-start-column="9" selection-end-line="36" selection-end-column="9" />
127
+            <state relative-caret-position="-92">
128
+              <caret line="156" column="36" lean-forward="true" selection-start-line="156" selection-start-column="36" selection-end-line="156" selection-end-column="36" />
97
               <folding>
129
               <folding>
98
                 <element signature="imports" expanded="true" />
130
                 <element signature="imports" expanded="true" />
99
               </folding>
131
               </folding>
110
       </list>
142
       </list>
111
     </option>
143
     </option>
112
   </component>
144
   </component>
145
+  <component name="FindInProjectRecents">
146
+    <findStrings>
147
+      <find>list</find>
148
+    </findStrings>
149
+  </component>
113
   <component name="Git.Settings">
150
   <component name="Git.Settings">
114
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
151
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
115
   </component>
152
   </component>
117
     <option name="CHANGED_PATHS">
154
     <option name="CHANGED_PATHS">
118
       <list>
155
       <list>
119
         <option value="$PROJECT_DIR$/src/test/java/ArrayListTest.java" />
156
         <option value="$PROJECT_DIR$/src/test/java/ArrayListTest.java" />
157
+        <option value="$PROJECT_DIR$/src/test/java/MySetTest.java" />
120
         <option value="$PROJECT_DIR$/src/main/java/ArrayList.java" />
158
         <option value="$PROJECT_DIR$/src/main/java/ArrayList.java" />
159
+        <option value="$PROJECT_DIR$/src/main/java/MySet.java" />
121
       </list>
160
       </list>
122
     </option>
161
     </option>
123
   </component>
162
   </component>
128
     <sorting>DEFINITION_ORDER</sorting>
167
     <sorting>DEFINITION_ORDER</sorting>
129
   </component>
168
   </component>
130
   <component name="ProjectFrameBounds">
169
   <component name="ProjectFrameBounds">
131
-    <option name="x" value="-162" />
132
-    <option name="y" value="-1057" />
133
-    <option name="width" value="1809" />
134
-    <option name="height" value="993" />
170
+    <option name="y" value="23" />
171
+    <option name="width" value="1440" />
172
+    <option name="height" value="812" />
135
   </component>
173
   </component>
136
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
174
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
137
   <component name="ProjectView">
175
   <component name="ProjectView">
139
       <foldersAlwaysOnTop value="true" />
177
       <foldersAlwaysOnTop value="true" />
140
     </navigator>
178
     </navigator>
141
     <panes>
179
     <panes>
142
-      <pane id="PackagesPane" />
143
       <pane id="ProjectPane">
180
       <pane id="ProjectPane">
144
         <subPane>
181
         <subPane>
145
           <expand>
182
           <expand>
155
             <path>
192
             <path>
156
               <item name="generics" type="b2602c69:ProjectViewProjectNode" />
193
               <item name="generics" type="b2602c69:ProjectViewProjectNode" />
157
               <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
194
               <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
158
-              <item name="src" type="462c0819:PsiDirectoryNode" />
159
-              <item name="main" type="462c0819:PsiDirectoryNode" />
160
-            </path>
161
-            <path>
162
-              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
163
-              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
164
-              <item name="src" type="462c0819:PsiDirectoryNode" />
165
-              <item name="main" type="462c0819:PsiDirectoryNode" />
166
-              <item name="java" type="462c0819:PsiDirectoryNode" />
195
+              <item name="target" type="462c0819:PsiDirectoryNode" />
167
             </path>
196
             </path>
168
             <path>
197
             <path>
169
               <item name="generics" type="b2602c69:ProjectViewProjectNode" />
198
               <item name="generics" type="b2602c69:ProjectViewProjectNode" />
170
               <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
199
               <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
171
-              <item name="src" type="462c0819:PsiDirectoryNode" />
172
-              <item name="test" type="462c0819:PsiDirectoryNode" />
200
+              <item name="target" type="462c0819:PsiDirectoryNode" />
201
+              <item name="classes" type="462c0819:PsiDirectoryNode" />
173
             </path>
202
             </path>
174
             <path>
203
             <path>
175
               <item name="generics" type="b2602c69:ProjectViewProjectNode" />
204
               <item name="generics" type="b2602c69:ProjectViewProjectNode" />
176
               <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
205
               <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
177
-              <item name="src" type="462c0819:PsiDirectoryNode" />
178
-              <item name="test" type="462c0819:PsiDirectoryNode" />
179
-              <item name="java" type="462c0819:PsiDirectoryNode" />
206
+              <item name="target" type="462c0819:PsiDirectoryNode" />
207
+              <item name="generated-sources" type="462c0819:PsiDirectoryNode" />
180
             </path>
208
             </path>
181
           </expand>
209
           </expand>
182
           <select />
210
           <select />
183
         </subPane>
211
         </subPane>
184
       </pane>
212
       </pane>
213
+      <pane id="PackagesPane" />
185
       <pane id="Scope" />
214
       <pane id="Scope" />
186
     </panes>
215
     </panes>
187
   </component>
216
   </component>
188
   <component name="PropertiesComponent">
217
   <component name="PropertiesComponent">
189
     <property name="WebServerToolWindowFactoryState" value="false" />
218
     <property name="WebServerToolWindowFactoryState" value="false" />
190
     <property name="aspect.path.notification.shown" value="true" />
219
     <property name="aspect.path.notification.shown" value="true" />
191
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542221445471" />
220
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542377716203" />
192
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
221
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
193
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
222
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
194
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
223
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
205
       </list>
234
       </list>
206
     </option>
235
     </option>
207
   </component>
236
   </component>
208
-  <component name="RunManager" selected="JUnit.ArrayListTest.addAtIndex">
237
+  <component name="RunManager" selected="JUnit.MySetTest">
209
     <configuration name="ArrayListTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
238
     <configuration name="ArrayListTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
210
       <module name="generics" />
239
       <module name="generics" />
211
       <option name="PACKAGE_NAME" value="" />
240
       <option name="PACKAGE_NAME" value="" />
214
         <option name="Make" enabled="true" />
243
         <option name="Make" enabled="true" />
215
       </method>
244
       </method>
216
     </configuration>
245
     </configuration>
217
-    <configuration name="ArrayListTest.addAtIndex" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
246
+    <configuration name="MySetTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
218
       <module name="generics" />
247
       <module name="generics" />
219
       <option name="PACKAGE_NAME" value="" />
248
       <option name="PACKAGE_NAME" value="" />
220
-      <option name="MAIN_CLASS_NAME" value="ArrayListTest" />
221
-      <option name="METHOD_NAME" value="addAtIndex" />
222
-      <option name="TEST_OBJECT" value="method" />
249
+      <option name="MAIN_CLASS_NAME" value="MySetTest" />
223
       <method v="2">
250
       <method v="2">
224
         <option name="Make" enabled="true" />
251
         <option name="Make" enabled="true" />
225
       </method>
252
       </method>
226
     </configuration>
253
     </configuration>
227
-    <configuration name="ArrayListTest.addTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
254
+    <configuration name="MySetTest.addtest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
228
       <module name="generics" />
255
       <module name="generics" />
229
       <option name="PACKAGE_NAME" value="" />
256
       <option name="PACKAGE_NAME" value="" />
230
-      <option name="MAIN_CLASS_NAME" value="ArrayListTest" />
231
-      <option name="METHOD_NAME" value="addTest" />
257
+      <option name="MAIN_CLASS_NAME" value="MySetTest" />
258
+      <option name="METHOD_NAME" value="addtest" />
232
       <option name="TEST_OBJECT" value="method" />
259
       <option name="TEST_OBJECT" value="method" />
233
       <method v="2">
260
       <method v="2">
234
         <option name="Make" enabled="true" />
261
         <option name="Make" enabled="true" />
235
       </method>
262
       </method>
236
     </configuration>
263
     </configuration>
237
-    <configuration name="ArrayListTest.removeIntTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
264
+    <configuration name="MySetTest.clearTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
238
       <module name="generics" />
265
       <module name="generics" />
239
       <option name="PACKAGE_NAME" value="" />
266
       <option name="PACKAGE_NAME" value="" />
240
-      <option name="MAIN_CLASS_NAME" value="ArrayListTest" />
241
-      <option name="METHOD_NAME" value="removeIntTest" />
267
+      <option name="MAIN_CLASS_NAME" value="MySetTest" />
268
+      <option name="METHOD_NAME" value="clearTest" />
242
       <option name="TEST_OBJECT" value="method" />
269
       <option name="TEST_OBJECT" value="method" />
243
       <method v="2">
270
       <method v="2">
244
         <option name="Make" enabled="true" />
271
         <option name="Make" enabled="true" />
245
       </method>
272
       </method>
246
     </configuration>
273
     </configuration>
247
-    <configuration name="ArrayListTest.removeStringTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
274
+    <configuration name="MySetTest.containsTrueTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
248
       <module name="generics" />
275
       <module name="generics" />
249
       <option name="PACKAGE_NAME" value="" />
276
       <option name="PACKAGE_NAME" value="" />
250
-      <option name="MAIN_CLASS_NAME" value="ArrayListTest" />
251
-      <option name="METHOD_NAME" value="removeStringTest" />
277
+      <option name="MAIN_CLASS_NAME" value="MySetTest" />
278
+      <option name="METHOD_NAME" value="containsTrueTest" />
252
       <option name="TEST_OBJECT" value="method" />
279
       <option name="TEST_OBJECT" value="method" />
253
       <method v="2">
280
       <method v="2">
254
         <option name="Make" enabled="true" />
281
         <option name="Make" enabled="true" />
255
       </method>
282
       </method>
256
     </configuration>
283
     </configuration>
257
     <list>
284
     <list>
258
-      <item itemvalue="JUnit.ArrayListTest.addTest" />
259
       <item itemvalue="JUnit.ArrayListTest" />
285
       <item itemvalue="JUnit.ArrayListTest" />
260
-      <item itemvalue="JUnit.ArrayListTest.removeIntTest" />
261
-      <item itemvalue="JUnit.ArrayListTest.removeStringTest" />
262
-      <item itemvalue="JUnit.ArrayListTest.addAtIndex" />
286
+      <item itemvalue="JUnit.MySetTest.addtest" />
287
+      <item itemvalue="JUnit.MySetTest" />
288
+      <item itemvalue="JUnit.MySetTest.clearTest" />
289
+      <item itemvalue="JUnit.MySetTest.containsTrueTest" />
263
     </list>
290
     </list>
264
     <recent_temporary>
291
     <recent_temporary>
265
       <list>
292
       <list>
266
-        <item itemvalue="JUnit.ArrayListTest.addAtIndex" />
293
+        <item itemvalue="JUnit.MySetTest" />
294
+        <item itemvalue="JUnit.MySetTest.addtest" />
295
+        <item itemvalue="JUnit.MySetTest.containsTrueTest" />
296
+        <item itemvalue="JUnit.MySetTest.clearTest" />
267
         <item itemvalue="JUnit.ArrayListTest" />
297
         <item itemvalue="JUnit.ArrayListTest" />
268
-        <item itemvalue="JUnit.ArrayListTest.removeStringTest" />
269
-        <item itemvalue="JUnit.ArrayListTest.removeIntTest" />
270
-        <item itemvalue="JUnit.ArrayListTest.addTest" />
271
       </list>
298
       </list>
272
     </recent_temporary>
299
     </recent_temporary>
273
   </component>
300
   </component>
281
       <option name="number" value="Default" />
308
       <option name="number" value="Default" />
282
       <option name="presentableId" value="Default" />
309
       <option name="presentableId" value="Default" />
283
       <updated>1542144021377</updated>
310
       <updated>1542144021377</updated>
284
-      <workItem from="1542144022926" duration="11101000" />
311
+      <workItem from="1542144022926" duration="15263000" />
312
+      <workItem from="1542247374356" duration="14000" />
313
+      <workItem from="1542374483696" duration="2939000" />
285
     </task>
314
     </task>
286
     <servers />
315
     <servers />
287
   </component>
316
   </component>
288
   <component name="TestHistory">
317
   <component name="TestHistory">
289
-    <history-entry file="ArrayListTest - 2018.11.14 at 08h 48m 40s.xml">
290
-      <configuration name="ArrayListTest" configurationId="JUnit" />
318
+    <history-entry file="MySetTest_addtest - 2018.11.16 at 08h 32m 35s.xml">
319
+      <configuration name="MySetTest.addtest" configurationId="JUnit" />
291
     </history-entry>
320
     </history-entry>
292
-    <history-entry file="ArrayListTest - 2018.11.14 at 08h 57m 37s.xml">
293
-      <configuration name="ArrayListTest" configurationId="JUnit" />
321
+    <history-entry file="MySetTest - 2018.11.16 at 08h 47m 15s.xml">
322
+      <configuration name="MySetTest" configurationId="JUnit" />
294
     </history-entry>
323
     </history-entry>
295
-    <history-entry file="ArrayListTest - 2018.11.14 at 09h 02m 46s.xml">
296
-      <configuration name="ArrayListTest" configurationId="JUnit" />
324
+    <history-entry file="MySetTest - 2018.11.16 at 08h 49m 22s.xml">
325
+      <configuration name="MySetTest" configurationId="JUnit" />
297
     </history-entry>
326
     </history-entry>
298
-    <history-entry file="ArrayListTest_addAtIndex - 2018.11.14 at 13h 41m 36s.xml">
299
-      <configuration name="ArrayListTest.addAtIndex" configurationId="JUnit" />
327
+    <history-entry file="MySetTest_addtest - 2018.11.16 at 08h 49m 38s.xml">
328
+      <configuration name="MySetTest.addtest" configurationId="JUnit" />
300
     </history-entry>
329
     </history-entry>
301
-    <history-entry file="ArrayListTest_addAtIndex - 2018.11.14 at 13h 43m 30s.xml">
302
-      <configuration name="ArrayListTest.addAtIndex" configurationId="JUnit" />
330
+    <history-entry file="MySetTest_addtest - 2018.11.16 at 08h 51m 09s.xml">
331
+      <configuration name="MySetTest.addtest" configurationId="JUnit" />
303
     </history-entry>
332
     </history-entry>
304
-    <history-entry file="ArrayListTest_addAtIndex - 2018.11.14 at 13h 45m 17s.xml">
305
-      <configuration name="ArrayListTest.addAtIndex" configurationId="JUnit" />
333
+    <history-entry file="MySetTest_addtest - 2018.11.16 at 08h 52m 08s.xml">
334
+      <configuration name="MySetTest.addtest" configurationId="JUnit" />
306
     </history-entry>
335
     </history-entry>
307
-    <history-entry file="ArrayListTest_addAtIndex - 2018.11.14 at 13h 46m 45s.xml">
308
-      <configuration name="ArrayListTest.addAtIndex" configurationId="JUnit" />
336
+    <history-entry file="MySetTest_addtest - 2018.11.16 at 08h 55m 15s.xml">
337
+      <configuration name="MySetTest.addtest" configurationId="JUnit" />
309
     </history-entry>
338
     </history-entry>
310
-    <history-entry file="ArrayListTest_addAtIndex - 2018.11.14 at 13h 46m 56s.xml">
311
-      <configuration name="ArrayListTest.addAtIndex" configurationId="JUnit" />
339
+    <history-entry file="MySetTest_addtest - 2018.11.16 at 08h 59m 08s.xml">
340
+      <configuration name="MySetTest.addtest" configurationId="JUnit" />
312
     </history-entry>
341
     </history-entry>
313
-    <history-entry file="ArrayListTest_addAtIndex - 2018.11.14 at 13h 47m 24s.xml">
314
-      <configuration name="ArrayListTest.addAtIndex" configurationId="JUnit" />
342
+    <history-entry file="MySetTest_addtest - 2018.11.16 at 08h 59m 12s.xml">
343
+      <configuration name="MySetTest.addtest" configurationId="JUnit" />
315
     </history-entry>
344
     </history-entry>
316
-    <history-entry file="ArrayListTest_addAtIndex - 2018.11.14 at 13h 49m 27s.xml">
317
-      <configuration name="ArrayListTest.addAtIndex" configurationId="JUnit" />
345
+    <history-entry file="MySetTest_addtest - 2018.11.16 at 09h 06m 42s.xml">
346
+      <configuration name="MySetTest.addtest" configurationId="JUnit" />
318
     </history-entry>
347
     </history-entry>
319
   </component>
348
   </component>
320
   <component name="TimeTrackingManager">
349
   <component name="TimeTrackingManager">
321
-    <option name="totallyTimeSpent" value="11101000" />
350
+    <option name="totallyTimeSpent" value="18216000" />
322
   </component>
351
   </component>
323
   <component name="ToolWindowManager">
352
   <component name="ToolWindowManager">
324
-    <frame x="-162" y="-1057" width="1809" height="993" extended-state="0" />
353
+    <frame x="0" y="23" width="1440" height="812" extended-state="0" />
325
     <editor active="true" />
354
     <editor active="true" />
326
     <layout>
355
     <layout>
327
-      <window_info id="Image Layers" />
328
-      <window_info id="Designer" />
329
-      <window_info id="UI Designer" />
330
-      <window_info id="Capture Tool" />
331
-      <window_info id="Favorites" side_tool="true" />
332
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1975099" />
356
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25679544" />
333
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
357
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
334
-      <window_info anchor="bottom" id="Messages" weight="0.32937366" />
335
-      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
336
-      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
337
-      <window_info anchor="bottom" id="Terminal" />
338
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
358
+      <window_info id="Image Layers" order="2" />
359
+      <window_info id="Designer" order="3" />
360
+      <window_info id="UI Designer" order="4" />
361
+      <window_info id="Capture Tool" order="5" />
362
+      <window_info id="Favorites" order="6" side_tool="true" />
339
       <window_info anchor="bottom" id="Message" order="0" />
363
       <window_info anchor="bottom" id="Message" order="0" />
340
       <window_info anchor="bottom" id="Find" order="1" />
364
       <window_info anchor="bottom" id="Find" order="1" />
341
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.2608213" />
342
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.39955604" />
365
+      <window_info anchor="bottom" id="Run" order="2" weight="0.33333334" />
366
+      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.3986111" />
343
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
367
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
344
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
368
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
345
       <window_info anchor="bottom" id="TODO" order="6" />
369
       <window_info anchor="bottom" id="TODO" order="6" />
346
-      <window_info anchor="right" id="Palette" />
347
-      <window_info anchor="right" id="Theme Preview" />
348
-      <window_info anchor="right" id="Capture Analysis" />
349
-      <window_info anchor="right" id="Palette&#9;" />
350
-      <window_info anchor="right" id="Database" />
351
-      <window_info anchor="right" id="Maven Projects" />
370
+      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
371
+      <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
372
+      <window_info anchor="bottom" id="Terminal" order="9" />
373
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
374
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.32937366" />
352
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
375
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
353
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
376
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
354
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
377
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
378
+      <window_info anchor="right" id="Palette" order="3" />
379
+      <window_info anchor="right" id="Capture Analysis" order="4" />
380
+      <window_info anchor="right" id="Database" order="5" />
381
+      <window_info anchor="right" id="Theme Preview" order="6" />
382
+      <window_info anchor="right" id="Maven Projects" order="7" />
383
+      <window_info anchor="right" id="Palette&#9;" order="8" />
384
+      <window_info anchor="right" id="Coverage" order="9" side_tool="true" weight="0.3297568" />
355
     </layout>
385
     </layout>
356
   </component>
386
   </component>
357
   <component name="TypeScriptGeneratedFilesManager">
387
   <component name="TypeScriptGeneratedFilesManager">
360
   <component name="VcsContentAnnotationSettings">
390
   <component name="VcsContentAnnotationSettings">
361
     <option name="myLimit" value="2678400000" />
391
     <option name="myLimit" value="2678400000" />
362
   </component>
392
   </component>
393
+  <component name="XDebuggerManager">
394
+    <breakpoint-manager>
395
+      <breakpoints>
396
+        <line-breakpoint enabled="true" type="java-method">
397
+          <url>file://$PROJECT_DIR$/src/main/java/MySet.java</url>
398
+          <line>16</line>
399
+          <properties class="MySet" method="add">
400
+            <option name="EMULATED" value="true" />
401
+          </properties>
402
+          <option name="timeStamp" value="1" />
403
+        </line-breakpoint>
404
+      </breakpoints>
405
+    </breakpoint-manager>
406
+  </component>
363
   <component name="editorHistoryManager">
407
   <component name="editorHistoryManager">
364
     <entry file="file://$PROJECT_DIR$/generics.iml">
408
     <entry file="file://$PROJECT_DIR$/generics.iml">
365
       <provider selected="true" editor-type-id="text-editor" />
409
       <provider selected="true" editor-type-id="text-editor" />
366
     </entry>
410
     </entry>
367
-    <entry file="file://$PROJECT_DIR$/README.md">
368
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
369
-        <state split_layout="SPLIT">
370
-          <first_editor relative-caret-position="450">
371
-            <caret line="30" column="6" lean-forward="true" selection-start-line="30" selection-start-column="6" selection-end-line="30" selection-end-column="6" />
372
-          </first_editor>
373
-          <second_editor />
374
-        </state>
375
-      </provider>
376
-    </entry>
377
     <entry file="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/org/junit/runners/ParentRunner.class">
411
     <entry file="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/org/junit/runners/ParentRunner.class">
378
       <provider selected="true" editor-type-id="text-editor">
412
       <provider selected="true" editor-type-id="text-editor">
379
         <state relative-caret-position="155">
413
         <state relative-caret-position="155">
380
           <caret line="177" selection-start-line="177" selection-end-line="177" />
414
           <caret line="177" selection-start-line="177" selection-end-line="177" />
381
-          <folding>
382
-            <element signature="e#6484#6648#0" expanded="true" />
383
-            <element signature="e#6647#6648#0" expanded="true" />
384
-          </folding>
385
         </state>
415
         </state>
386
       </provider>
416
       </provider>
387
     </entry>
417
     </entry>
399
         </state>
429
         </state>
400
       </provider>
430
       </provider>
401
     </entry>
431
     </entry>
432
+    <entry file="file://$PROJECT_DIR$/README.md">
433
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
434
+        <state split_layout="SPLIT">
435
+          <first_editor relative-caret-position="400">
436
+            <caret line="30" column="6" selection-start-line="30" selection-start-column="6" selection-end-line="30" selection-end-column="6" />
437
+          </first_editor>
438
+          <second_editor />
439
+        </state>
440
+      </provider>
441
+    </entry>
442
+    <entry file="file://$PROJECT_DIR$/src/test/java/ArrayListTest.java">
443
+      <provider selected="true" editor-type-id="text-editor">
444
+        <state relative-caret-position="-92">
445
+          <caret line="156" column="36" lean-forward="true" selection-start-line="156" selection-start-column="36" selection-end-line="156" selection-end-column="36" />
446
+          <folding>
447
+            <element signature="imports" expanded="true" />
448
+          </folding>
449
+        </state>
450
+      </provider>
451
+    </entry>
402
     <entry file="file://$PROJECT_DIR$/src/main/java/ArrayList.java">
452
     <entry file="file://$PROJECT_DIR$/src/main/java/ArrayList.java">
403
       <provider selected="true" editor-type-id="text-editor">
453
       <provider selected="true" editor-type-id="text-editor">
404
-        <state relative-caret-position="757">
405
-          <caret line="56" column="32" lean-forward="true" selection-start-line="56" selection-start-column="32" selection-end-line="56" selection-end-column="32" />
454
+        <state relative-caret-position="174">
455
+          <caret line="14" column="38" selection-start-line="14" selection-start-column="38" selection-end-line="14" selection-end-column="38" />
406
           <folding>
456
           <folding>
407
-            <element signature="e#71#72#0" expanded="true" />
408
-            <element signature="e#100#101#0" expanded="true" />
457
+            <element signature="e#163#164#0" expanded="true" />
458
+            <element signature="e#189#190#0" expanded="true" />
459
+            <element signature="e#259#260#0" expanded="true" />
409
             <element signature="e#165#166#0" expanded="true" />
460
             <element signature="e#165#166#0" expanded="true" />
410
             <element signature="e#201#202#0" expanded="true" />
461
             <element signature="e#201#202#0" expanded="true" />
411
-            <element signature="e#201#202#0" expanded="true" />
412
-            <element signature="e#226#227#0" expanded="true" />
413
-            <element signature="e#480#481#0" expanded="true" />
414
-            <element signature="e#513#514#0" expanded="true" />
415
-            <element signature="e#1187#1188#0" expanded="true" />
416
-            <element signature="e#1218#1219#0" expanded="true" />
417
-            <element signature="e#1238#1239#0" expanded="true" />
418
-            <element signature="e#1271#1272#0" expanded="true" />
419
           </folding>
462
           </folding>
420
         </state>
463
         </state>
421
       </provider>
464
       </provider>
422
     </entry>
465
     </entry>
423
-    <entry file="file://$PROJECT_DIR$/src/test/java/ArrayListTest.java">
466
+    <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
467
+      <provider selected="true" editor-type-id="text-editor">
468
+        <state relative-caret-position="210">
469
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
470
+          <folding>
471
+            <element signature="e#125#126#0" expanded="true" />
472
+            <element signature="e#153#154#0" expanded="true" />
473
+            <element signature="e#187#188#0" expanded="true" />
474
+            <element signature="e#228#229#0" expanded="true" />
475
+          </folding>
476
+        </state>
477
+      </provider>
478
+    </entry>
479
+    <entry file="file://$PROJECT_DIR$/src/test/java/MySetTest.java">
424
       <provider selected="true" editor-type-id="text-editor">
480
       <provider selected="true" editor-type-id="text-editor">
425
-        <state relative-caret-position="506">
426
-          <caret line="36" column="9" lean-forward="true" selection-start-line="36" selection-start-column="9" selection-end-line="36" selection-end-column="9" />
481
+        <state relative-caret-position="123">
482
+          <caret line="12" selection-start-line="12" selection-end-line="12" />
427
           <folding>
483
           <folding>
428
             <element signature="imports" expanded="true" />
484
             <element signature="imports" expanded="true" />
429
           </folding>
485
           </folding>

+ 8
- 0
src/main/java/ArrayList.java Прегледај датотеку

8
         arr= new Object[0];
8
         arr= new Object[0];
9
     }
9
     }
10
 
10
 
11
+    public Object[] getArr() {
12
+        return arr;
13
+    }
14
+
15
+    public void setArr(Object[] arr) {
16
+        this.arr = arr;
17
+    }
18
+
11
     public ArrayList(int size) {
19
     public ArrayList(int size) {
12
         arr=new Object[size];
20
         arr=new Object[size];
13
     }
21
     }

+ 26
- 0
src/main/java/MySet.java Прегледај датотеку

1
+import java.util.Arrays;
2
+
3
+public class MySet<T> extends ArrayList {
4
+
5
+
6
+
7
+    public MySet() {
8
+        setArr(new Object[0]);
9
+    }
10
+
11
+    public MySet(int size) {
12
+        setArr(new Object[size]);
13
+    }
14
+
15
+
16
+    @Override
17
+    public boolean add(Object o){
18
+        if(!contains(o)){
19
+            Object[] temp = Arrays.copyOf(getArr(),getArr().length+1);
20
+            temp[temp.length-1] = o;
21
+            setArr(temp);
22
+            return true;}
23
+            return false;
24
+    }
25
+
26
+}

+ 8
- 0
src/test/java/ArrayListTest.java Прегледај датотеку

4
 public class ArrayListTest {
4
 public class ArrayListTest {
5
 
5
 
6
     ArrayList list = new ArrayList();
6
     ArrayList list = new ArrayList();
7
+    ArrayList list2 = new ArrayList(5);
8
+
9
+    @Test
10
+    public void sizeTest(){
11
+        int expected = 5;
12
+        int actual = list2.size();
13
+        Assert.assertEquals(expected, actual);
14
+    }
7
 
15
 
8
     @Test
16
     @Test
9
     public void addTestInt(){
17
     public void addTestInt(){

+ 48
- 0
src/test/java/MySetTest.java Прегледај датотеку

1
+import org.junit.Assert;
2
+import org.junit.Test;
3
+
4
+public class MySetTest {
5
+
6
+    MySet set = new MySet();
7
+
8
+    @Test
9
+    public void addtest(){
10
+    set.add(3);
11
+    set.add(4);
12
+    set.add(3);
13
+    boolean actual = set.add(3);
14
+    boolean expected = false;
15
+    Assert.assertEquals(expected, actual);
16
+    }
17
+
18
+    @Test
19
+    public void clearTest(){
20
+        set.add(9);
21
+        set.add(3);
22
+        set.add(5);
23
+        set.add(4);
24
+        set.clear();
25
+        int expected=0;
26
+        int actual = set.size();
27
+        Assert.assertEquals(expected, actual);
28
+    }
29
+
30
+    @Test
31
+    public void containsTrueTest(){
32
+        set.add("he");
33
+        set.add("wh");
34
+        set.add("si");
35
+        boolean actual = set.contains("wh");
36
+        Assert.assertTrue(actual);
37
+    }
38
+
39
+    @Test
40
+    public void containsFalseTest(){
41
+        set.add("he");
42
+        set.add("wh");
43
+        set.add("si");
44
+        boolean actual = set.contains("ll");
45
+        Assert.assertFalse(actual);
46
+    }
47
+
48
+}