Browse Source

fixed maven java version; fixed tests

develop
Robin Thoni 8 years ago
parent
commit
e107478f6e

+ 13
- 0
pom.xml View File

26
         </dependency>
26
         </dependency>
27
     </dependencies>
27
     </dependencies>
28
 
28
 
29
+    <build>
30
+        <plugins>
31
+            <plugin>
32
+                <groupId>org.apache.maven.plugins</groupId>
33
+                <artifactId>maven-compiler-plugin</artifactId>
34
+                <version>3.5.1</version>
35
+                <configuration>
36
+                    <source>1.8</source>
37
+                    <target>1.8</target>
38
+                </configuration>
39
+            </plugin>
40
+        </plugins>
41
+    </build>
29
 
42
 
30
 </project>
43
 </project>

+ 2
- 2
server/src/test/java/com/uqac/rthoni/java_rmi/server/executors/MethodExecutorTest.java View File

34
         ServerApplication app = getServer();
34
         ServerApplication app = getServer();
35
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
35
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
36
                 "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test2",
36
                 "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test2",
37
-                "ecriture#test#privateString#some_value",
37
+                "ecriture#test2#privateString#some_value",
38
                 "fonction#test#getMyString#com.uqac.rthoni.java_rmi.server.executors.TestDbo:ID(test2)");
38
                 "fonction#test#getMyString#com.uqac.rthoni.java_rmi.server.executors.TestDbo:ID(test2)");
39
         assertEquals("some_value", res);
39
         assertEquals("some_value", res);
40
     }
40
     }
45
         ServerApplication app = getServer();
45
         ServerApplication app = getServer();
46
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
46
         String res = runCommands(app, "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test",
47
                 "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test2",
47
                 "creation#com.uqac.rthoni.java_rmi.server.executors.TestDbo#test2",
48
-                "fonction#test#setPrivateString#java.lang.String:some_value",
48
+                "fonction#test2#setPrivateString#java.lang.String:some_value",
49
                 "fonction#test#getMyString#com.uqac.rthoni.java_rmi.server.executors.TestDbo:ID(test2)");
49
                 "fonction#test#getMyString#com.uqac.rthoni.java_rmi.server.executors.TestDbo:ID(test2)");
50
         assertEquals("NULL\nsome_value", res);
50
         assertEquals("NULL\nsome_value", res);
51
     }
51
     }

+ 1
- 3
uqac-java-rmi.iml View File

9
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
9
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
10
       <excludeFolder url="file://$MODULE_DIR$/target" />
10
       <excludeFolder url="file://$MODULE_DIR$/target" />
11
     </content>
11
     </content>
12
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
13
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
14
     <orderEntry type="inheritedJdk" />
12
     <orderEntry type="inheritedJdk" />
15
     <orderEntry type="sourceFolder" forTests="false" />
13
     <orderEntry type="sourceFolder" forTests="false" />
16
-    <orderEntry type="module" module-name="server" />
17
     <orderEntry type="module" module-name="client" />
14
     <orderEntry type="module" module-name="client" />
18
     <orderEntry type="module" module-name="common" />
15
     <orderEntry type="module" module-name="common" />
16
+    <orderEntry type="module" module-name="server" />
19
   </component>
17
   </component>
20
 </module>
18
 </module>

Loading…
Cancel
Save