Merge branch 'merge-requests/61'
This commit is contained in:
		
						commit
						f60ce3f56c
					
				
							
								
								
									
										23
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										23
									
								
								README.md
									
									
									
									
									
								
							| @ -45,6 +45,29 @@ Translate Extension](http://www.mediawiki.org/wiki/Extension:Translate). See | ||||
| [our translation page](https://f-droid.org/wiki/page/Special:Translate) if you | ||||
| would like to contribute. | ||||
| 
 | ||||
| 
 | ||||
| Running the test suite | ||||
| ---------------------- | ||||
| 
 | ||||
| FDroid client includes a embedded Android Test Project for running tests.  It | ||||
| is in the `test/` subfolder.  To run the tests from the command line, do: | ||||
| 
 | ||||
| ``` | ||||
| git submodule update --init | ||||
| ./ant-prepare.sh # This runs 'android update' on the libs and the main project | ||||
| ant clean emma debug install test | ||||
| ``` | ||||
| 
 | ||||
| You can also run the tests in Eclipse. Here's how: | ||||
| 
 | ||||
| 1. Choose *File* -> *Import* -> *Android* -> *Existing Android Code Into Workspace* for the `fdroidclient/` directory. | ||||
| 2. Choose *File* -> *Import* -> *Android* -> *Existing Android Code Into Workspace* for the `fdroidclient/test/` directory | ||||
| 3. If **fdroid-test** has errors, right-click on it, select *Properties*, the | ||||
| *Java Build Path*, then click on the *Projects* tab. | ||||
| 4. Click on the *Add...* button and select `fdroidclient/` | ||||
| 5. Right-click on the **fdroid-test** project, then *Run As...* -> *Android JUnit Test* | ||||
| 
 | ||||
| 
 | ||||
| License | ||||
| ------- | ||||
| 
 | ||||
|  | ||||
| @ -1,6 +1,10 @@ | ||||
| #!/bin/bash -ex | ||||
| 
 | ||||
| android update lib-project -p extern/Universal-Image-Loader/library | ||||
| android update lib-project -p extern/AndroidPinning | ||||
| android update lib-project -p extern/MemorizingTrustManager | ||||
| android update project -p . --name F-Droid | ||||
| android update lib-project --path extern/Universal-Image-Loader/library | ||||
| android update lib-project --path extern/AndroidPinning | ||||
| android update lib-project --path extern/MemorizingTrustManager | ||||
| android update project --path . --name F-Droid | ||||
| 
 | ||||
| # technically optional, needed for the tests | ||||
| cd test | ||||
| android update test-project --path ./ --main ../ | ||||
|  | ||||
							
								
								
									
										33
									
								
								test/.project
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										33
									
								
								test/.project
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,33 @@ | ||||
| <?xml version="1.0" encoding="UTF-8"?> | ||||
| <projectDescription> | ||||
| 	<name>fdroid-test</name> | ||||
| 	<comment></comment> | ||||
| 	<projects> | ||||
| 	</projects> | ||||
| 	<buildSpec> | ||||
| 		<buildCommand> | ||||
| 			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name> | ||||
| 			<arguments> | ||||
| 			</arguments> | ||||
| 		</buildCommand> | ||||
| 		<buildCommand> | ||||
| 			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name> | ||||
| 			<arguments> | ||||
| 			</arguments> | ||||
| 		</buildCommand> | ||||
| 		<buildCommand> | ||||
| 			<name>org.eclipse.jdt.core.javabuilder</name> | ||||
| 			<arguments> | ||||
| 			</arguments> | ||||
| 		</buildCommand> | ||||
| 		<buildCommand> | ||||
| 			<name>com.android.ide.eclipse.adt.ApkBuilder</name> | ||||
| 			<arguments> | ||||
| 			</arguments> | ||||
| 		</buildCommand> | ||||
| 	</buildSpec> | ||||
| 	<natures> | ||||
| 		<nature>com.android.ide.eclipse.adt.AndroidNature</nature> | ||||
| 		<nature>org.eclipse.jdt.core.javanature</nature> | ||||
| 	</natures> | ||||
| </projectDescription> | ||||
| @ -15,4 +15,4 @@ | ||||
| #  'key.alias' for the name of the key to use. | ||||
| # The password will be asked during the build when you use the 'release' target. | ||||
| 
 | ||||
| tested.project.dir=/home/pete/code/fdroid/client | ||||
| tested.project.dir=../ | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Ciaran Gultnieks
						Ciaran Gultnieks